From 8daf3a3d434a9b4669a5a7cdac7f2ec165235868 Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Tue, 21 Apr 2009 09:12:29 +0000 Subject: [PATCH] move bsd and bsd.rd and all such other MD "sets" into the MD files, since we perhaps cannot assume that is what kernels will be in the pathetically stupid world that SGI created --- src/etc/Makefile | 6 +++--- src/etc/etc.alpha/Makefile.inc | 4 ++-- src/etc/etc.amd64/Makefile.inc | 4 ++-- src/etc/etc.armish/Makefile.inc | 4 ++-- src/etc/etc.aviion/Makefile.inc | 4 ++-- src/etc/etc.hp300/Makefile.inc | 4 ++-- src/etc/etc.hppa/Makefile.inc | 4 ++-- src/etc/etc.hppa64/Makefile.inc | 4 ++-- src/etc/etc.i386/Makefile.inc | 4 ++-- src/etc/etc.landisk/Makefile.inc | 4 ++-- src/etc/etc.luna88k/Makefile.inc | 4 +++- src/etc/etc.mac68k/Makefile.inc | 4 +++- src/etc/etc.macppc/Makefile.inc | 4 ++-- src/etc/etc.mvme68k/Makefile.inc | 4 ++-- src/etc/etc.mvme88k/Makefile.inc | 4 ++-- src/etc/etc.mvmeppc/Makefile.inc | 4 ++-- src/etc/etc.sgi/Makefile.inc | 5 ++--- src/etc/etc.socppc/Makefile.inc | 4 ++-- src/etc/etc.sparc/Makefile.inc | 4 ++-- src/etc/etc.sparc64/Makefile.inc | 4 ++-- src/etc/etc.vax/Makefile.inc | 4 ++-- src/etc/etc.zaurus/Makefile.inc | 4 ++-- 22 files changed, 47 insertions(+), 44 deletions(-) diff --git a/src/etc/Makefile b/src/etc/Makefile index c177bec0..d06f4725 100644 --- a/src/etc/Makefile +++ b/src/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.272 2009/04/17 03:58:52 deraadt Exp $ +# $OpenBSD: Makefile,v 1.273 2009/04/21 09:12:24 deraadt Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -30,7 +30,7 @@ BIN1+= wsconsctl.conf # -rw-rw-r-- BIN2= motd -MISETS= bsd base${OSrev}.tgz comp${OSrev}.tgz misc${OSrev}.tgz \ +MISETS= base${OSrev}.tgz comp${OSrev}.tgz misc${OSrev}.tgz \ man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz PCS= pcs750.bin @@ -273,7 +273,7 @@ release-sets: sha: -cd ${RELEASEDIR}; \ - sum -a sha256 bsd.rd INSTALL.`arch -ks` ${MDEXT} ${MISETS} > SHA256 + sum -a sha256 INSTALL.`arch -ks` ${MDEXT} ${MISETS} > SHA256 release: distribution kernels release-sets distrib sha diff --git a/src/etc/etc.alpha/Makefile.inc b/src/etc/etc.alpha/Makefile.inc index 09fcff26..f5620f70 100644 --- a/src/etc/etc.alpha/Makefile.inc +++ b/src/etc/etc.alpha/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.16 2009/04/17 03:58:53 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.17 2009/04/21 09:12:26 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/alpha/compile/GENERIC/bsd \ @@ -14,7 +14,7 @@ bootblocks: cp ${DESTDIR}/usr/mdec/bootxx ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/netboot ${RELEASEDIR} -MDEXT= cd${OSrev}.iso floppy${OSrev}.fs floppyB${OSrev}.fs \ +MDEXT= bsd bsd.rd cd${OSrev}.iso floppy${OSrev}.fs floppyB${OSrev}.fs \ boot bootxx netboot .PHONY: bsd bootblocks diff --git a/src/etc/etc.amd64/Makefile.inc b/src/etc/etc.amd64/Makefile.inc index 6b10c491..4853f7cd 100644 --- a/src/etc/etc.amd64/Makefile.inc +++ b/src/etc/etc.amd64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.8 2009/04/17 03:58:53 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2009/04/21 09:12:26 deraadt Exp $ kernels: bsd bsd.mp bootblocks cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC/bsd \ @@ -21,7 +21,7 @@ bootblocks: cp ${DESTDIR}/usr/mdec/cdboot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/cdbr ${RELEASEDIR} -MDEXT= bsd.mp cd${OSrev}.iso floppy${OSrev}.fs \ +MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso floppy${OSrev}.fs \ pxeboot cdboot cdbr .PHONY: bsd bsd.mp bootblocks diff --git a/src/etc/etc.armish/Makefile.inc b/src/etc/etc.armish/Makefile.inc index 4ee665ee..c19f19a7 100644 --- a/src/etc/etc.armish/Makefile.inc +++ b/src/etc/etc.armish/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.6 2009/04/17 03:58:53 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2009/04/21 09:12:26 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/armish/compile/GENERIC/bsd \ @@ -12,6 +12,6 @@ bsd: bootblocks: cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR} -MDEXT= +MDEXT= bsd bsd.rd boot .PHONY: bsd bootblocks diff --git a/src/etc/etc.aviion/Makefile.inc b/src/etc/etc.aviion/Makefile.inc index e9aba84a..f3199ff5 100644 --- a/src/etc/etc.aviion/Makefile.inc +++ b/src/etc/etc.aviion/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 2009/04/17 03:58:53 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2009/04/21 09:12:26 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/aviion/compile/GENERIC/bsd \ @@ -12,6 +12,6 @@ bsd: bootblocks: cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/ -MDEXT= +MDEXT= bsd bsd.rd # bootblocks? .PHONY: bsd bootblocks diff --git a/src/etc/etc.hp300/Makefile.inc b/src/etc/etc.hp300/Makefile.inc index 645ddd69..5fbb8e6e 100644 --- a/src/etc/etc.hp300/Makefile.inc +++ b/src/etc/etc.hp300/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.20 2009/04/17 03:58:53 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.21 2009/04/21 09:12:26 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/hp300/compile/GENERIC/bsd \ @@ -13,6 +13,6 @@ bootblocks: cp ${DESTDIR}/usr/mdec/uboot.lif ${RELEASEDIR}/SYS_UBOOT cp ${DESTDIR}/usr/mdec/cdboot.lif ${RELEASEDIR}/SYS_CDBOOT -MDEXT= +MDEXT= bsd bsd.rd SYS_UBOOT SYS_CDBOOT .PHONY: bsd bootblocks diff --git a/src/etc/etc.hppa/Makefile.inc b/src/etc/etc.hppa/Makefile.inc index e90b2856..f00f128a 100644 --- a/src/etc/etc.hppa/Makefile.inc +++ b/src/etc/etc.hppa/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.6 2009/04/17 03:58:53 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2009/04/21 09:12:26 deraadt Exp $ kernels: bootblocks bsd cp ${.CURDIR}/../sys/arch/hppa/compile/GENERIC/bsd \ @@ -12,6 +12,6 @@ bsd: bootblocks: cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR} -MDEXT= cd${OSrev}.iso xxboot +MDEXT= bsd bsd.rd cd${OSrev}.iso xxboot .PHONY: bsd bootblocks diff --git a/src/etc/etc.hppa64/Makefile.inc b/src/etc/etc.hppa64/Makefile.inc index dcf8a29c..6a449462 100644 --- a/src/etc/etc.hppa64/Makefile.inc +++ b/src/etc/etc.hppa64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 2009/04/17 03:58:53 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2009/04/21 09:12:26 deraadt Exp $ kernels: bootblocks bsd cp ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC/bsd \ @@ -12,6 +12,6 @@ bsd: bootblocks: cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR} -MDEXT= +MDEXT= bsd bsd.rd xxboot .PHONY: bootblocks bsd diff --git a/src/etc/etc.i386/Makefile.inc b/src/etc/etc.i386/Makefile.inc index 7434cd5d..0c5e1615 100644 --- a/src/etc/etc.i386/Makefile.inc +++ b/src/etc/etc.i386/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.17 2009/04/17 03:58:53 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.18 2009/04/21 09:12:26 deraadt Exp $ kernels: bsd bsd.mp bootblocks linux-notes cp ${.CURDIR}/../sys/arch/i386/compile/GENERIC/bsd \ @@ -24,7 +24,7 @@ bootblocks: linux-notes: cp ${.CURDIR}/etc.i386/INSTALL.* ${RELEASEDIR} -MDEXT= bsd.mp cd${OSrev}.iso cdemu${OSrev}.iso \ +MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso cdemu${OSrev}.iso \ floppy${OSrev}.fs floppyB${OSrev}.fs floppyC${OSrev}.fs \ pxeboot cdboot cdbr INSTALL.linux diff --git a/src/etc/etc.landisk/Makefile.inc b/src/etc/etc.landisk/Makefile.inc index e39270ef..4980262c 100644 --- a/src/etc/etc.landisk/Makefile.inc +++ b/src/etc/etc.landisk/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.4 2009/04/17 04:24:15 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2009/04/21 09:12:26 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/landisk/compile/GENERIC/bsd \ @@ -14,6 +14,6 @@ bootblocks: cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR} -MDEXT= +MDEXT= bsd mbr bsd.rd xxboot boot .PHONY: bsd bootblocks diff --git a/src/etc/etc.luna88k/Makefile.inc b/src/etc/etc.luna88k/Makefile.inc index f53c2f75..e4614a94 100644 --- a/src/etc/etc.luna88k/Makefile.inc +++ b/src/etc/etc.luna88k/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2009/04/21 09:12:26 deraadt Exp $ kernels: bsd cp ${.CURDIR}/../sys/arch/luna88k/compile/GENERIC/bsd \ @@ -9,5 +9,7 @@ bsd: cd ${.CURDIR}/../sys/arch/luna88k/compile/GENERIC && \ ${MAKE} clean && ${MAKE} depend && ${MAKE} +MDEXT= bsd bsd.rd + .PHONY: bsd diff --git a/src/etc/etc.mac68k/Makefile.inc b/src/etc/etc.mac68k/Makefile.inc index 48a425bb..68126ce5 100644 --- a/src/etc/etc.mac68k/Makefile.inc +++ b/src/etc/etc.mac68k/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.11 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.12 2009/04/21 09:12:27 deraadt Exp $ kernels: bsd cp ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC/bsd \ @@ -11,4 +11,6 @@ bsd: cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC && \ ${MAKE} clean && ${MAKE} depend && exec ${MAKE} +MDEXT= bsd bsd.rd bsdsbc bsdsbc.rd # utils?? + .PHONY: bsd diff --git a/src/etc/etc.macppc/Makefile.inc b/src/etc/etc.macppc/Makefile.inc index 983ee079..82a475e2 100644 --- a/src/etc/etc.macppc/Makefile.inc +++ b/src/etc/etc.macppc/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.11 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.12 2009/04/21 09:12:27 deraadt Exp $ kernels: bsd bsd.mp bootblocks cp ${.CURDIR}/../sys/arch/macppc/compile/GENERIC/bsd \ @@ -21,7 +21,7 @@ bootblocks: cp ${DESTDIR}/usr/mdec/bsd.tbxi ${RELEASEDIR}/bsd.tbxi cp ${DESTDIR}/usr/mdec/boot.mac ${RELEASEDIR}/boot.mac -MDEXT= bsd.mp cd${OSrev}.iso \ +MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso \ ofwboot bsd.tbxi boot.mac .PHONY: bsd bsd.mp bootblocks diff --git a/src/etc/etc.mvme68k/Makefile.inc b/src/etc/etc.mvme68k/Makefile.inc index 3e246826..332f984c 100644 --- a/src/etc/etc.mvme68k/Makefile.inc +++ b/src/etc/etc.mvme68k/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.10 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.11 2009/04/21 09:12:27 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/mvme68k/compile/GENERIC/bsd \ @@ -12,6 +12,6 @@ bsd: bootblocks: cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/ -MDEXT= +MDEXT= bsd bsd.rd installboot netboot rboot sboot stboot .PHONY: bsd bootblocks diff --git a/src/etc/etc.mvme88k/Makefile.inc b/src/etc/etc.mvme88k/Makefile.inc index d79aaa7d..e4160f11 100644 --- a/src/etc/etc.mvme88k/Makefile.inc +++ b/src/etc/etc.mvme88k/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.9 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.10 2009/04/21 09:12:27 deraadt Exp $ kernels: bsd bsd.mp bootblocks cp ${.CURDIR}/../sys/arch/mvme88k/compile/GENERIC/bsd \ @@ -19,6 +19,6 @@ bsd.mp: bootblocks: cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/ -MDEXT= +MDEXT= bsd bsd.rd bootsd bootst bootxx installboot netboot stboot tftpboot .PHONY: bsd bsd.mp bootblocks diff --git a/src/etc/etc.mvmeppc/Makefile.inc b/src/etc/etc.mvmeppc/Makefile.inc index be477ef8..e6822d99 100644 --- a/src/etc/etc.mvmeppc/Makefile.inc +++ b/src/etc/etc.mvmeppc/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2009/04/21 09:12:27 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/mvmeppc/compile/GENERIC/bsd \ @@ -14,6 +14,6 @@ bootblocks: cp ${DESTDIR}/usr/mdec/bootsd ${RELEASEDIR}/bootsd cp ${DESTDIR}/usr/mdec/installboot ${RELEASEDIR}/installboot -MDEXT= +MDEXT= bsd bsd.rd bootxx bootsd installboot .PHONY: bsd bootblocks diff --git a/src/etc/etc.sgi/Makefile.inc b/src/etc/etc.sgi/Makefile.inc index 97957a56..b792eff4 100644 --- a/src/etc/etc.sgi/Makefile.inc +++ b/src/etc/etc.sgi/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2009/04/21 09:12:27 deraadt Exp $ kernels: bsd cp ${.CURDIR}/../sys/arch/sgi/compile/GENERIC/bsd \ @@ -9,7 +9,6 @@ bsd: cd ${.CURDIR}/../sys/arch/sgi/compile/GENERIC && \ ${MAKE} clean && ${MAKE} depend && exec ${MAKE} -MDEXT= +MDEXT= bsd bsd.rd cd${OSrev}.iso .PHONY: bsd - diff --git a/src/etc/etc.socppc/Makefile.inc b/src/etc/etc.socppc/Makefile.inc index d6ad4b30..63d0c609 100644 --- a/src/etc/etc.socppc/Makefile.inc +++ b/src/etc/etc.socppc/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.2 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2009/04/21 09:12:27 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/socppc/compile/GENERIC/bsd \ @@ -12,6 +12,6 @@ bsd: bootblocks: cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}/boot -MDEXT= +MDEXT= bsd bsd.rd boot .PHONY: bsd bootblocks diff --git a/src/etc/etc.sparc/Makefile.inc b/src/etc/etc.sparc/Makefile.inc index 5f16f567..940dd9db 100644 --- a/src/etc/etc.sparc/Makefile.inc +++ b/src/etc/etc.sparc/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.15 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.16 2009/04/21 09:12:29 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/sparc/compile/GENERIC/bsd \ @@ -18,6 +18,6 @@ bootblocks: ${DESTDIR}/usr/mdec/binstall net /tmp && \ mv /tmp/boot.sparc.openbsd ${RELEASEDIR}/boot.net -MDEXT= bsd.scsi3 boot boot.net bootxx installboot +MDEXT= bsd bsd.rd bsd.scsi3 boot boot.net bootxx installboot .PHONY: bsd bootblocks diff --git a/src/etc/etc.sparc64/Makefile.inc b/src/etc/etc.sparc64/Makefile.inc index f42737b7..677cbeaa 100644 --- a/src/etc/etc.sparc64/Makefile.inc +++ b/src/etc/etc.sparc64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.6 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2009/04/21 09:12:29 deraadt Exp $ kernels: bsd bsd.mp bootblocks cp ${.CURDIR}/../sys/arch/sparc64/compile/GENERIC/bsd \ @@ -19,7 +19,7 @@ bsd.mp: bootblocks: cp ${DESTDIR}/usr/mdec/*boot* ${RELEASEDIR} -MDEXT= bsd.mp cd${OSrev}.iso miniroot${OSrev}.fs \ +MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso miniroot${OSrev}.fs \ floppy${OSrev}.fs floppyB${OSrev}.fs \ bootblk installboot ofwboot ofwboot.net diff --git a/src/etc/etc.vax/Makefile.inc b/src/etc/etc.vax/Makefile.inc index 8cd8656c..12323574 100644 --- a/src/etc/etc.vax/Makefile.inc +++ b/src/etc/etc.vax/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.7 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2009/04/21 09:12:29 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/vax/compile/GENERIC/bsd \ @@ -12,6 +12,6 @@ bsd: bootblocks: mopa.out ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}/boot.mop -MDEXT= boot.mop +MDEXT= bsd bsd.rd boot.mop .PHONY: bsd bootblocks diff --git a/src/etc/etc.zaurus/Makefile.inc b/src/etc/etc.zaurus/Makefile.inc index 1298dd1d..4574a8fd 100644 --- a/src/etc/etc.zaurus/Makefile.inc +++ b/src/etc/etc.zaurus/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.7 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2009/04/21 09:12:29 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/zaurus/compile/GENERIC/bsd \ @@ -13,6 +13,6 @@ bootblocks: cp ${DESTDIR}/usr/mdec/zboot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/zbsdmod.o ${RELEASEDIR} -MDEXT= zboot zbsdmod.o openbsd45_arm.ipk Packages +MDEXT= bsd bsd.rd zboot zbsdmod.o openbsd45_arm.ipk Packages .PHONY: bsd bootblocks