>Number: 146828
>Category: conf
>Synopsis: [patch] conf/newvers.sh: respect LOCALBASE and MAKEOBJDIRPREFIX
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat May 22 12:10:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Anonymous
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
LOCALBASE=/usr/pkg
MAKEOBJDIRPREFIX=/a/objdir
SRC_BASE=/a/dirty_build (used by kmod ports, e.g. kqemu-kmod,
virtualbox-ose-kmod)
SYSDIR=$SRC_BASE/sys (used by out-of-tree kmods, bsd.kmod.mk)
>Description:
>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 '' ]
>Fix:
--- a.diff begins here ---
Index: sys/conf/newvers.sh
===================================================================
--- sys/conf/newvers.sh (revision 208414)
+++ sys/conf/newvers.sh (working copy)
@@ -89,13 +89,13 @@
case "$d" in
*/sys/*)
- SRCDIR=${d##*obj}
+ SRCDIR=${d##*${MAKEOBJDIRPREFIX:-/usr/obj}}
if [ -n "$MACHINE" ]; then
SRCDIR=${SRCDIR##/$MACHINE}
fi
SRCDIR=${SRCDIR%%/sys/*}
- for dir in /bin /usr/bin /usr/local/bin; do
+ for dir in /bin /usr/bin ${LOCALBASE:-/usr/local}/bin; do
if [ -d "${SRCDIR}/sys/.svn" -a -x "${dir}/svnversion" ] ; then
svnversion=${dir}/svnversion
break
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "[email protected]"
