From: deraadt <deraadt@openbsd.org>
Date: Sat, 27 Dec 2014 06:02:00 +0000 (+0000)
Subject: SRCDIRS must now always come from distrib/special.  A few systems
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1d661162757944174c6f2db62e4070fa8ca2d26c;p=openbsd

SRCDIRS must now always come from distrib/special.  A few systems
still MD installboot, and we will need to repair those before
release, or force them pure -static use by both base and instbin.
---

diff --git a/distrib/alpha/common/list b/distrib/alpha/common/list
index 1cbaa29a7e7..e95c6d42279 100644
--- a/distrib/alpha/common/list
+++ b/distrib/alpha/common/list
@@ -1,7 +1,6 @@
-#	$OpenBSD: list,v 1.40 2014/07/20 02:37:35 deraadt Exp $
+#	$OpenBSD: list,v 1.41 2014/12/27 06:02:00 deraadt Exp $
 
 SRCDIRS distrib/special
-SRCDIRS bin sbin
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin			instbin
diff --git a/distrib/armish/ramdisk/list b/distrib/armish/ramdisk/list
index 0d36acf8954..5b7f3191405 100644
--- a/distrib/armish/ramdisk/list
+++ b/distrib/armish/ramdisk/list
@@ -1,7 +1,6 @@
-#	$OpenBSD: list,v 1.24 2014/12/03 20:11:19 florian Exp $
+#	$OpenBSD: list,v 1.25 2014/12/27 06:02:01 deraadt Exp $
 
 SRCDIRS distrib/special
-SRCDIRS bin sbin
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin			instbin
diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list
index 40fc44fe43d..6e717fd7980 100644
--- a/distrib/armv7/ramdisk/list
+++ b/distrib/armv7/ramdisk/list
@@ -1,7 +1,6 @@
-#	$OpenBSD: list,v 1.11 2014/12/03 20:11:19 florian Exp $
+#	$OpenBSD: list,v 1.12 2014/12/27 06:02:01 deraadt Exp $
 
 SRCDIRS distrib/special
-SRCDIRS bin sbin
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin			instbin
diff --git a/distrib/aviion/ramdisk/list b/distrib/aviion/ramdisk/list
index c7730a6849a..fbc52c1727e 100644
--- a/distrib/aviion/ramdisk/list
+++ b/distrib/aviion/ramdisk/list
@@ -1,7 +1,6 @@
-#	$OpenBSD: list,v 1.10 2014/12/03 20:11:19 florian Exp $
+#	$OpenBSD: list,v 1.11 2014/12/27 06:02:01 deraadt Exp $
 
 SRCDIRS distrib/special
-SRCDIRS bin sbin
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin			instbin
diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list
index e8657f8d207..78639fdc67b 100644
--- a/distrib/landisk/ramdisk/list
+++ b/distrib/landisk/ramdisk/list
@@ -1,7 +1,6 @@
-#	$OpenBSD: list,v 1.32 2014/12/03 20:11:19 florian Exp $
+#	$OpenBSD: list,v 1.33 2014/12/27 06:02:01 deraadt Exp $
 
 SRCDIRS distrib/special
-SRCDIRS bin sbin
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin			instbin
diff --git a/distrib/luna88k/ramdisk/list b/distrib/luna88k/ramdisk/list
index f0ee2482478..267598c21f1 100644
--- a/distrib/luna88k/ramdisk/list
+++ b/distrib/luna88k/ramdisk/list
@@ -1,7 +1,6 @@
-#	$OpenBSD: list,v 1.26 2014/12/03 20:11:19 florian Exp $
+#	$OpenBSD: list,v 1.27 2014/12/27 06:02:01 deraadt Exp $
 
 SRCDIRS distrib/special
-SRCDIRS bin sbin
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin			instbin
diff --git a/distrib/miniroot/list b/distrib/miniroot/list
index f739f540d73..cdb27aa0186 100644
--- a/distrib/miniroot/list
+++ b/distrib/miniroot/list
@@ -1,7 +1,6 @@
-#	$OpenBSD: list,v 1.59 2014/12/03 20:11:19 florian Exp $
+#	$OpenBSD: list,v 1.60 2014/12/27 06:02:01 deraadt Exp $
 
 SRCDIRS distrib/special
-SRCDIRS bin sbin
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin			instbin
diff --git a/distrib/octeon/ramdisk/list b/distrib/octeon/ramdisk/list
index ad521c8f3b7..66094ac6649 100644
--- a/distrib/octeon/ramdisk/list
+++ b/distrib/octeon/ramdisk/list
@@ -1,7 +1,6 @@
-#	$OpenBSD: list,v 1.10 2014/12/03 20:11:19 florian Exp $
+#	$OpenBSD: list,v 1.11 2014/12/27 06:02:01 deraadt Exp $
 
 SRCDIRS distrib/special
-SRCDIRS bin sbin
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin			instbin
diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list
index abd949ebda5..6a4b14aeb38 100644
--- a/distrib/ramdisk/list
+++ b/distrib/ramdisk/list
@@ -1,8 +1,6 @@
-#	$OpenBSD: list,v 1.49 2014/12/03 20:11:19 florian Exp $
-#	$NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
+#	$OpenBSD: list,v 1.50 2014/12/27 06:02:01 deraadt Exp $
 
 SRCDIRS distrib/special
-SRCDIRS bin sbin
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin			instbin
diff --git a/distrib/socppc/ramdisk/list b/distrib/socppc/ramdisk/list
index 9eedb1194e0..01875d296cc 100644
--- a/distrib/socppc/ramdisk/list
+++ b/distrib/socppc/ramdisk/list
@@ -1,7 +1,6 @@
-#	$OpenBSD: list,v 1.24 2014/12/03 20:11:19 florian Exp $
+#	$OpenBSD: list,v 1.25 2014/12/27 06:02:01 deraadt Exp $
 
 SRCDIRS distrib/special
-SRCDIRS bin sbin
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin			instbin
diff --git a/distrib/vax/common/list b/distrib/vax/common/list
index 4acfa550d68..fd7612258e5 100644
--- a/distrib/vax/common/list
+++ b/distrib/vax/common/list
@@ -1,7 +1,6 @@
-#	$OpenBSD: list,v 1.32 2014/12/23 17:42:57 deraadt Exp $
+#	$OpenBSD: list,v 1.33 2014/12/27 06:02:01 deraadt Exp $
 
 SRCDIRS distrib/special
-#SRCDIRS bin sbin
 SRCDIRS sys/arch/vax/stand
 
 # copy the crunched binary, link to it, and kill it