Bug 146828 - [newvers.sh] [patch] respect LOCALBASE and MAKEOBJDIRPREFIX
Summary: [newvers.sh] [patch] respect LOCALBASE and MAKEOBJDIRPREFIX
Status: Open
Alias: None
Product: Base System
Classification: Unclassified
Component: conf (show other bugs)
Version: 9.0-CURRENT
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-bugs mailing list
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-05-22 13:10 UTC by swell.k
Modified: 2017-12-31 22:24 UTC (History)
0 users

See Also:


Attachments
a.diff (597 bytes, patch)
2010-05-22 13:10 UTC, swell.k
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description swell.k 2010-05-22 13:10:01 UTC

How-To-Repeat: $ make buildkernel

  + v=5 u=holo d=/a/objdir/a/dirty_build/sys/PHOENIX h=raphael.local t='Sat May 22 11:30:56 UTC 2010'
  + /a/objdir/a/dirty_build/make.amd64/make -V KERN_IDENT
  + i=PHOENIX
  + SRCDIR=dir/a/dirty_build/sys/PHOENIX
  + [ -n amd64 ]
  + SRCDIR=dir/a/dirty_build/sys/PHOENIX
  + SRCDIR=dir/a/dirty_build
  + [ -d dir/a/dirty_build/sys/.svn -a -x /bin/svnversion ]
  + [ -d dir/a/dirty_build/.git -a -x /bin/git ]
  + [ -d dir/a/dirty_build/sys/.svn -a -x /usr/bin/svnversion ]
  + [ -d dir/a/dirty_build/.git -a -x /usr/bin/git ]
  + [ -d dir/a/dirty_build/sys/.svn -a -x /usr/local/bin/svnversion ]
  + [ -d dir/a/dirty_build/.git -a -x /usr/local/bin/git ]
  + [ -n '' ]
  + [ -n '' ]

after applying patch

  + v=6 u=holo d=/a/objdir/a/dirty_build/sys/PHOENIX h=raphael.local t='Sat May 22 11:43:29 UTC 2010'
  + /a/objdir/a/dirty_build/make.amd64/make -V KERN_IDENT
  + i=PHOENIX
  + SRCDIR=/a/dirty_build/sys/PHOENIX
  + [ -n amd64 ]
  + SRCDIR=/a/dirty_build/sys/PHOENIX
  + SRCDIR=/a/dirty_build
  + [ -d /a/dirty_build/sys/.svn -a -x /bin/svnversion ]
  + [ -d /a/dirty_build/.git -a -x /bin/git ]
  + [ -d /a/dirty_build/sys/.svn -a -x /usr/bin/svnversion ]
  + [ -d /a/dirty_build/.git -a -x /usr/bin/git ]
  + [ -d /a/dirty_build/sys/.svn -a -x /usr/pkg/bin/svnversion ]
  + svnversion=/usr/pkg/bin/svnversion
  + break
  + [ -n /usr/pkg/bin/svnversion ]
  + cd /a/dirty_build/sys
  + /usr/pkg/bin/svnversion
  + svn=' r208414M'
  + [ -n '' ]
Comment 1 swell.k 2010-09-24 14:05:42 UTC
Refreshed patch to note that MAKEOBJDIRPREFIX hunk is no longer
neccessary since r213077.

  $ uname -vm
  FreeBSD 9.0-CURRENT #0 r213089=be7197c-dirty: Fri Sep 24 12:30:22 UTC 2010     holo@raphael.local:/a/objdir/a/dirty_build/sys/PHOENIX  amd64

--- a.diff begins here ---
Index: sys/conf/newvers.sh
===================================================================
--- sys/conf/newvers.sh	(revision r213078)
+++ sys/conf/newvers.sh	(working copy)
@@ -87,7 +87,7 @@ touch version
 v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
 i=`${MAKE:-make} -V KERN_IDENT`
 
-for dir in /bin /usr/bin /usr/local/bin; do
+for dir in /bin /usr/bin ${LOCALBASE:-/usr/local}/bin; do
 	if [ -d "${SYSDIR}/.svn" -a -x "${dir}/svnversion" ] ; then
 		svnversion=${dir}/svnversion
 		break
--- a.diff ends here ---
Comment 2 Eitan Adler freebsd_committer freebsd_triage 2017-12-31 08:00:27 UTC
For bugs matching the following criteria:

Status: In Progress Changed: (is less than) 2014-06-01

Reset to default assignee and clear in-progress tags.

Mail being skipped