Since rev 1.502 of rc(8) it creates a /bsd.booted hard link. At the

end of rc we call reorder_kernel which creates a /obsd hard link to
the same kernel.
In the past obsd was only created when doing a manual make install in
the kernel sources.
There is no need for two backup hard links during boot, rearange the
kernel Makefiles to restore previous behaviour and thus stopping
reorder_kernel from scribbling over /obsd.

Makes muscle memory of some kernel developers work again: /obsd can
serve as a known good kernel; and there was much rejoycing...

Discussed at length with benno, rpe, phessler and tb at
p2k17.

Seems like a good idea to deraadt.

OK benno, phessler, rpe, tb

13 files changed, 65 insertions, 39 deletions

diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index 3c0f618f402..3e6e97feb01 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.alpha,v 1.109 2017/09/28 16:16:34 patrick Exp $
+#	$OpenBSD: Makefile.alpha,v 1.110 2017/11/04 16:04:15 florian Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -139,12 +139,14 @@ depend obj:
 locore0.o: ${_machdir}/${_mach}/locore0.S assym.h
 locore.o: ${_machdir}/${_mach}/locore.s assym.h
 
-newinstall:
+hardlink-obsd:
 	cmp -s bsd /bsd || ln -f /bsd /obsd
+
+newinstall:
 	umask 077 && cp bsd /nbsd && mv /nbsd /bsd && \
 	    sha256 -h /var/db/kernel.SHA256 /bsd
 
-install: update-link newinstall
+install: update-link hardlink-obsd newinstall
 
 # pull in the dependency information
 .ifnmake clean
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 602634de28e..d709d434b1f 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.amd64,v 1.94 2017/09/28 16:16:34 patrick Exp $
+#	$OpenBSD: Makefile.amd64,v 1.95 2017/11/04 16:04:15 florian Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -146,12 +146,14 @@ locore0.o: ${_machdir}/${_mach}/locore0.S assym.h
 locore.o mutex.o vector.o copy.o spl.o: assym.h
 mptramp.o acpi_wakecode.o vmm_support.o: assym.h
 
-newinstall:
+hardlink-obsd:
 	cmp -s bsd /bsd || ln -f /bsd /obsd
+
+newinstall:
 	umask 077 && cp bsd /nbsd && mv /nbsd /bsd && \
 	    sha256 -h /var/db/kernel.SHA256 /bsd
 
-install: update-link newinstall
+install: update-link hardlink-obsd newinstall
 
 # pull in the dependency information
 .ifnmake clean
diff --git a/sys/arch/arm64/conf/Makefile.arm64 b/sys/arch/arm64/conf/Makefile.arm64
index 4858c3395ec..f5705245d0f 100644
--- a/sys/arch/arm64/conf/Makefile.arm64
+++ b/sys/arch/arm64/conf/Makefile.arm64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.arm64,v 1.24 2017/10/13 05:55:27 jsg Exp $
+#	$OpenBSD: Makefile.arm64,v 1.25 2017/11/04 16:04:15 florian Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -147,12 +147,14 @@ in_cksum_arm.o fiq_subr.o bcopyinout.o copystr.o sigcode.o copy.o: assym.h
 vectors.o cpuswitch.o exception.o bcopy_page.o irq_dispatch.o support.o: assym.h
 locore.o: assym.h
 
-newinstall:
+hardlink-obsd:
 	cmp -s bsd /bsd || ln -f /bsd /obsd
+
+newinstall:
 	umask 077 && cp bsd /nbsd && mv /nbsd /bsd && \
 	    sha256 -h /var/db/kernel.SHA256 /bsd
 
-install: update-link newinstall
+install: update-link hardlink-obsd newinstall
 
 # pull in the dependency information
 .ifnmake clean
diff --git a/sys/arch/armv7/conf/Makefile.armv7 b/sys/arch/armv7/conf/Makefile.armv7
index 63519b19315..f9cfa61a182 100644
--- a/sys/arch/armv7/conf/Makefile.armv7
+++ b/sys/arch/armv7/conf/Makefile.armv7
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.armv7,v 1.37 2017/10/26 13:27:20 jsg Exp $
+#	$OpenBSD: Makefile.armv7,v 1.38 2017/11/04 16:04:16 florian Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -155,12 +155,14 @@ in_cksum_arm.o fiq_subr.o bcopyinout.o copystr.o sigcode.o: assym.h
 vectors.o cpuswitch7.o exception.o bcopy_page.o irq_dispatch.o: assym.h
 ${_mach}_start.o locore.o: assym.h
 
-newinstall:
+hardlink-obsd:
 	cmp -s bsd /bsd || ln -f /bsd /obsd
+
+newinstall:
 	umask 077 && cp bsd /nbsd && mv /nbsd /bsd && \
 	    sha256 -h /var/db/kernel.SHA256 /bsd
 
-install: update-link newinstall
+install: update-link hardlink-obsd newinstall
 
 # pull in the dependency information
 .ifnmake clean
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index ebbaf21af69..7e6833f4059 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa,v 1.103 2017/09/28 16:16:34 patrick Exp $
+#	$OpenBSD: Makefile.hppa,v 1.104 2017/11/04 16:04:16 florian Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -148,12 +148,14 @@ locore0.o: ${_machdir}/${_mach}/locore0.S assym.h
 locore.o: ${_machdir}/${_mach}/locore.S assym.h
 fpemu.o spcopy.o: assym.h
 
-newinstall:
+hardlink-obsd:
 	cmp -s bsd /bsd || ln -f /bsd /obsd
+
+newinstall:
 	umask 077 && cp bsd /nbsd && mv /nbsd /bsd && \
 	    sha256 -h /var/db/kernel.SHA256 /bsd
 
-install: update-link newinstall
+install: update-link hardlink-obsd newinstall
 
 # pull in the dependency information
 .ifnmake clean
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index ac2cf80aa34..4920bc69844 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.119 2017/09/28 16:16:34 patrick Exp $
+#	$OpenBSD: Makefile.i386,v 1.120 2017/11/04 16:04:16 florian Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -148,12 +148,14 @@ locore0.o: ${_machdir}/${_mach}/locore0.S assym.h
 locore.o mutex.o in_cksum.o mptramp.o: assym.h
 kvm86call.o acpi_wakecode.o vmm_support.o: assym.h
 
-newinstall:
+hardlink-obsd:
 	cmp -s bsd /bsd || ln -f /bsd /obsd
+
+newinstall:
 	umask 077 && cp bsd /nbsd && mv /nbsd /bsd && \
 	    sha256 -h /var/db/kernel.SHA256 /bsd
 
-install: update-link newinstall
+install: update-link hardlink-obsd newinstall
 
 # pull in the dependency information
 .ifnmake clean
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index 54f49b1a5f9..a87efd66fb7 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.landisk,v 1.75 2017/09/28 16:16:34 patrick Exp $
+#	$OpenBSD: Makefile.landisk,v 1.76 2017/11/04 16:04:16 florian Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -140,12 +140,14 @@ locore.o: ${_machdir}/${_mach}/locore.S assym.h
 locore0.o: ${_machdir}/${_mach}/locore0.S assym.h
 locore_subr.o vectors.o in_cksum.o: assym.h
 
-newinstall:
+hardlink-obsd:
 	cmp -s bsd /bsd || ln -f /bsd /obsd
+
+newinstall:
 	umask 077 && cp bsd /nbsd && mv /nbsd /bsd && \
 	    sha256 -h /var/db/kernel.SHA256 /bsd
 
-install: update-link newinstall
+install: update-link hardlink-obsd newinstall
 
 # pull in the dependency information
 .ifnmake clean
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index e470c1bc56e..b57784c32b1 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.loongson,v 1.68 2017/09/28 16:16:34 patrick Exp $
+#	$OpenBSD: Makefile.loongson,v 1.69 2017/11/04 16:04:16 florian Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -154,12 +154,14 @@ context.o cp0access.o exception.o locore.o: assym.h
 lcore_access.o lcore_ddb.o lcore_float.o tlbhandler.o: assym.h
 pmon32.o: assym.h
 
-newinstall:
+hardlink-obsd:
 	cmp -s bsd /bsd || ln -f /bsd /obsd
+
+newinstall:
 	umask 077 && cp bsd /nbsd && mv /nbsd /bsd && \
 	    sha256 -h /var/db/kernel.SHA256 /bsd
 
-install: update-link newinstall
+install: update-link hardlink-obsd newinstall
 
 # pull in the dependency information
 .ifnmake clean
diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index a15b0009e5d..73fb5eb6adf 100644
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.luna88k,v 1.78 2017/09/28 16:16:34 patrick Exp $
+#	$OpenBSD: Makefile.luna88k,v 1.79 2017/11/04 16:04:16 florian Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -143,12 +143,14 @@ depend obj:
 locore0.o: ${_machdir}/${_mach}/locore0.S assym.h
 locore.o eh.o mutex.o process.o subr.o: assym.h
 
-newinstall:
+hardlink-obsd:
 	cmp -s bsd /bsd || ln -f /bsd /obsd
+
+newinstall:
 	umask 077 && cp bsd /nbsd && mv /nbsd /bsd && \
 	    sha256 -h /var/db/kernel.SHA256 /bsd
 
-install: update-link newinstall
+install: update-link hardlink-obsd newinstall
 
 # pull in the dependency information
 .ifnmake clean
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 78a88b9b573..c11370fb8d9 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.macppc,v 1.92 2017/09/28 16:16:34 patrick Exp $
+#	$OpenBSD: Makefile.macppc,v 1.93 2017/11/04 16:04:16 florian Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -140,12 +140,14 @@ locore0.o: ${_machdir}/${_mach}/locore0.S assym.h
 locore.o: ${_machdir}/${_mach}/locore.S assym.h
 mutex.o: assym.h
 
-newinstall:
+hardlink-obsd:
 	cmp -s bsd /bsd || ln -f /bsd /obsd
+
+newinstall:
 	umask 077 && cp bsd /nbsd && mv /nbsd /bsd && \
 	    sha256 -h /var/db/kernel.SHA256 /bsd
 
-install: update-link newinstall
+install: update-link hardlink-obsd newinstall
 
 # pull in the dependency information
 .ifnmake clean
diff --git a/sys/arch/octeon/conf/Makefile.octeon b/sys/arch/octeon/conf/Makefile.octeon
index b9b5989580b..c8059d4124b 100644
--- a/sys/arch/octeon/conf/Makefile.octeon
+++ b/sys/arch/octeon/conf/Makefile.octeon
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.octeon,v 1.47 2017/09/28 16:16:34 patrick Exp $
+#	$OpenBSD: Makefile.octeon,v 1.48 2017/11/04 16:04:16 florian Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -154,12 +154,14 @@ context.o cp0access.o exception.o locore.o: assym.h
 lcore_access.o lcore_ddb.o lcore_float.o tlbhandler.o: assym.h
 mips64r2.o: assym.h
 
-newinstall:
+hardlink-obsd:
 	cmp -s bsd /bsd || ln -f /bsd /obsd
+
+newinstall:
 	umask 077 && cp bsd /nbsd && mv /nbsd /bsd && \
 	    sha256 -h /var/db/kernel.SHA256 /bsd
 
-install: update-link newinstall
+install: update-link hardlink-obsd newinstall
 
 # pull in the dependency information
 .ifnmake clean
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index b52479e5093..644adf5a641 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sgi,v 1.92 2017/09/28 16:16:34 patrick Exp $
+#	$OpenBSD: Makefile.sgi,v 1.93 2017/11/04 16:04:16 florian Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -155,12 +155,14 @@ lcore_access.o lcore_ddb.o lcore_float.o locore.o: assym.h
 tlb_tfp.o tlbhandler.o: assym.h
 cache_tfp_subr.o ip30_nmi.o: assym.h
 
-newinstall:
+hardlink-obsd:
 	cmp -s bsd /bsd || ln -f /bsd /obsd
+
+newinstall:
 	umask 077 && cp bsd /nbsd && mv /nbsd /bsd && \
 	    sha256 -h /var/db/kernel.SHA256 /bsd
 
-install: update-link newinstall
+install: update-link hardlink-obsd newinstall
 
 # pull in the dependency information
 .ifnmake clean
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index 2b527408341..9d1d44db40f 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc64,v 1.95 2017/09/28 16:16:34 patrick Exp $
+#	$OpenBSD: Makefile.sparc64,v 1.96 2017/11/04 16:04:16 florian Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -137,12 +137,14 @@ depend obj:
 locore.o: ${_machdir}/${_mach}/locore.s assym.h
 hvcall.o in_cksum.o mutex.o: assym.h
 
-newinstall:
+hardlink-obsd:
 	cmp -s bsd /bsd || ln -f /bsd /obsd
+
+newinstall:
 	umask 077 && cp bsd /nbsd && mv /nbsd /bsd && \
 	    sha256 -h /var/db/kernel.SHA256 /bsd
 
-install: update-link newinstall
+install: update-link hardlink-obsd newinstall
 
 # pull in the dependency information
 .ifnmake clean