summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2019-04-14 14:07:09 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2019-04-14 14:07:09 +0000
commit8e4ff341776e248f3b84ce0033e33109e67e060f (patch)
tree796227e5fc0fff4fd727e7769f269404229837f5 /distrib
parent6ea34e8d76621b3a07963243bade30421938e9d4 (diff)
Instead of using COPTS=-Oz (and similar) in make environment to force
tightly-built ramdisk kernels, set the option in per-arch Makefile.inc based upon SMALL_KERNEL
Diffstat (limited to 'distrib')
-rw-r--r--distrib/alpha/bsd.rd/Makefile4
-rw-r--r--distrib/alpha/common/Makefile.inc4
-rw-r--r--distrib/amd64/ramdiskA/Makefile.inc4
-rw-r--r--distrib/amd64/ramdisk_cd/Makefile.inc4
-rw-r--r--distrib/i386/common/Makefile.inc6
-rw-r--r--distrib/ramdisk/Makefile4
-rw-r--r--distrib/socppc/ramdisk/Makefile4
-rw-r--r--distrib/sparc64/bsd.rd/Makefile4
-rw-r--r--distrib/sparc64/ramdisk/Makefile4
-rw-r--r--distrib/sparc64/ramdiskB/Makefile4
10 files changed, 20 insertions, 22 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
index 39168a4e9bd..517928d4b55 100644
--- a/distrib/alpha/bsd.rd/Makefile
+++ b/distrib/alpha/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2019/04/05 21:08:00 deraadt Exp $
+# $OpenBSD: Makefile,v 1.32 2019/04/14 14:07:07 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -31,7 +31,7 @@ bsd.rd_unz: bsd ${IMAGE}
bsd:
cd ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK} && \
- su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Oz ${MAKE}'
+ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
cp -p ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK}/obj/bsd bsd
${IMAGE}: ${CBIN}
diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index 162759f90fa..d5c1dccfa5d 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.36 2019/04/05 21:08:00 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.37 2019/04/14 14:07:07 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -72,7 +72,7 @@ bsd.rd: bsd ${IMAGE}
bsd:
cd ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK} && \
- su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Oz ${MAKE}'
+ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
cp -p ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK}/obj/bsd bsd
${IMAGE}: ${CBIN}
diff --git a/distrib/amd64/ramdiskA/Makefile.inc b/distrib/amd64/ramdiskA/Makefile.inc
index d623deb07ef..fdb9e5341e0 100644
--- a/distrib/amd64/ramdiskA/Makefile.inc
+++ b/distrib/amd64/ramdiskA/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.8 2019/04/05 21:08:00 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2019/04/14 14:07:07 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -74,7 +74,7 @@ bsd.rd: mr.fs bsd
bsd:
cd ${.CURDIR}/../../../sys/arch/amd64/compile/${RAMDISK} && \
- su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS="-Oz -fno-ret-protector" ${MAKE}'
+ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
cp -p ${.CURDIR}/../../../sys/arch/amd64/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
diff --git a/distrib/amd64/ramdisk_cd/Makefile.inc b/distrib/amd64/ramdisk_cd/Makefile.inc
index a4ad30a640d..bd78f227ece 100644
--- a/distrib/amd64/ramdisk_cd/Makefile.inc
+++ b/distrib/amd64/ramdisk_cd/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.8 2019/04/05 21:08:00 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2019/04/14 14:07:07 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -77,7 +77,7 @@ bsd.rd: mr.fs bsd
bsd:
cd ${.CURDIR}/../../../sys/arch/amd64/compile/${RAMDISK} && \
- su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Oz ${MAKE}'
+ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
cp -p ${.CURDIR}/../../../sys/arch/amd64/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc
index e755d39c92c..f273eca67a6 100644
--- a/distrib/i386/common/Makefile.inc
+++ b/distrib/i386/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.45 2019/04/05 21:08:00 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.46 2019/04/14 14:07:07 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -57,8 +57,6 @@ unconfig:
DISKTYPE?= rdroot
MAKEFSARGS_RD= -o disklabel=${DISKTYPE},minfree=0,density=4096
-COPTS= -Oz -mtune=i486
-
bsd.gz: bsd.rd
cp bsd.rd bsd.strip
strip bsd.strip
@@ -71,7 +69,7 @@ bsd.rd: ${IMAGE} bsd
bsd:
cd ${.CURDIR}/../../../sys/arch/i386/compile/${RAMDISK} && \
- su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS="${COPTS}" ${MAKE}'
+ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
cp -p ${.CURDIR}/../../../sys/arch/i386/compile/${RAMDISK}/obj/bsd bsd
${IMAGE}: ${CBIN}
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index a610b4292d5..e8b20646866 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2019/04/05 21:08:01 deraadt Exp $
+# $OpenBSD: Makefile,v 1.54 2019/04/14 14:07:07 deraadt Exp $
REV= ${OSrev}
@@ -72,7 +72,7 @@ ${FLOPPY}: bsd.gz ${BOOT} ${BOOTXX}
bsd:
cd ${.CURDIR}/../../sys/arch/${MACHINE}/compile/${KERNEL} && \
- su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Oz ${MAKE}'
+ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
cp -p ${.CURDIR}/../../sys/arch/${MACHINE}/compile/${KERNEL}/obj/bsd bsd
bsd.rd: bsd ${IMAGE}
diff --git a/distrib/socppc/ramdisk/Makefile b/distrib/socppc/ramdisk/Makefile
index 3805c198427..9bf155b267e 100644
--- a/distrib/socppc/ramdisk/Makefile
+++ b/distrib/socppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2019/04/05 21:08:01 deraadt Exp $
+# $OpenBSD: Makefile,v 1.19 2019/04/14 14:07:08 deraadt Exp $
REV= ${OSrev}
@@ -48,7 +48,7 @@ ${IMAGE}: ${CBIN}
bsd:
cd ${TOP}/../../sys/arch/socppc/compile/RAMDISK && \
- su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Oz ${MAKE}'
+ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
cp -p ${TOP}/../../sys/arch/socppc/compile/RAMDISK/obj/bsd bsd
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index 15b60a0ad2c..bbd338bc0da 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2019/04/05 21:08:01 deraadt Exp $
+# $OpenBSD: Makefile,v 1.37 2019/04/14 14:07:08 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -30,7 +30,7 @@ bsd.rd_unz: bsd ${IMAGE}
bsd:
cd ${.CURDIR}/../../../sys/arch/sparc64/compile/${RAMDISK} && \
- su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Oz ${MAKE}'
+ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
cp -p ${.CURDIR}/../../../sys/arch/sparc64/compile/${RAMDISK}/obj/bsd bsd
${IMAGE}: ${CBIN}
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index 9acd15ce1d6..054f3cdc882 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2019/04/05 21:08:01 deraadt Exp $
+# $OpenBSD: Makefile,v 1.38 2019/04/14 14:07:08 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -77,7 +77,7 @@ ${IMAGE}: ${CBIN}
bsd:
cd ${TOP}/../../sys/arch/sparc64/compile/${KERNEL} && \
- su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Oz ${MAKE}'
+ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env ${MAKE}'
cp -p ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/obj/bsd bsd
unconfig:
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index 940f5a1801e..b6efc0a0a6a 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2019/04/05 21:08:01 deraadt Exp $
+# $OpenBSD: Makefile,v 1.32 2019/04/14 14:07:08 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -77,7 +77,7 @@ ${IMAGE}: ${CBIN}
bsd:
cd ${TOP}/../../sys/arch/sparc64/compile/${KERNEL} && \
- su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Oz ${MAKE}'
+ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
cp -p ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/obj/bsd bsd
unconfig:
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 19:53:15 +0000