Konstantin Belousov
2018-May-09 13:50 UTC
pdeathsig_helper and .debug/pdeathsig_helper.debug placed in /mnt when DESTDIR=/mnt
On Wed, May 09, 2018 at 02:49:34PM +0200, Trond Endrest?l wrote:> I noticed two new entries in / after running make installworld today > using amd64 stable/11 r333390: > > # LANG=en_US.UTF-8 ls -lT /pdeathsig_helper /.debug/pdeathsig_helper.debug > -r--r--r-- 1 root wheel 7528 May 9 12:06:58 2018 /.debug/pdeathsig_helper.debug > -r-xr-xr-x 1 root wheel 8576 May 9 12:06:58 2018 /pdeathsig_helper > > I'm sure these belong in /usr/tests/sys/kern. This must have happened > in r333162 or shortly after. > > See PR 228018, of which I hijacked.Can you try this ? Index: tests/sys/kern/Makefile ==================================================================--- tests/sys/kern/Makefile (revision 333400) +++ tests/sys/kern/Makefile (working copy) @@ -4,6 +4,7 @@ .PATH: ${SRCTOP}/sys/kern TESTSDIR= ${TESTSBASE}/sys/kern +BINDIR= ${TESTDIR} ATF_TESTS_C+= kern_copyin ATF_TESTS_C+= kern_descrip_test
Trond Endrestøl
2018-May-09 16:44 UTC
pdeathsig_helper and .debug/pdeathsig_helper.debug placed in /mnt when DESTDIR=/mnt
On Wed, 9 May 2018 16:50+0300, Konstantin Belousov wrote:> On Wed, May 09, 2018 at 02:49:34PM +0200, Trond Endrest?l wrote: > > I noticed two new entries in / after running make installworld today > > using amd64 stable/11 r333390: > > > > # LANG=en_US.UTF-8 ls -lT /pdeathsig_helper /.debug/pdeathsig_helper.debug > > -r--r--r-- 1 root wheel 7528 May 9 12:06:58 2018 /.debug/pdeathsig_helper.debug > > -r-xr-xr-x 1 root wheel 8576 May 9 12:06:58 2018 /pdeathsig_helper > > > > I'm sure these belong in /usr/tests/sys/kern. This must have happened > > in r333162 or shortly after. > > > > See PR 228018, of which I hijacked. > > Can you try this ? > > Index: tests/sys/kern/Makefile > ==================================================================> --- tests/sys/kern/Makefile (revision 333400) > +++ tests/sys/kern/Makefile (working copy) > @@ -4,6 +4,7 @@ > .PATH: ${SRCTOP}/sys/kern > > TESTSDIR= ${TESTSBASE}/sys/kern > +BINDIR= ${TESTDIR} > > ATF_TESTS_C+= kern_copyin > ATF_TESTS_C+= kern_descrip_testI was not so lucky: ===> tests/sys/geom/class/uzip (install) --- realinstall_subdir_tests/sys/kern --- --- _proginstall --- install -s -o root -g wheel -m 555 pdeathsig_helper /mnt/pdeathsig_helper install -d /mnt/.debug/ install -o root -g wheel -m 444 pdeathsig_helper.debug /mnt/.debug/pdeathsig_helper.debug --- kern_copyin.install --- (cd /usr/src/tests/sys/kern && DEPENDFILE=.depend.kern_copyin NO_SUBDIR=1 make -f /usr/src/tests/sys/kern/Makefile _RECURSING_PROGS=t PROG=kern_copyin install) --- realinstall_subdir_tests/sys/geom --- --- _etalonINS --- install -o root -g wheel -m 444 /usr/src/tests/sys/geom/class/uzip/etalon/etalon.txt /mnt/usr/tests/sys/geom/class/uzip/etalon/ --- _SCRIPTSINS_1_test --- install -o root -g wheel -m 555 1_test /mnt/usr/tests/sys/geom/class/uzip/1_test --- _testsFILESINS_Kyuafile --- install -o root -g wheel -m 444 Kyuafile /mnt/usr/tests/sys/geom/class/uzip/Kyuafile --- _testsFILESINS --- install -o root -g wheel -m 444 /usr/src/tests/sys/geom/class/uzip/conf.sh 1.img.uzip.uue /mnt/usr/tests/sys/geom/class/uzip/ --- _testsFILESINS --- install -o root -g wheel -m 444 /usr/src/tests/sys/geom/class/geom_subr.sh /mnt/usr/tests/sys/geom/class/ --- realinstall_subdir_tests/sys/kern --- --- _proginstall --- --- realinstall_subdir_tests/sys/geom --- --- _testsFILESINS_Kyuafile --- --- realinstall_subdir_tests/sys/kern --- install -s -o root -g wheel -m 555 kern_copyin /mnt /usr/tests/sys/kern/kern_copyin --- realinstall_subdir_tests/sys/geom --- install -o root -g wheel -m 444 Kyuafile /mnt/usr/tests/sys/geom/class/Kyuafile --- realinstall_subdir_tests/sys/kern --- install: target `/usr/tests/sys/kern/kern_copyin' is not a directory usage: install [-bCcpSsUv] [-f flags] [-g group] [-m mode] [-o owner] [-M log] [-D dest] [-h hash] [-T tags] [-B suffix] [-l linkflags] [-N dbdir] file1 file2 install [-bCcpSsUv] [-f flags] [-g group] [-m mode] [-o owner] [-M log] [-D dest] [-h hash] [-T tags] [-B suffix] [-l linkflags] [-N dbdir] file1 ... fileN directory install -dU [-vU] [-g group] [-m mode] [-N dbdir] [-o owner] [-M log] [-D dest] [-h hash] [-T tags] directory ... *** [_proginstall] Error code 64 make[7]: stopped in /usr/src/tests/sys/kern 1 error To be transparent, my builder has these lines in make.conf and src.conf. make.conf: KERNCONF=PE1950 DL360G5 GENERIC PER200 PER320 XENGUEST ZFS .if (!empty(.CURDIR:M/usr/src*) || !empty(.CURDIR:M/usr/obj*)) .if !defined(NOCCACHE) && exists(/usr/local/libexec/ccache/world/cc) CC:=${CC:C,^cc,/usr/local/libexec/ccache/world/cc,1} CXX:=${CXX:C,^c\+\+,/usr/local/libexec/ccache/world/c++,1} .endif .endif WITH_CCACHE_BUILD=yes ## DTrace for both base and ports. See https://wiki.freebsd.org/DTrace/KernelSupport. STRIPCFLAGS+=-fno-omit-frame-pointer WITH_CTF=1 WITH_BDB6_PERMITTED=yes WITH_SSP_PORTS=yes WRKDIRPREFIX=/usr/ports/workdirs TEX_DEFAULT=texlive DEFAULT_VERSIONS+=apache=2.4 DEFAULT_VERSIONS+=bdb=6 DEFAULT_VERSIONS+=emacs=nox DEFAULT_VERSIONS+=firebird=2.5 DEFAULT_VERSIONS+=fpc=3.0.4 DEFAULT_VERSIONS+=gcc=6 DEFAULT_VERSIONS+=ghostscript=agpl DEFAULT_VERSIONS+=linux=c6_64 DEFAULT_VERSIONS+=lua=5.2 DEFAULT_VERSIONS+=mysql=5.7 DEFAULT_VERSIONS+=perl5=5.26 DEFAULT_VERSIONS+=pgsql=9.6 DEFAULT_VERSIONS+=php=7.1 DEFAULT_VERSIONS+=python=2.7 DEFAULT_VERSIONS+=python2=2.7 DEFAULT_VERSIONS+=python3=3.6 DEFAULT_VERSIONS+=ruby=2.3 DEFAULT_VERSIONS+=samba=4.6 DEFAULT_VERSIONS+=ssl=base DEFAULT_VERSIONS+=tcltk=8.6 DEFAULT_VERSIONS+=varnish=5 # EOF src.conf: WITH_CLANG_EXTRAS=yes WITH_CLANG_FULL=yes WITH_CTF=yes WITH_DEBUG_FILES=yes WITH_LIBCPLUSPLUS=yes WITH_LLDB=yes # EOF On the "victim", the same files look like: make.conf: KERNCONF=PER200 WRKDIRPREFIX=/usr/ports/workdirs WITH_BDB6_PERMITTED=yes WITH_SSP_PORTS=yes TEX_DEFAULT=texlive DEFAULT_VERSIONS+=apache=2.4 DEFAULT_VERSIONS+=bdb=6 DEFAULT_VERSIONS+=emacs=nox DEFAULT_VERSIONS+=firebird=2.5 DEFAULT_VERSIONS+=fpc=3.0.4 DEFAULT_VERSIONS+=gcc=6 DEFAULT_VERSIONS+=ghostscript=agpl DEFAULT_VERSIONS+=linux=c6_64 DEFAULT_VERSIONS+=lua=5.2 DEFAULT_VERSIONS+=mysql=5.7 DEFAULT_VERSIONS+=perl5=5.26 DEFAULT_VERSIONS+=pgsql=9.6 DEFAULT_VERSIONS+=php=7.1 DEFAULT_VERSIONS+=python=2.7 DEFAULT_VERSIONS+=python2=2.7 DEFAULT_VERSIONS+=python3=3.6 DEFAULT_VERSIONS+=ruby=2.3 DEFAULT_VERSIONS+=samba=4.6 DEFAULT_VERSIONS+=ssl=base DEFAULT_VERSIONS+=tcltk=8.6 DEFAULT_VERSIONS+=varnish=5 # EOF src.conf: WITH_CLANG_EXTRAS=yes WITH_CLANG_FULL=yes WITH_CTF=yes WITH_DEBUG_FILES=yes WITH_LIBCPLUSPLUS=yes WITH_LLDB=yes # EOF -- Trond.