summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--distrib/alpha/bsd.rd/Makefile5
-rw-r--r--distrib/alpha/common/Makefile.inc5
-rw-r--r--distrib/hppa/ramdisk/Makefile5
-rw-r--r--distrib/ramdisk/Makefile4
-rw-r--r--distrib/sparc64/bsd.rd/Makefile5
-rw-r--r--distrib/sparc64/ramdisk/Makefile5
-rw-r--r--distrib/sparc64/ramdiskB/Makefile5
7 files changed, 14 insertions, 20 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
index 85189a44bc4..cf2997c02ec 100644
--- a/distrib/alpha/bsd.rd/Makefile
+++ b/distrib/alpha/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2017/09/18 20:09:34 jasper Exp $
+# $OpenBSD: Makefile,v 1.30 2017/09/18 20:13:52 jasper Exp $
TOP= ${.CURDIR}/..
@@ -6,7 +6,6 @@ TOP= ${.CURDIR}/..
IMAGE= ramdisk${REV}.fs
STRIPOPTS?= -R .SUNW_ctf -R .shstrtab
-GZIPCMD?= gzip
GZIPFLAGS?= -9fn
RAMDISK= RAMDISKBIG
@@ -23,7 +22,7 @@ MAKEFSARGS_RD= -o disklabel=${DISKTYPE},minfree=0,density=8192
bsd.rd: bsd.rd_unz
objcopy -Sg -R .comment bsd.rd_unz bsd.strip
strip ${STRIPOPTS} bsd.strip
- ${GZIPCMD} -c ${GZIPFLAGS} bsd.strip > bsd.rd
+ gzip -c ${GZIPFLAGS} bsd.strip > bsd.rd
bsd.rd_unz: bsd ${IMAGE} rdsetroot
cp bsd bsd.rd_unz
diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index 95b94a6124e..6e463a60a31 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.34 2017/09/18 20:09:34 jasper Exp $
+# $OpenBSD: Makefile.inc,v 1.35 2017/09/18 20:13:52 jasper Exp $
TOP= ${.CURDIR}/..
@@ -15,7 +15,6 @@ PID!= echo $$$$
REALIMAGE!= echo /var/tmp/image.${PID}
STRIPOPTS?= -R .SUNW_ctf -R .shstrtab
-GZIPCMD?= gzip
GZIPFLAGS?= -9fn
INSTALLBOOT?= /usr/mdec/installboot -v
@@ -65,7 +64,7 @@ ${FLOPPY}: bsd.gz
bsd.gz: bsd.rd
objcopy -Sg -R .comment -R .SUNW_ctf -R .shstrtab -R .shstrtab bsd.rd bsd.strip
strip bsd.strip
- ${GZIPCMD} -c ${GZIPFLAGS} bsd.strip > bsd.gz
+ gzip -c ${GZIPFLAGS} bsd.strip > bsd.gz
bsd.rd: bsd ${IMAGE} rdsetroot
cp bsd bsd.rd
diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile
index 7d480871c0c..f11c8b5f399 100644
--- a/distrib/hppa/ramdisk/Makefile
+++ b/distrib/hppa/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2017/09/18 20:09:34 jasper Exp $
+# $OpenBSD: Makefile,v 1.35 2017/09/18 20:13:52 jasper Exp $
CBIN= instbin
ARCHDIR= ${.CURDIR}/..
@@ -25,7 +25,6 @@ BOOT?= ${DESTDIR}/usr/mdec/boot
CDBOOT?= ${DESTDIR}/usr/mdec/cdboot
STRIPOPTS?= -R .SUNW_ctf
-GZIPCMD?= gzip
GZIPFLAGS?= -9n
DISKTYPE= rdroot
@@ -59,7 +58,7 @@ bsd.rd: obsd ${IMAGE} rdsetroot
strip ${STRIPOPTS} bsd.rd
bsd: bsd.rd
- (cat bsd.rd ; dd if=/dev/zero count=1) | ${GZIPCMD} ${GZIPFLAGS} > bsd
+ (cat bsd.rd ; dd if=/dev/zero count=1) | gzip ${GZIPFLAGS} > bsd
rdsetroot: ${.CURDIR}/../../common/elfrdsetroot.c \
${.CURDIR}/../../common/elf32.c ${.CURDIR}/../../common/elf64.c
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index 7d2856b1625..6cd91b6cd26 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2017/09/17 16:34:03 deraadt Exp $
+# $OpenBSD: Makefile,v 1.52 2017/09/18 20:13:52 jasper Exp $
REV= ${OSrev}
@@ -82,7 +82,7 @@ bsd.rd: bsd ${IMAGE} rdsetroot
strip -R .SUNW_ctf bsd.rd
bsd.gz: bsd.rd
- ${GZIPCMD} ${GZIPFLAGS} < bsd.rd > bsd.gz
+ gzip ${GZIPFLAGS} < bsd.rd > bsd.gz
rdsetroot: ${.CURDIR}/../common/elfrdsetroot.c ${RDSETROOT_EXT_SRC}
${HOSTCC} ${HOSTCCFLAGS} -o rdsetroot ${RDSETROOT_EXT_SRC} \
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index b95990048e0..317485d68e1 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2017/09/18 20:09:34 jasper Exp $
+# $OpenBSD: Makefile,v 1.35 2017/09/18 20:13:53 jasper Exp $
TOP= ${.CURDIR}/..
@@ -9,7 +9,6 @@ LISTS?= ${.CURDIR}/list
UTILS?= ${TOP}/../miniroot
STRIPOPTS?= -R .SUNW_ctf
-GZIPCMD?= gzip
GZIPFLAGS?= -9fn
MTREE= ${UTILS}/mtree.conf
@@ -23,7 +22,7 @@ MAKEFSARGS_RD= -o disklabel=${DISKTYPE},minfree=0,density=4096
bsd.rd: bsd.rd_unz
objcopy -Sg -R .comment bsd.rd_unz bsd.strip
strip ${STRIPOPTS} bsd.strip
- ${GZIPCMD} -c ${GZIPFLAGS} bsd.strip > bsd.rd
+ gzip -c ${GZIPFLAGS} bsd.strip > bsd.rd
bsd.rd_unz: bsd ${IMAGE} rdsetroot
cp bsd bsd.rd_unz
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index 5b9861186e7..b71eedcbf03 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2017/08/16 14:41:21 deraadt Exp $
+# $OpenBSD: Makefile,v 1.35 2017/09/18 20:13:53 jasper Exp $
TOP= ${.CURDIR}/..
@@ -20,7 +20,6 @@ VND?= vnd0
VND_DEV= /dev/${VND}a
VND_RDEV= /dev/r${VND}a
-GZIPCMD?= gzip
GZIPFLAGS?= -9nv
GZIPEXT?= .gz
@@ -41,7 +40,7 @@ all ${IMAGE}:
all: ${FLOPPY} ${BSD_RD}
bsd.gz: bsd.rd
- ${GZIPCMD} ${GZIPFLAGS} < bsd.rd > bsd.gz
+ gzip ${GZIPFLAGS} < bsd.rd > bsd.gz
${FLOPPY}: bsd.gz ${BOOT} /usr/
dd if=/dev/zero of=${REALIMAGE} count=${FLOPPYSIZE}
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index 490b6393f77..be229026169 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2017/08/16 14:41:21 deraadt Exp $
+# $OpenBSD: Makefile,v 1.29 2017/09/18 20:13:53 jasper Exp $
TOP= ${.CURDIR}/..
@@ -20,7 +20,6 @@ VND?= vnd0
VND_DEV= /dev/${VND}a
VND_RDEV= /dev/r${VND}a
-GZIPCMD?= gzip
GZIPFLAGS?= -9nv
GZIPEXT?= .gz
@@ -41,7 +40,7 @@ all ${IMAGE}:
all: ${FLOPPY} ${BSD_RD}
bsd.gz: bsd.rd
- ${GZIPCMD} ${GZIPFLAGS} < bsd.rd > bsd.gz
+ gzip ${GZIPFLAGS} < bsd.rd > bsd.gz
${FLOPPY}: bsd.gz ${BOOT} /usr/
dd if=/dev/zero of=${REALIMAGE} count=${FLOPPYSIZE}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 02:54:49 +0000