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=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 f4b6f7d..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
