Here's the before and after looks like FWIW:
'
+ LC_ALL=C
+ export LC_ALL
+ [ ! -r version ]
+ echo 0
+ touch version
+ cat version
+ pwd
+ hostname
+ date
+ v=0 u=root d=/usr/src/sys/conf h=borg.macktronics.com t='Sat Aug 10
12:59:21 CDT 2013'
+ make -V KERN_IDENT
+ i=''
+ make -V CC
+ grep version
+ cc -v
+ compiler_v='FreeBSD clang version 3.3 (tags/RELEASE_33/final 183502)
20130610'
+ [ -x /usr/bin/svnliteversion ]
+ svnversion=/usr/bin/svnliteversion
+ [ ! -z /usr/bin/svnliteversion ]
+ break
+ [ -x /usr/bin/p4 ]
+ [ -x /usr/local/bin/p4 ]
+ [ -d ./../../.git ]
+ [ -n /usr/bin/svnliteversion ]
+ cd ./..
+ /usr/bin/svnliteversion
+ svn=253918
+ svn=' r253918'
+ [ -n '' ]
+ [ -n '' ]
+ cat
+ echo 1
BAD:
'
+ LC_ALL=C
+ export LC_ALL
+ [ ! -r version ]
+ echo 0
+ touch version
+ cat version
+ pwd
+ hostname
+ date
+ v=0 u=root d=/usr/src/sys/conf h=olive.macktronics.com t='Sat Aug 10
12:58:47 CDT 2013'
+ make -V KERN_IDENT
+ i=''
+ make -V CC
+ grep version
+ cc -v
+ compiler_v='FreeBSD clang version 3.3 (tags/RELEASE_33/final 183502)
20130610'
+ [ ! -z '' ]
+ [ -x /usr/bin/svnversion ]
+ [ ! -z '' ]
+ [ -x /usr/local/bin/svnversion ]
+ [ -z '' ]
+ [ -x /usr/bin/svnliteversion ]
+ basename newvers.sh
+ /usr/bin/svnversion newvers.sh
+ [ 127 -eq 0 ]
+ svnversion=''
+ [ -x /usr/bin/p4 ]
+ [ -x /usr/local/bin/p4 ]
+ [ -d ./../../.git ]
+ [ -n '' ]
+ [ -n '' ]
+ [ -n '' ]
+ cat
+ echo 1
It looks like you are doing the first [! -z '"${svnversion}"' ] before
$svnversion is being set. In the old version, this was being set via:
if [ -x /usr/bin/svnliteversion ] ; then
svnversion=/usr/bin/svnliteversion
fi
But I'm not sure if that's intentional or not ...
Dan
On Sat, 10 Aug 2013, Dan Mack wrote:
Same problems here ... sometime after 10.0-CURRENT r253918 ... Two other
systems stopped working and they have a mixture of svn / svnlite version
combinations:
working system:
#1: ports svn installed at newer version
root@borg:/usr/src # svnversion ; svnversion --version | head -1
253918
svnversion, version 1.8.0 (r1490375)
root@borg:/usr/src # svnliteversion ; svnliteversion --version | head -1
253918
svnversion, version 1.8.1 (r1503906)
root@borg:/usr/src # uname -a
FreeBSD borg.example.com 10.0-CURRENT FreeBSD 10.0-CURRENT #3 r253918: Sat
Aug 3 15:16:58 CDT 2013 [email protected]:/usr/obj/usr/src/sys/MACKGEN
amd64
Systems not working:
#2: no ports svn installed
root@olive:/usr/src # uname -a
FreeBSD olive.example.com 10.0-CURRENT FreeBSD 10.0-CURRENT #5: Sat Aug 10
08:30:25 CDT 2013 [email protected]:/usr/obj/usr/src/sys/MACKGEN amd64
root@olive:/usr/src # svnversion ; svnversion --version | head -1
svnversion: Command not found.
svnversion: Command not found.
root@olive:/usr/src # svnliteversion ; svnliteversion --version | head -1
254178
svnversion, version 1.8.1 (r1503906)
#3: ports version installed at newer version
root@darkstor:/usr/src # uname -a
FreeBSD darkstor.example.com 10.0-CURRENT FreeBSD 10.0-CURRENT #7: Sat Aug 10
08:35:47 CDT 2013 [email protected]:/usr/obj/usr/src/sys/MACKGEN
amd64
root@darkstor:/usr/src # svnversion ; svnversion --version | head -1
254178
svnversion, version 1.8.0 (r1490375)
root@darkstor:/usr/src # svnliteversion ; svnliteversion --version | head -1
254178
svnversion, version 1.8.1 (r1503906)
Dan
On Sat, 10 Aug 2013, Lev Serebryakov wrote:
Hello, Glen.
You wrote 10 ??????? 2013 ?., 18:13:24:
GB> Hmm. I suspect r254094 is to blame here, although I did extensive
GB> testing with different svn versions before the commit. :(
GB> I'll take another look at this, in case I missed an edge case.
It doesn't look like edge case...
Sources in /data/src. It is SVN WC.
# cd /data/src && svnversion
254178M
# cd /data/src && svnliteversion
254178M
#
"host" system is -CURRENT too, already without revision in uname -a output
(!), from Sat Jul 20.
System is built with nanobsd script, but it looks like nanobsd.sh doesn't
do any special here. It sets MAKEOBJDIRPREFIX to /data/obj.nano/gateway.v2
and call:
env TARGET_ARCH=amd64 make -j4
__MAKE_CONF=/some/path/to/generated/make.conf buildworld
Generated make.conf looks like:
=======================================================================
XCC=/usr/bin/cc
XCXX=/usr/bin/c++
XCPP=/usr/bin/cpp
COMPILER_TYPE=clang
MALLOC_PRODUCTION=yes
BOOT_COMCONSOLE_SPEED=115200
BOOT_COMCONSOLE_PORT=0x2E8
WITHOUT_ACCT=yes
WITHOUT_ACPI=yes
WITHOUT_AMD=yes
WITHOUT_APM=yes
WITHOUT_ATM=yes
WITHOUT_AUDIT=yes
WITHOUT_AUTHPF=yes
WITHOUT_BIND_DNSSEC=yes
WITHOUT_CALENDAR=yes
WITHOUT_CDDL=yes
WITHOUT_CLANG=yes
WITHOUT_CROSS_COMPILER=yes
WITHOUT_CTM=yes
WITHOUT_DICT=yes
WITHOUT_EXAMPLES=yes
WITHOUT_FLOPPY=yes
WITHOUT_FREEBSD_UPDATE=yes
WITHOUT_GAMES=yes
WITHOUT_GCC=yes
WITHOUT_GCOV=yes
WITHOUT_GDB=yes
WITHOUT_GPIB=yes
WITHOUT_GPIO=yes
WITHOUT_GROFF=yes
WITHOUT_GSSAPI=yes
WITHOUT_HTML=yes
WITHOUT_INFO=yes
WITHOUT_IPFILTER=yes
WITHOUT_IPX=yes
WITHOUT_JAIL=yes
WITHOUT_LEGACY_CONSOLE=yes
WITHOUT_LIB32=yes
WITHOUT_LOCALES=yes
WITHOUT_LOCATE=yes
WITHOUT_LPR=yes
WITHOUT_KERBEROS=yes
WITHOUT_KERBEROS_SUPPORT=yes
WITHOUT_MAN=yes
WITHOUT_NCP=yes
WITHOUT_NDIS=yes
WITHOUT_NIS=yes
WITHOUT_NLS=yes
WITHOUT_NLS_CATALOGS=yes
WITHOUT_NS_CACHING=yes
WITHOUT_OBJC=yes
WITHOUT_PC_SYSINSTALL=yes
WITHOUT_PF=yes
WITHOUT_PORTSNAP=yes
WITHOUT_PROFILE=yes
WITHOUT_QUOTAS=yes
WITHOUT_RCMDS=yes
WITHOUT_RCS=yes
WITHOUT_ROUTED=yes
WITHOUT_SHAREDOCS=yes
WITHOUT_SVNLITE=yes
WITHOUT_SYSCONS=yes
WITHOUT_ZFS=yes
SRCCONF=/dev/null
=======================================================================
--
// Black Lion AKA Lev Serebryakov <[email protected]>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "[email protected]"
dan
--
Dan Mack
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "[email protected]"
dan
--
Dan Mack
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "[email protected]"
