On Sun 20/08/2017 14:20, Björn Ketelaars wrote: > I just upgraded my machine to a newer snapshot. Unfortunately the kernel > relinking bit failed. Root cause is that strip has been replaced by ctfstrip, > which is part of the comp set, which I have not installed. > > The exact same thing happened when strip was part of the comp set. Solution > then was that strip was thrown in base [0]. > > Does it make sense to move ctfstrip and ctfconv to base? > > [0] > http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/distrib/sets/lists/base/mi?rev=1.847&content-type=text/x-cvsweb-markup >
I forgot about objcopy, which is also use by ctfstrip. New diff. diff --git distrib/sets/lists/base/md.alpha distrib/sets/lists/base/md.alpha index e99541e063f..e6d18ed71c2 100644 --- distrib/sets/lists/base/md.alpha +++ distrib/sets/lists/base/md.alpha @@ -61,6 +61,7 @@ ./sbin/kbd ./sbin/mount_ntfs ./sbin/wsconsctl +./usr/bin/objcopy ./usr/lib/crtbegin.o ./usr/lib/crtbeginS.o ./usr/lib/crtend.o diff --git distrib/sets/lists/base/md.amd64 distrib/sets/lists/base/md.amd64 index 22ba5bcf5f5..035d75553df 100644 --- distrib/sets/lists/base/md.amd64 +++ distrib/sets/lists/base/md.amd64 @@ -66,6 +66,7 @@ ./sbin/kbd ./sbin/mount_ntfs ./sbin/wsconsctl +./usr/bin/objcopy ./usr/bin/pctr ./usr/lib/crtbegin.o ./usr/lib/crtbeginS.o diff --git distrib/sets/lists/base/md.arm64 distrib/sets/lists/base/md.arm64 index 76d487c34d7..04f6662ddc1 100644 --- distrib/sets/lists/base/md.arm64 +++ distrib/sets/lists/base/md.arm64 @@ -29,6 +29,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/bin/objcopy ./usr/lib/crtbegin.o ./usr/lib/crtbeginS.o ./usr/lib/crtend.o diff --git distrib/sets/lists/base/md.armv7 distrib/sets/lists/base/md.armv7 index f4b6f00007d..e53c7909275 100644 --- distrib/sets/lists/base/md.armv7 +++ distrib/sets/lists/base/md.armv7 @@ -29,6 +29,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/bin/objcopy ./usr/lib/crtbegin.o ./usr/lib/crtbeginS.o ./usr/lib/crtend.o diff --git distrib/sets/lists/base/md.hppa distrib/sets/lists/base/md.hppa index ccdca21a99e..05cd23b760d 100644 --- distrib/sets/lists/base/md.hppa +++ distrib/sets/lists/base/md.hppa @@ -63,6 +63,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/bin/objcopy ./usr/lib/crtbegin.o ./usr/lib/crtbeginS.o ./usr/lib/crtend.o diff --git distrib/sets/lists/base/md.i386 distrib/sets/lists/base/md.i386 index b223174485b..7ab7798e78a 100644 --- distrib/sets/lists/base/md.i386 +++ distrib/sets/lists/base/md.i386 @@ -68,6 +68,7 @@ ./sbin/kbd ./sbin/mount_ntfs ./sbin/wsconsctl +./usr/bin/objcopy ./usr/bin/pctr ./usr/lib/crtbegin.o ./usr/lib/crtbeginS.o diff --git distrib/sets/lists/base/md.landisk distrib/sets/lists/base/md.landisk index 3999d2d8eac..15d36fbcfc2 100644 --- distrib/sets/lists/base/md.landisk +++ distrib/sets/lists/base/md.landisk @@ -29,6 +29,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/bin/objcopy ./usr/lib/crtbegin.o ./usr/lib/crtbeginS.o ./usr/lib/crtend.o diff --git distrib/sets/lists/base/md.loongson distrib/sets/lists/base/md.loongson index 520f420b88b..6c1b8dcfd30 100644 --- distrib/sets/lists/base/md.loongson +++ distrib/sets/lists/base/md.loongson @@ -34,6 +34,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/bin/objcopy ./usr/lib/crtbegin.o ./usr/lib/crtbeginS.o ./usr/lib/crtend.o diff --git distrib/sets/lists/base/md.luna88k distrib/sets/lists/base/md.luna88k index 8416386f3cf..2712353cb31 100644 --- distrib/sets/lists/base/md.luna88k +++ distrib/sets/lists/base/md.luna88k @@ -1,6 +1,7 @@ ./etc/examples/wsconsctl.conf ./sbin/kbd ./sbin/wsconsctl +./usr/bin/objcopy ./usr/lib/crtbegin.o ./usr/lib/crtbeginS.o ./usr/lib/crtend.o diff --git distrib/sets/lists/base/md.macppc distrib/sets/lists/base/md.macppc index abca7e80bb3..81f1fc9399a 100644 --- distrib/sets/lists/base/md.macppc +++ distrib/sets/lists/base/md.macppc @@ -64,6 +64,7 @@ ./sbin/kbd ./sbin/pdisk ./sbin/wsconsctl +./usr/bin/objcopy ./usr/lib/crtbegin.o ./usr/lib/crtbeginS.o ./usr/lib/crtend.o diff --git distrib/sets/lists/base/md.octeon distrib/sets/lists/base/md.octeon index 6200a23eac9..3bba5606695 100644 --- distrib/sets/lists/base/md.octeon +++ distrib/sets/lists/base/md.octeon @@ -32,6 +32,7 @@ ./etc/firmware/zd1211 ./etc/firmware/zd1211-license ./etc/firmware/zd1211b +./usr/bin/objcopy ./usr/lib/crtbegin.o ./usr/lib/crtbeginS.o ./usr/lib/crtend.o diff --git distrib/sets/lists/base/md.sgi distrib/sets/lists/base/md.sgi index 0b9bfc0b7e7..08b9f746dbf 100644 --- distrib/sets/lists/base/md.sgi +++ distrib/sets/lists/base/md.sgi @@ -63,6 +63,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/bin/objcopy ./usr/lib/crtbegin.o ./usr/lib/crtbeginS.o ./usr/lib/crtend.o diff --git distrib/sets/lists/base/md.socppc distrib/sets/lists/base/md.socppc index 2427b99604a..d15d32a322a 100644 --- distrib/sets/lists/base/md.socppc +++ distrib/sets/lists/base/md.socppc @@ -57,6 +57,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/bin/objcopy ./usr/lib/crtbegin.o ./usr/lib/crtbeginS.o ./usr/lib/crtend.o diff --git distrib/sets/lists/base/md.sparc64 distrib/sets/lists/base/md.sparc64 index ddd06216e6a..2588fa409e3 100644 --- distrib/sets/lists/base/md.sparc64 +++ distrib/sets/lists/base/md.sparc64 @@ -65,6 +65,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/bin/objcopy ./usr/lib/crtbegin.o ./usr/lib/crtbeginS.o ./usr/lib/crtend.o diff --git distrib/sets/lists/base/mi distrib/sets/lists/base/mi index f83e9efdb24..d34e68df431 100644 --- distrib/sets/lists/base/mi +++ distrib/sets/lists/base/mi @@ -353,6 +353,8 @@ ./usr/bin/crontab ./usr/bin/csplit ./usr/bin/ctags +./usr/bin/ctfconv +./usr/bin/ctfstrip ./usr/bin/cu ./usr/bin/cut ./usr/bin/cvs diff --git distrib/sets/lists/comp/md.alpha distrib/sets/lists/comp/md.alpha index 3bb92e2707c..971342f5070 100644 --- distrib/sets/lists/comp/md.alpha +++ distrib/sets/lists/comp/md.alpha @@ -1,7 +1,6 @@ ./usr/bin/addr2line ./usr/bin/as ./usr/bin/gdb -./usr/bin/objcopy ./usr/bin/readelf ./usr/include/alpha ./usr/include/alpha/_float.h diff --git distrib/sets/lists/comp/md.amd64 distrib/sets/lists/comp/md.amd64 index 64ff034886f..1950a3b9bc6 100644 --- distrib/sets/lists/comp/md.amd64 +++ distrib/sets/lists/comp/md.amd64 @@ -1,7 +1,6 @@ ./usr/bin/addr2line ./usr/bin/as ./usr/bin/gdb -./usr/bin/objcopy ./usr/bin/readelf ./usr/include/amd64 ./usr/include/amd64/_float.h diff --git distrib/sets/lists/comp/md.arm64 distrib/sets/lists/comp/md.arm64 index 740dbe80c90..6bb55f55722 100644 --- distrib/sets/lists/comp/md.arm64 +++ distrib/sets/lists/comp/md.arm64 @@ -1,5 +1,4 @@ ./usr/bin/addr2line -./usr/bin/objcopy ./usr/bin/readelf ./usr/include/arm64 ./usr/include/arm64/_float.h diff --git distrib/sets/lists/comp/md.armv7 distrib/sets/lists/comp/md.armv7 index 328b3ad590f..ec44f0e2af8 100644 --- distrib/sets/lists/comp/md.armv7 +++ distrib/sets/lists/comp/md.armv7 @@ -1,7 +1,6 @@ ./usr/bin/addr2line ./usr/bin/as ./usr/bin/gdb -./usr/bin/objcopy ./usr/bin/readelf ./usr/include/arm ./usr/include/arm/_float.h diff --git distrib/sets/lists/comp/md.hppa distrib/sets/lists/comp/md.hppa index e1748e8c078..522acbc5d5e 100644 --- distrib/sets/lists/comp/md.hppa +++ distrib/sets/lists/comp/md.hppa @@ -1,7 +1,6 @@ ./usr/bin/addr2line ./usr/bin/as ./usr/bin/gdb -./usr/bin/objcopy ./usr/bin/readelf ./usr/include/hppa ./usr/include/hppa/_float.h diff --git distrib/sets/lists/comp/md.i386 distrib/sets/lists/comp/md.i386 index 4a7ce4ba16c..48cfcbc4a86 100644 --- distrib/sets/lists/comp/md.i386 +++ distrib/sets/lists/comp/md.i386 @@ -1,7 +1,6 @@ ./usr/bin/addr2line ./usr/bin/as ./usr/bin/gdb -./usr/bin/objcopy ./usr/bin/readelf ./usr/include/cpuid.h ./usr/include/emmintrin.h diff --git distrib/sets/lists/comp/md.landisk distrib/sets/lists/comp/md.landisk index 2bfc945b15d..e9fa322b26c 100644 --- distrib/sets/lists/comp/md.landisk +++ distrib/sets/lists/comp/md.landisk @@ -1,7 +1,6 @@ ./usr/bin/addr2line ./usr/bin/as ./usr/bin/gdb -./usr/bin/objcopy ./usr/bin/readelf ./usr/include/ieeefp.h ./usr/include/landisk diff --git distrib/sets/lists/comp/md.loongson distrib/sets/lists/comp/md.loongson index cde5219b530..94561c2251f 100644 --- distrib/sets/lists/comp/md.loongson +++ distrib/sets/lists/comp/md.loongson @@ -1,7 +1,6 @@ ./usr/bin/addr2line ./usr/bin/as ./usr/bin/gdb -./usr/bin/objcopy ./usr/bin/readelf ./usr/include/ieeefp.h ./usr/include/loongson diff --git distrib/sets/lists/comp/md.luna88k distrib/sets/lists/comp/md.luna88k index 30eaf6f59cb..86fa38fa79f 100644 --- distrib/sets/lists/comp/md.luna88k +++ distrib/sets/lists/comp/md.luna88k @@ -1,7 +1,6 @@ ./usr/bin/addr2line ./usr/bin/as ./usr/bin/gdb -./usr/bin/objcopy ./usr/bin/protoize ./usr/bin/readelf ./usr/bin/unprotoize diff --git distrib/sets/lists/comp/md.macppc distrib/sets/lists/comp/md.macppc index 1eda7c53e16..d91214bdd34 100644 --- distrib/sets/lists/comp/md.macppc +++ distrib/sets/lists/comp/md.macppc @@ -1,7 +1,6 @@ ./usr/bin/addr2line ./usr/bin/as ./usr/bin/gdb -./usr/bin/objcopy ./usr/bin/readelf ./usr/include/altivec.h ./usr/include/ieeefp.h diff --git distrib/sets/lists/comp/md.octeon distrib/sets/lists/comp/md.octeon index 723408d5804..1914a048437 100644 --- distrib/sets/lists/comp/md.octeon +++ distrib/sets/lists/comp/md.octeon @@ -1,7 +1,6 @@ ./usr/bin/addr2line ./usr/bin/as ./usr/bin/gdb -./usr/bin/objcopy ./usr/bin/readelf ./usr/include/ieeefp.h ./usr/include/mips64 diff --git distrib/sets/lists/comp/md.sgi distrib/sets/lists/comp/md.sgi index a8287b5a676..2eb451b3f60 100644 --- distrib/sets/lists/comp/md.sgi +++ distrib/sets/lists/comp/md.sgi @@ -1,7 +1,6 @@ ./usr/bin/addr2line ./usr/bin/as ./usr/bin/gdb -./usr/bin/objcopy ./usr/bin/readelf ./usr/include/ieeefp.h ./usr/include/mips64 diff --git distrib/sets/lists/comp/md.socppc distrib/sets/lists/comp/md.socppc index e6ce9dc7f66..55079138ec3 100644 --- distrib/sets/lists/comp/md.socppc +++ distrib/sets/lists/comp/md.socppc @@ -1,7 +1,6 @@ ./usr/bin/addr2line ./usr/bin/as ./usr/bin/gdb -./usr/bin/objcopy ./usr/bin/readelf ./usr/include/altivec.h ./usr/include/ieeefp.h diff --git distrib/sets/lists/comp/md.sparc64 distrib/sets/lists/comp/md.sparc64 index 59a6bdcb874..4b2e40eccaf 100644 --- distrib/sets/lists/comp/md.sparc64 +++ distrib/sets/lists/comp/md.sparc64 @@ -1,7 +1,6 @@ ./usr/bin/addr2line ./usr/bin/as ./usr/bin/gdb -./usr/bin/objcopy ./usr/bin/readelf ./usr/include/ieeefp.h ./usr/include/sparc64 diff --git distrib/sets/lists/comp/mi distrib/sets/lists/comp/mi index 819e4df1d1b..cf5323bfaba 100644 --- distrib/sets/lists/comp/mi +++ distrib/sets/lists/comp/mi @@ -2,9 +2,7 @@ ./usr/bin/c++ ./usr/bin/c++filt ./usr/bin/cpp -./usr/bin/ctfconv ./usr/bin/ctfdump -./usr/bin/ctfstrip ./usr/bin/flex ./usr/bin/flex++ ./usr/bin/gprof
