I still require the second patch, or the build fails with
checkflist ===> distrib/sets
======= 1 extra files in DESTDIR =========
Files in DESTDIR but missing from flist.
File is obsolete or flist is out of date ?
------------------------------------------
./usr/lib/i386
========= end of 1 extra files ===========
--- checkflist ---
*** Failed target: checkflist
*** Failed commands:
${SETSCMD} ${.CURDIR}/checkflist ${MAKEFLIST_FLAGS} ${CHECKFLIST_FLAGS}
${METALOG.unpriv}
=> cd /dist/src/distrib/sets && DESTDIR=/tmp/pkgsrc/destdir.amd64
MACHINE=amd64 MACHINE_ARCH=x86_64 AWK=/dist/tools.amd64/bin/nbawk
CKSUM=/dist/tools.amd64/bin/nbcksum DB=/dist/tools.amd64/bin/nbdb
EGREP=/dist/tools.amd64/bin/nbgrep\ -E HOST_SH=/bin/sh
MAKE=/dist/tools.amd64/bin/nbmake MKTEMP=/dist/tools.amd64/bin/nbmktemp
MTREE=/dist/tools.amd64/bin/nbmtree PAX=/dist/tools.amd64/bin/nbpax
COMPRESS_PROGRAM=/dist/tools.amd64/bin/nbxz GZIP=-n XZ_OPT=-9
TAR_SUFF=tar.xz PKG_CREATE=/dist/tools.amd64/bin/nbpkg_create
SED=/dist/tools.amd64/bin/nbsed TSORT=/dist/tools.amd64/bin/nbtsort\ -q
/bin/sh /dist/src/distrib/sets/checkflist -L base -M
/tmp/pkgsrc/destdir.amd64/METALOG.sanitised
*** [checkflist] Error code 1
> Only the first one should be needed, since the second one already has other
> ./usr/lib/i386/... I'll commit it, thanks!
>
> christos
>
>> On May 11, 2023, at 5:28 AM, Adam <[email protected]> wrote:
>>
>> Currently, building -current/amd64 fails with MKCOMPAT=no, as etc/mtree and
>> sets expect /usr/lib/i386 to exist. I have a fix, but I'm not sure it won't
>> break for MKCOMPAT=yes, or maybe the usr/lib/i386 is not a proper directory
>> for these files?
>>
>> --- etc/mtree/NetBSD.dist.x86_64 10 May 2023 15:52:50 -0000 1.17
>> +++ etc/mtree/NetBSD.dist.x86_64 11 May 2023 09:27:59 -0000
>> @@ -5,6 +5,7 @@
>> ./usr/include/i386
>> ./usr/include/x86
>> ./usr/include/xen
>> +./usr/lib/i386
>> ./usr/lib/i386/openssl
>> ./usr/lib/i386/openssl/modules
>> ./usr/lib/i386/openssl/engines
>> --- distrib/sets/lists/base/md.amd64 10 May 2023 15:52:07 -0000 1.288
>> +++ distrib/sets/lists/base/md.amd64 11 May 2023 09:27:59 -0000
>> @@ -11,6 +11,7 @@
>> ./usr/lib/i386/libproc.so.1.0 base-compat-shlib compat,pic,dtrace
>> ./usr/lib/i386/librtld_db.so.0 base-compat-shlib compat,pic,dtrace
>> ./usr/lib/i386/librtld_db.so.0.0 base-compat-shlib compat,pic,dtrace
>> +./usr/lib/i386 base-crypto-usr
>> ./usr/lib/i386/openssl base-crypto-usr
>> ./usr/lib/i386/openssl/engines base-crypto-usr
>> ./usr/lib/i386/openssl/modules base-crypto-usr
>>
>> Kind regards,
>> Adam
>
