summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2008-12-02 03:20:59 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2008-12-02 03:20:59 +0000
commite77fe03ee41e8897700e5e841bd831c28d568d93 (patch)
tree4a11a0bd742ab05b4c4f579da4a761925031b32e /distrib
parent0dd28ad0baf2f725525aa741d0b78f8686a14200 (diff)
commit with rdsetroot now accepting the filesystem as a 2nd arg
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/common/Makefile.inc4
-rw-r--r--distrib/armish/ramdisk/Makefile4
-rw-r--r--distrib/hp300/ramdisk/Makefile4
-rw-r--r--distrib/hppa/ramdisk/Makefile4
-rw-r--r--distrib/i386/common/Makefile.inc4
-rw-r--r--distrib/landisk/ramdisk/Makefile4
-rw-r--r--distrib/luna88k/ramdisk/Makefile4
-rw-r--r--distrib/mac68k/ramdisk/Makefile4
-rw-r--r--distrib/macppc/ramdisk/Makefile4
-rw-r--r--distrib/mvme68k/ramdisk/Makefile4
-rw-r--r--distrib/mvme88k/ramdisk/Makefile4
-rw-r--r--distrib/mvmeppc/ramdisk/Makefile4
-rw-r--r--distrib/ramdisk/Makefile4
-rw-r--r--distrib/sgi/ramdisk/Makefile4
-rw-r--r--distrib/socppc/ramdisk/Makefile4
-rw-r--r--distrib/sparc64/bsd.rd/Makefile4
-rw-r--r--distrib/zaurus/ramdisk/Makefile4
19 files changed, 38 insertions, 38 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
index 42eeabad372..e6d7a8e0bf5 100644
--- a/distrib/alpha/bsd.rd/Makefile
+++ b/distrib/alpha/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2008/01/11 10:16:40 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2008/12/02 03:20:57 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -46,7 +46,7 @@ bsd.rd: bsd.rd_unz
bsd.rd_unz: bsd ${IMAGE} ${RDSETROOT}
cp bsd bsd.rd_unz
- ${.OBJDIR}/${RDSETROOT} bsd.rd_unz < ${IMAGE}
+ ${.OBJDIR}/${RDSETROOT} bsd.rd_unz ${IMAGE}
bsd:
cd ${.CURDIR}/../../../sys/arch/alpha/conf && config ${RAMDISK}
diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index 74357906d37..d6646a946bb 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.19 2008/01/11 10:16:40 espie Exp $
+# $OpenBSD: Makefile.inc,v 1.20 2008/12/02 03:20:57 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -70,7 +70,7 @@ bsd.gz: bsd.rd
bsd.rd: bsd ${IMAGE} ${RDSETROOT}
cp bsd bsd.rd
- ${.OBJDIR}/${RDSETROOT} bsd.rd < ${IMAGE}
+ ${.OBJDIR}/${RDSETROOT} bsd.rd ${IMAGE}
bsd:
cd ${.CURDIR}/../../../sys/arch/alpha/conf && config ${RAMDISK}
diff --git a/distrib/amd64/common/Makefile.inc b/distrib/amd64/common/Makefile.inc
index 30056825f02..ff9aa97600f 100644
--- a/distrib/amd64/common/Makefile.inc
+++ b/distrib/amd64/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.12 2008/12/02 01:01:07 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2008/12/02 03:20:57 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -60,7 +60,7 @@ bsd.gz: bsd.rd
bsd.rd: ${IMAGE} bsd rdsetroot
cp bsd bsd.rd
- ${.OBJDIR}/rdsetroot bsd.rd < ${IMAGE}
+ ${.OBJDIR}/rdsetroot bsd.rd ${IMAGE}
bsd:
diff --git a/distrib/armish/ramdisk/Makefile b/distrib/armish/ramdisk/Makefile
index c6c29ee6d92..777996ea6bb 100644
--- a/distrib/armish/ramdisk/Makefile
+++ b/distrib/armish/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2008/12/02 01:01:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.6 2008/12/02 03:20:57 deraadt Exp $
REV= ${OSrev}
@@ -42,7 +42,7 @@ ${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
awk 'BEGIN { printf("%c", 192); }' < /dev/null | dd of=${BSD_RD} bs=1 count=1 seek=95 conv=notrunc 2>/dev/null;
awk 'BEGIN { printf("%c", 192); }' < /dev/null | dd of=${BSD_RD} bs=1 count=1 seek=127 conv=notrunc 2>/dev/null;
awk 'BEGIN { printf("%c", 192); }' < /dev/null | dd of=${BSD_RD} bs=1 count=1 seek=159 conv=notrunc 2>/dev/null;
- ${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE}
+ ${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE}
dd if=/dev/zero of=${BSD_RD} bs=1 count=1 seek=95 conv=notrunc 2>/dev/null;
dd if=/dev/zero of=${BSD_RD} bs=1 count=1 seek=127 conv=notrunc 2>/dev/null;
dd if=/dev/zero of=${BSD_RD} bs=1 count=1 seek=159 conv=notrunc 2>/dev/null;
diff --git a/distrib/hp300/ramdisk/Makefile b/distrib/hp300/ramdisk/Makefile
index 0e9f4ac463e..abc572ff309 100644
--- a/distrib/hp300/ramdisk/Makefile
+++ b/distrib/hp300/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2008/12/02 01:01:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.26 2008/12/02 03:20:57 deraadt Exp $
# $NetBSD: Makefile,v 1.1 1995/07/18 04:13:06 briggs Exp $
TOP= ${.CURDIR}/..
@@ -38,7 +38,7 @@ bsd.rd: rdsetroot
${MAKE} clean && ${MAKE} depend && COPTS=-Os ${MAKE}
.endif
cp ${.CURDIR}/../../../sys/arch/hp300/compile/RAMDISK/bsd bsd.rd
- ${.OBJDIR}/rdsetroot bsd.rd < ${IMAGE}
+ ${.OBJDIR}/rdsetroot bsd.rd ${IMAGE}
${IMAGE}: ${CBIN} rd_setup do_files rd_teardown
diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile
index b6b81bb9652..2aa99bce972 100644
--- a/distrib/hppa/ramdisk/Makefile
+++ b/distrib/hppa/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2008/03/04 23:43:11 deraadt Exp $
+# $OpenBSD: Makefile,v 1.14 2008/12/02 03:20:57 deraadt Exp $
CBIN= instbin
ARCHDIR= ${.CURDIR}/..
@@ -70,7 +70,7 @@ obsd:
bsd.rd: obsd ${IMAGE} ${RDSETROOT}
cp obsd bsd.rd
- ${.OBJDIR}/${RDSETROOT} bsd.rd < ${IMAGE}
+ ${.OBJDIR}/${RDSETROOT} bsd.rd ${IMAGE}
@${STRIP} bsd.rd
bsd: bsd.rd
diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc
index 59073bb79de..4ba45639e61 100644
--- a/distrib/i386/common/Makefile.inc
+++ b/distrib/i386/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.22 2008/12/02 01:01:07 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.23 2008/12/02 03:20:57 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -60,7 +60,7 @@ bsd.gz: bsd.rd
bsd.rd: ${IMAGE} bsd rdsetroot
cp bsd bsd.rd
- ${.OBJDIR}/rdsetroot bsd.rd < ${IMAGE}
+ ${.OBJDIR}/rdsetroot bsd.rd ${IMAGE}
bsd:
diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile
index 8bf33cf27f5..e2d54be0201 100644
--- a/distrib/landisk/ramdisk/Makefile
+++ b/distrib/landisk/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2008/12/02 01:01:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.10 2008/12/02 03:20:57 deraadt Exp $
REV= ${OSrev}
@@ -38,7 +38,7 @@ all: ${BSD_RD}
${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
cp bsd ${BSD_RD}
- ${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE}
+ ${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE}
${IMAGE}: rd_setup do_files rd_teardown
diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile
index 0a1d492176e..24ff29d5779 100644
--- a/distrib/luna88k/ramdisk/Makefile
+++ b/distrib/luna88k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2008/12/02 01:01:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.7 2008/12/02 03:20:57 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -28,7 +28,7 @@ all: ${BSD_RD}
${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
cp bsd ${BSD_RD}
- ${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE}
+ ${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE}
${IMAGE}: rd_setup do_files rd_teardown
diff --git a/distrib/mac68k/ramdisk/Makefile b/distrib/mac68k/ramdisk/Makefile
index 85408801cdb..2f4d951d5b9 100644
--- a/distrib/mac68k/ramdisk/Makefile
+++ b/distrib/mac68k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2008/12/02 01:01:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.12 2008/12/02 03:20:57 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -27,7 +27,7 @@ all: ${BSD_RD}
${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
cp bsd ${BSD_RD}
- ${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE}
+ ${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE}
${IMAGE}: rd_setup do_files rd_teardown
diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile
index 394805622ae..4355ee1b35c 100644
--- a/distrib/macppc/ramdisk/Makefile
+++ b/distrib/macppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2008/12/02 01:01:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.22 2008/12/02 03:20:57 deraadt Exp $
REV= ${OSrev}
@@ -38,7 +38,7 @@ all: ${BSD_RD} cd
${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
cp bsd ${BSD_RD}
- ${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE}
+ ${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE}
cd: ${BSD_RD}
-rm -rf ${.OBJDIR}/cd-dir/
diff --git a/distrib/mvme68k/ramdisk/Makefile b/distrib/mvme68k/ramdisk/Makefile
index ef254984519..7a2ca85f0a5 100644
--- a/distrib/mvme68k/ramdisk/Makefile
+++ b/distrib/mvme68k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2008/12/02 01:01:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.23 2008/12/02 03:20:57 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -28,7 +28,7 @@ all: ${BSD_RD}
${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
cp bsd ${BSD_RD}
- ${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE}
+ ${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE}
${IMAGE}: rd_setup do_files rd_teardown
diff --git a/distrib/mvme88k/ramdisk/Makefile b/distrib/mvme88k/ramdisk/Makefile
index e737aa105b3..af5244abb66 100644
--- a/distrib/mvme88k/ramdisk/Makefile
+++ b/distrib/mvme88k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2008/12/02 01:01:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.12 2008/12/02 03:20:57 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -28,7 +28,7 @@ all: ${BSD_RD}
${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
cp bsd ${BSD_RD}
- ${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE}
+ ${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE}
${IMAGE}: rd_setup do_files rd_teardown
diff --git a/distrib/mvmeppc/ramdisk/Makefile b/distrib/mvmeppc/ramdisk/Makefile
index cd276f8b976..83e58140f9e 100644
--- a/distrib/mvmeppc/ramdisk/Makefile
+++ b/distrib/mvmeppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2008/12/02 01:01:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.12 2008/12/02 03:20:57 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -35,7 +35,7 @@ all: ${BSD_RD} cd
${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
cp bsd ${BSD_RD}
- ${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE}
+ ${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE}
cd: ${BSD_RD}
-rm -rf ${.OBJDIR}/cd-dir/
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index 9a08c877ccd..06e584e2405 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2008/01/11 10:16:40 espie Exp $
+# $OpenBSD: Makefile,v 1.33 2008/12/02 03:20:57 deraadt Exp $
REV= ${OSrev}
@@ -90,7 +90,7 @@ bsd:
bsd.rd: bsd ${IMAGE} ${RDSETROOT}
cp bsd bsd.rd
- ${.OBJDIR}/${RDSETROOT} bsd.rd < ${IMAGE}
+ ${.OBJDIR}/${RDSETROOT} bsd.rd ${IMAGE}
${STRIP} bsd.rd
bsd.gz: bsd.rd
diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile
index 5bd555e7b3a..742b8cd7058 100644
--- a/distrib/sgi/ramdisk/Makefile
+++ b/distrib/sgi/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2008/12/02 01:01:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.7 2008/12/02 03:20:58 deraadt Exp $
REV= ${OSrev}
@@ -37,7 +37,7 @@ all: ${BSD_RD}
${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
cp bsd bsd.rd
- ${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE}
+ ${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE}
${IMAGE}: rd_setup do_files rd_teardown
diff --git a/distrib/socppc/ramdisk/Makefile b/distrib/socppc/ramdisk/Makefile
index 7401304fe07..0a34d6af8e9 100644
--- a/distrib/socppc/ramdisk/Makefile
+++ b/distrib/socppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2008/12/02 01:01:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2008/12/02 03:20:58 deraadt Exp $
REV= ${OSrev}
@@ -38,7 +38,7 @@ all: ${BSD_RD} ${BSD_BIN}
${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
cp bsd ${BSD_RD}
- ${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE}
+ ${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE}
${BSD_BIN}: ${BSD_RD}
objcopy -O binary ${BSD_RD} ${BSD_BIN}
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index da5c576d5f7..a45c0a468d9 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2008/12/02 01:01:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.18 2008/12/02 03:20:58 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -50,7 +50,7 @@ bsd.rd: bsd.rd_unz
bsd.rd_unz: bsd ${IMAGE} ${RDSETROOT}
cp bsd bsd.rd_unz
- ${.OBJDIR}/${RDSETROOT} bsd.rd_unz < ${IMAGE}
+ ${.OBJDIR}/${RDSETROOT} bsd.rd_unz ${IMAGE}
bsd:
cd ${.CURDIR}/../../../sys/arch/sparc64/conf && config ${RAMDISK}
diff --git a/distrib/zaurus/ramdisk/Makefile b/distrib/zaurus/ramdisk/Makefile
index d702e15cd65..035c419fd5e 100644
--- a/distrib/zaurus/ramdisk/Makefile
+++ b/distrib/zaurus/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2008/12/02 01:01:08 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2008/12/02 03:20:58 deraadt Exp $
REV= ${OSrev}
@@ -38,7 +38,7 @@ all: ${BSD_RD}
${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
cp bsd ${BSD_RD}
- ${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE}
+ ${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE}
${IMAGE}: rd_setup do_files rd_teardown
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 13:42:34 +0000