svn commit: r348521 - in head: . etc sys/conf sys/modules usr.bin/login usr.sbin/services_mkdb

Cy Schubert Cy.Schubert at cschubert.com
Mon Jun 3 11:47:47 UTC 2019 

In message <7BD6B7AD-5950-4015-B95D-9FFB609F51E9 at fubar.geek.nz>, Andrew Turner 
writes:
> 
>
> > On 3 Jun 2019, at 00:38, Maxim Sobolev <sobomax at freebsd.org> wrote:
> > 
> > Author: sobomax
> > Date: Sun Jun  2 23:38:19 2019
> > New Revision: 348521
> > URL: https://svnweb.freebsd.org/changeset/base/348521
> > 
> > Log:
> >  Fix several places where tool name has been hardcoded:
> > 
> >      install -> ${INSTALL}
> >      mtree -> ${MTREE_CMD}
> >      services_mkdb -> ${SERVICES_MKDB_CMD}
> >      cap_mkdb -> ${CAP_MKDB_CMD}
> >      pwd_mkdb -> ${PWD_MKDB_CMD}
> >      kldxref -> ${KLDXREF_CMD}
> > 
> >  If you do custom FreeBSD builds you may want to override those
> >  in some cases.
> > 
> >  Sponsored by:	Sippy Software, Inc.
>
> This breaks installworld in a local Jenkins instance. I’m building with -DD
> B_FROM_SRC and -DNO_ROOT. It looks like INSTALL is unset.
>
> Andrew
>
> --------------------------------------------------------------
> >>> Making hierarchy
> --------------------------------------------------------------
> cd /jenkins/workspace/FreeBSD-arm64-head/freebsd-head; make -f Makefile.inc1 
>  LOCAL_MTREE= hierarchy
> cd /jenkins/workspace/FreeBSD-arm64-head/freebsd-head/etc; PATH=/jenkins/work
> space/FreeBSD-arm64-head/obj/jenkins/workspace/FreeBSD-arm64-head/freebsd-hea
> d/arm64.aarch64/tmp/usr/sbin:/jenkins/workspace/FreeBSD-arm64-head/obj/jenkin
> s/workspace/FreeBSD-arm64-head/freebsd-head/arm64.aarch64/tmp/usr/bin:/jenkin
> s/workspace/FreeBSD-arm64-head/obj/jenkins/workspace/FreeBSD-arm64-head/freeb
> sd-head/arm64.aarch64/tmp/legacy/usr/sbin:/jenkins/workspace/FreeBSD-arm64-he
> ad/obj/jenkins/workspace/FreeBSD-arm64-head/freebsd-head/arm64.aarch64/tmp/le
> gacy/usr/bin:/jenkins/workspace/FreeBSD-arm64-head/obj/jenkins/workspace/Free
> BSD-arm64-head/freebsd-head/arm64.aarch64/tmp/legacy/bin::/jenkins/workspace/
> FreeBSD-arm64-head/obj/jenkins/workspace/FreeBSD-arm64-head/freebsd-head/arm6
> 4.aarch64/tmp/usr/sbin:/jenkins/workspace/FreeBSD-arm64-head/obj/jenkins/work
> space/FreeBSD-arm64-head/freebsd-head/arm64.aarch64/tmp/usr/bin:/jenkins/work
> space/FreeBSD-arm64-head/obj/jenkins/workspace/FreeBSD-arm64-head/freebsd-hea
> d/arm64.aarch64/tmp/legacy/usr/sbin:/jenkins/workspace/FreeBSD-arm64-head/obj
> /jenkins/workspace/FreeBSD-arm64-head/freebsd-head/arm64.aarch64/tmp/legacy/u
> sr/bin:/jenkins/workspace/FreeBSD-arm64-head/obj/jenkins/workspace/FreeBSD-ar
> m64-head/freebsd-head/arm64.aarch64/tmp/legacy/bin::/tmp/install.ZQ3PdXVZ mak
> e LOCAL_MTREE= PATH=/jenkins/workspace/FreeBSD-arm64-head/obj/jenkins/workspa
> ce/FreeBSD-arm64-head/freebsd-head/arm64.aarch64/tmp/usr/sbin:/jenkins/worksp
> ace/FreeBSD-arm64-head/obj/jenkins/workspace/FreeBSD-arm64-head/freebsd-head/
> arm64.aarch64/tmp/usr/bin:/jenkins/workspace/FreeBSD-arm64-head/obj/jenkins/w
> orkspace/FreeBSD-arm64-head/freebsd-head/arm64.aarch64/tmp/legacy/usr/sbin:/j
> enkins/workspace/FreeBSD-arm64-head/obj/jenkins/workspace/FreeBSD-arm64-head/
> freebsd-head/arm64.aarch64/tmp/legacy/usr/bin:/jenkins/workspace/FreeBSD-arm6
> 4-head/obj/jenkins/workspace/FreeBSD-arm64-head/freebsd-head/arm64.aarch64/tm
> p/legacy/bin::/jenkins/workspace/FreeBSD-arm64-head/obj/jenkins/workspace/Fre
> eBSD-arm64-head/freebsd-head/arm64.aarch64/tmp/usr/sbin:/jenkins/workspace/Fr
> eeBSD-arm64-head/obj/jenkins/workspace/FreeBSD-arm64-head/freebsd-head/arm64.
> aarch64/tmp/usr/bin:/jenkins/workspace/FreeBSD-arm64-head/obj/jenkins/workspa
> ce/FreeBSD-arm64-head/freebsd-head/arm64.aarch64/tmp/legacy/usr/sbin:/jenkins
> /workspace/FreeBSD-arm64-head/obj/jenkins/workspace/FreeBSD-arm64-head/freebs
> d-head/arm64.aarch64/tmp/legacy/usr/bin:/jenkins/workspace/FreeBSD-arm64-head
> /obj/jenkins/workspace/FreeBSD-arm64-head/freebsd-head/arm64.aarch64/tmp/lega
> cy/bin::/tmp/install.ZQ3PdXVZ METALOG=/jenkins/workspace/FreeBSD-arm64-head/o
> bj/root//METALOG -DNO_ROOT distrib-dirs
> for file in /usr/share/doc/usd/10.exref /usr/share/doc/usd/11.edit /usr/share
> /doc/usd/12.vi /usr/share/doc/usd/13.viref; do  if [ -f /jenkins/workspace/Fr
> eeBSD-arm64-head/obj/root/${file} ]; then  rm -f /jenkins/workspace/FreeBSD-a
> rm64-head/obj/root/${file};  fi;  done
> -N /jenkins/workspace/FreeBSD-arm64-head/freebsd-head/etc -W -deU -i -f /jenk
> ins/workspace/FreeBSD-arm64-head/freebsd-head/etc/mtree/BSD.root.dist -p /jen
> kins/workspace/FreeBSD-arm64-head/obj/root/
> /tmp/install.ZQ3PdXVZ/sh: -N: not found
> *** Error code 127
>
> Stop.
> make[4]: stopped in /jenkins/workspace/FreeBSD-arm64-head/freebsd-head/etc
> *** Error code 1
>
> Stop.
> make[3]: stopped in /jenkins/workspace/FreeBSD-arm64-head/freebsd-head
> *** Error code 1
>
> Stop.
> make[2]: stopped in /jenkins/workspace/FreeBSD-arm64-head/freebsd-head
> *** Error code 1
>
> Stop.
> make[1]: stopped in /jenkins/workspace/FreeBSD-arm64-head/freebsd-head
> *** Error code 1
>
> Stop.
> make: stopped in /jenkins/workspace/FreeBSD-arm64-head/freebsd-head
>

It also breaks poudirere builds at make distrib-dirs, amd64 and i386, i386
distrib-dirs on amd64 sample below. The src/etc/Makefile distrib-dirs target
is the failing one.

bob# poudriere jail -j HEADi386 -u && _poudriere-check-version -f
[00:00:01] Upgrading using src=/opt/src/svn-current
[00:00:01] Copying /opt/src/svn-current to /poudriere/i386/jails/HEADi386/usr/src... done
[00:03:49] Starting make installworld
--- installworld ---
make[1]: "/export/obj/opt/src/svn-current/i386.i386/toolchain-metadata.mk" line 1: Using cached toolchain metadata from build at bob on Sun Jun  2 23:24:27 PDT 2019
--- _installcheck_world ---
--------------------------------------------------------------
>>> Install check world
--------------------------------------------------------------
--- installworld ---
mkdir -p /tmp/install.POsc3ffM
progs=$(for prog in [ awk cap_mkdb cat chflags chmod chown cmp cp  date echo egrep find grep id install   ln make mkdir mtree mv pwd_mkdb  rm sed services_mkdb sh sort strip sysctl test true uname wc zic tzsetup   makewhatis; do  if progpath=`which $prog`; then  echo $progpath;  else  echo "Required tool $prog not found in PATH." >&2;  exit 1;  fi;  done);  libs=$(ldd -f "%o %p\n" -f "%o %p\n" $progs 2>/dev/null | sort -u |  while read line; do  $line;  if [ "$2 $3" != "not found" ]; then  echo $2;  else  echo "Required library $1 not found." >&2;  exit 1;  fi;  done);  cp $libs $progs /tmp/install.POsc3ffM
cp -R ${PATH_LOCALE:-"/usr/share/locale"} /tmp/install.POsc3ffM/locale
cd /opt/src/svn-current; MACHINE_ARCH=i386  MACHINE=i386  CPUTYPE= CC="/usr/local/bin/ccache cc -target i386-unknown-freebsd13.0 --sysroot=/export/obj/opt/src/svn-current/i386.i386/tmp -B/export/obj/opt/src/svn-current/i386.i386/tmp/usr/bin" CXX="/usr/local/bin/ccache c++  -target i386-unknown-freebsd13.0 --sysroot=/export/obj/opt/src/svn-current/i386.i386/tmp -B/export/obj/opt/src/svn-current/i386.i386/tmp/usr/bin"  CPP="cpp -target i386-unknown-freebsd13.0 --sysroot=/export/obj/opt/src/svn-current/i386.i386/tmp -B/export/obj/opt/src/svn-current/i386.i386/tmp/usr/bin"  AS="as" AR="ar" LD="ld" LLVM_LINK=""  NM=nm OBJCOPY="objcopy"  RANLIB=ranlib STRINGS=  SIZE="size" PATH=/export/obj/opt/src/svn-current/i386.i386/tmp/usr/sbin:/export/obj/opt/src/svn-current/i386.i386/tmp/usr/bin:/export/obj/opt/src/svn-current/i386.i386/tmp/legacy/usr/sbin:/export/obj/opt/src/svn-current/i386.i386/tmp/legacy/usr/bin:/export/obj/opt/src/svn-current/i386.i386/tmp/legacy/bin::/tmp/install.POsc3!
 ffM  LD_LIBRARY_PATH=/tmp/install.POsc3ffM  PATH_LOCALE=/tmp/install.POsc3ffM/locale make -f Makefile.inc1  INSTALL="install -N /opt/src/svn-current/etc" MTREE_CMD=" -N /opt/src/svn-current/etc" __MAKE_SHELL=/tmp/install.POsc3ffM/sh reinstall;  MACHINE_ARCH=i386  MACHINE=i386  CPUTYPE= CC="/usr/local/bin/ccache cc -target i386-unknown-freebsd13.0 --sysroot=/export/obj/opt/src/svn-current/i386.i386/tmp -B/export/obj/opt/src/svn-current/i386.i386/tmp/usr/bin" CXX="/usr/local/bin/ccache c++  -target i386-unknown-freebsd13.0 --sysroot=/export/obj/opt/src/svn-current/i386.i386/tmp -B/export/obj/opt/src/svn-current/i386.i386/tmp/usr/bin"  CPP="cpp -target i386-unknown-freebsd13.0 --sysroot=/export/obj/opt/src/svn-current/i386.i386/tmp -B/export/obj/opt/src/svn-current/i386.i386/tmp/usr/bin"  AS="as" AR="ar" LD="ld" LLVM_LINK=""  NM=nm OBJCOPY="objcopy"  RANLIB=ranlib STRINGS=  SIZE="size" PATH=/export/obj/opt/src/svn-current/i386.i386/tmp/usr/sbin:/export/obj/opt/src/svn-current/!
 i386.i386/tmp/usr/bin:/export/obj/opt/src/svn-current/i386.i38!
 6/tmp/legacy/usr/sbin:/export/obj/opt/src/svn-current/i386.i386/tmp/legacy/usr/bin:/export/obj/opt/src/svn-current/i386.i386/tmp/legacy/bin::/tmp/install.POsc3ffM  LD_LIBRARY_PATH=/tmp/install.POsc3ffM  PATH_LOCALE=/tmp/install.POsc3ffM/locale rm -rf /tmp/install.POsc3ffM
--- reinstall ---
--------------------------------------------------------------
>>> Making hierarchy
--------------------------------------------------------------
cd /opt/src/svn-current; make -f Makefile.inc1  LOCAL_MTREE= hierarchy
--- hierarchy ---
cd /opt/src/svn-current/etc; PATH=/export/obj/opt/src/svn-current/i386.i386/tmp/usr/sbin:/export/obj/opt/src/svn-current/i386.i386/tmp/usr/bin:/export/obj/opt/src/svn-current/i386.i386/tmp/legacy/usr/sbin:/export/obj/opt/src/svn-current/i386.i386/tmp/legacy/usr/bin:/export/obj/opt/src/svn-current/i386.i386/tmp/legacy/bin::/export/obj/opt/src/svn-current/i386.i386/tmp/usr/sbin:/export/obj/opt/src/svn-current/i386.i386/tmp/usr/bin:/export/obj/opt/src/svn-current/i386.i386/tmp/legacy/usr/sbin:/export/obj/opt/src/svn-current/i386.i386/tmp/legacy/usr/bin:/export/obj/opt/src/svn-current/i386.i386/tmp/legacy/bin::/tmp/install.POsc3ffM make LOCAL_MTREE= distrib-dirs
--- distrib-cleanup ---
for file in /usr/share/doc/usd/10.exref /usr/share/doc/usd/11.edit /usr/share/doc/usd/12.vi /usr/share/doc/usd/13.viref; do  if [ -f /poudriere/i386/jails/HEADi386/${file} ]; then  rm -f /poudriere/i386/jails/HEADi386/${file};  fi;  done
--- distrib-dirs ---
-N /opt/src/svn-current/etc -deU -i -f /opt/src/svn-current/etc/mtree/BSD.root.dist -p /poudriere/i386/jails/HEADi386/
sh: -N: not found
*** [distrib-dirs] Error code 127

make[4]: stopped in /opt/src/svn-current/etc
1 error

make[4]: stopped in /opt/src/svn-current/etc
*** [hierarchy] Error code 2

make[3]: stopped in /opt/src/svn-current
1 error

make[3]: stopped in /opt/src/svn-current
*** [reinstall] Error code 2

make[2]: stopped in /opt/src/svn-current
1 error

make[2]: stopped in /opt/src/svn-current
*** [installworld] Error code 2

make[1]: stopped in /opt/src/svn-current
1 error

make[1]: stopped in /opt/src/svn-current
*** [installworld] Error code 2

make: stopped in /opt/src/svn-current
1 error

make: stopped in /opt/src/svn-current
[00:03:51] Error: Failed to 'make installworld'
bob# 


-- 
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.

More information about the svn-src-all mailing list