Consolidate lib.so.*.a, ld.so.a and the kernel relink kit into

one location under /usr/share/relink.

Be more specific in src/etc/rc reorder_libs() what filesystems
need r/w remount and ensure that their mount state is restored.

Idea and positive feedback from deraadt@
OK aja@ tb@

3 files changed, 22 insertions, 18 deletions

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index cdc929b8ed4..7b277e5dd01 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: install.sub,v 1.1042 2017/11/02 15:35:20 rpe Exp $
+#	$OpenBSD: install.sub,v 1.1043 2017/11/05 10:29:24 rpe Exp $
 #
 # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
 # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -2641,8 +2641,8 @@ store_random() {
 # Final steps common for installs and upgrades.
 finish_up() {
 	local _dev _mp _fstype _rest _d
-	local _compile=/mnt/usr/share/compile _kernel=${MDKERNEL:-GENERIC}
-	local _syspatch_archs="amd64 i386"
+	local _kernel_dir=/mnt/usr/share/relink/kernel
+	local _kernel=${MDKERNEL:-GENERIC} _syspatch_archs="amd64 i386"
 
 	# Mount all known swap partitions.  This gives systems with little
 	# memory a better chance at running 'MAKEDEV all'.
@@ -2706,16 +2706,16 @@ finish_up() {
 	# ensure it references the kernel as /bsd.
 	sha256 /mnt/bsd | (umask 077; sed 's,/mnt,,' >/mnt/var/db/kernel.SHA256)
 
-	if [[ -f $_compile.tgz ]]; then
+	if [[ -f $_kernel_dir.tgz ]]; then
 		echo -n "Relinking to create unique kernel..."
 		(
 		set -e
-		rm -rf $_compile
-		mkdir -m 700 -p $_compile
-		tar -C $_compile -xzf $_compile.tgz $_kernel
-		chroot /mnt /bin/ksh -e -c "cd ${_compile#/mnt}/$_kernel; \
+		rm -rf $_kernel_dir
+		mkdir -m 700 -p $_kernel_dir
+		tar -C $_kernel_dir -xzf $_kernel_dir.tgz $_kernel
+		chroot /mnt /bin/ksh -e -c "cd ${_kernel_dir#/mnt}/$_kernel; \
 			make newbsd; make newinstall"
-		rm -f $_compile.tgz
+		rm -f $_kernel_dir.tgz
 		) >/dev/null 2>&1 && echo "done." || echo "failed."
 	fi
 
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index d76224a43ab..e96a6ae4637 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -620,9 +620,7 @@
 ./usr/include
 ./usr/lib
 ./usr/lib/libc.so.92.0
-./usr/lib/libc.so.92.0.a
 ./usr/lib/libcrypto.so.42.0
-./usr/lib/libcrypto.so.42.0.a
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -669,7 +667,6 @@
 ./usr/libdata/cvs/contrib
 ./usr/libdata/cvs/contrib/README
 ./usr/libdata/cvs/contrib/intro.doc
-./usr/libdata/ld.so.a
 ./usr/libdata/perl5
 ./usr/libdata/perl5/AnyDBM_File.pm
 ./usr/libdata/perl5/App
@@ -2579,8 +2576,6 @@
 ./usr/share/calendar/ru_RU.UTF-8/calendar.orthodox
 ./usr/share/calendar/ru_RU.UTF-8/calendar.pagan
 ./usr/share/calendar/ru_RU.UTF-8/calendar.primety
-./usr/share/compile
-./usr/share/compile.tgz
 ./usr/share/dict
 ./usr/share/dict/README
 ./usr/share/dict/american
@@ -2699,6 +2694,15 @@
 ./usr/share/mk/bsd.xconf.mk
 ./usr/share/mk/bsd.xorg.mk
 ./usr/share/mk/sys.mk
+./usr/share/relink
+./usr/share/relink/kernel
+./usr/share/relink/kernel.tgz
+./usr/share/relink/usr
+./usr/share/relink/usr/libexec
+./usr/share/relink/usr/libexec/ld.so.a
+./usr/share/relink/usr/lib
+./usr/share/relink/usr/lib/libc.so.92.0.a
+./usr/share/relink/usr/lib/libcrypto.so.42.0.a
 ./usr/share/snmp
 ./usr/share/snmp/mibs
 ./usr/share/snmp/mibs/OPENBSD-BASE-MIB.txt
diff --git a/distrib/syspatch/README b/distrib/syspatch/README
index 06ab8813110..f48c6738270 100644
--- a/distrib/syspatch/README
+++ b/distrib/syspatch/README
@@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.2 2017/09/03 09:42:03 ajacoutot Exp $
+$OpenBSD: README,v 1.3 2017/11/05 10:29:24 rpe Exp $
 
 Notes about the syspatch(8) build process
 =========================================
@@ -35,9 +35,9 @@ install -m 0700 ${RELEASEDIR}/bsd{,.mp} ${FAKE}
 for set in base comp game man xbase xshare xfont xserv; do
 	tar xzphf ${RELEASEDIR}/${set}$(uname -r | tr -d '.').tgz -C ${FAKE}
 done
-mkdir -m 700 -p ${FAKE}/usr/share/compile/GENERIC{,.MP}
-tar -C ${FAKE}/usr/share/compile -xzf ${FAKE}/usr/share/compile.tgz
-rm ${FAKE}/usr/share/compile.tgz
+mkdir -m 700 -p ${FAKE}/usr/share/relink/kernel/GENERIC{,.MP}
+tar -C ${FAKE}/usr/share/relink/kernel -xzf ${FAKE}/usr/share/relink/kernel.tgz
+rm ${FAKE}/usr/share/relink/kernel.tgz
 
 Building a syspatch
 -------------------