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/Makefile6
-rw-r--r--distrib/sparc64/ramdiskB/Makefile6
7 files changed, 14 insertions, 22 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
index ba516961022..f3c9104d741 100644
--- a/distrib/alpha/bsd.rd/Makefile
+++ b/distrib/alpha/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2019/04/28 15:21:49 deraadt Exp $
+# $OpenBSD: Makefile,v 1.35 2019/04/28 16:26:07 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -6,7 +6,6 @@ TOP= ${.CURDIR}/..
IMAGE= ramdisk${REV}.fs
STRIPOPTS?= -R .SUNW_ctf -R .shstrtab
-GZIPFLAGS?= -9fn
.include "${TOP}/inst-common/Makefile.inc"
@@ -20,7 +19,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
- gzip -c ${GZIPFLAGS} bsd.strip > bsd.rd
+ gzip -c -9nv bsd.strip > bsd.rd
bsd.rd_unz: bsd ${IMAGE}
cp bsd bsd.rd_unz
diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index f71c02954e4..9af69f1c65c 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.39 2019/04/28 15:21:49 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.40 2019/04/28 16:26:07 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -8,7 +8,6 @@ IMAGE= ramdisk${REV}.fs
MOUNT_POINT= /mnt
STRIPOPTS?= -R .SUNW_ctf -R .shstrtab
-GZIPFLAGS?= -9fn
INSTALLBOOT?= /usr/mdec/installboot -v
XNAME?= floppy
@@ -50,7 +49,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
- gzip -c ${GZIPFLAGS} bsd.strip > bsd.gz
+ gzip -c -9nv bsd.strip > bsd.gz
bsd.rd: bsd ${IMAGE}
cp bsd bsd.rd
diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile
index e48fd8fb8c2..1ba07e164e2 100644
--- a/distrib/hppa/ramdisk/Makefile
+++ b/distrib/hppa/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2019/04/28 15:21:49 deraadt Exp $
+# $OpenBSD: Makefile,v 1.39 2019/04/28 16:26:07 deraadt Exp $
ARCHDIR= ${.CURDIR}/..
SRCDIR= ${.CURDIR}/../../..
@@ -24,7 +24,6 @@ BOOT?= ${DESTDIR}/usr/mdec/boot
CDBOOT?= ${DESTDIR}/usr/mdec/cdboot
STRIPOPTS?= -R .SUNW_ctf
-GZIPFLAGS?= -9n
DISKTYPE= rdroot
MAKEFSARGS_RD= -o disklabel=${DISKTYPE},minfree=0,density=4096
@@ -57,7 +56,7 @@ bsd.rd: obsd ${IMAGE}
strip ${STRIPOPTS} bsd.rd
bsd: bsd.rd
- (cat bsd.rd ; dd if=/dev/zero count=1) | gzip ${GZIPFLAGS} > bsd
+ (cat bsd.rd ; dd if=/dev/zero count=1) | gzip -9nv > bsd
${IMAGE}: instbin
rm -rf $@.d
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index 1dbaec1ad37..affe4dd5191 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2019/04/28 15:23:50 deraadt Exp $
+# $OpenBSD: Makefile,v 1.58 2019/04/28 16:26:07 deraadt Exp $
REV= ${OSrev}
@@ -72,7 +72,7 @@ bsd.rd: bsd ${IMAGE}
strip -R .SUNW_ctf bsd.rd
bsd.gz: bsd.rd
- gzip ${GZIPFLAGS} < bsd.rd > bsd.gz
+ gzip -9nv < bsd.rd > bsd.gz
${IMAGE}: instbin
dd if=/dev/zero of=${IMAGE} count=${IMAGESIZE}
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index 660432ce948..9883e7ae4dc 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2019/04/28 15:21:50 deraadt Exp $
+# $OpenBSD: Makefile,v 1.40 2019/04/28 16:26:07 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -8,7 +8,6 @@ LISTS?= ${.CURDIR}/list
UTILS?= ${TOP}/../miniroot
STRIPOPTS?= -R .SUNW_ctf
-GZIPFLAGS?= -9fn
MTREE= ${UTILS}/mtree.conf
all: bsd.rd
@@ -19,7 +18,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
- gzip -c ${GZIPFLAGS} bsd.strip > bsd.rd
+ gzip -c -9nv bsd.strip > bsd.rd
bsd.rd_unz: bsd ${IMAGE}
cp bsd bsd.rd_unz
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index ca11ca0efae..36d8f372d2e 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2019/04/28 15:21:50 deraadt Exp $
+# $OpenBSD: Makefile,v 1.42 2019/04/28 16:26:07 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -14,8 +14,6 @@ FLOPPY= floppy${REV}.fs
FLOPPYSIZE?= 2880
FLOPPYTYPE?= floppy
-GZIPFLAGS?= -9nv
-
DISKTYPE= rdroot
MAKEFSARGS_RD= -o disklabel=${DISKTYPE},minfree=0,density=4096
@@ -29,7 +27,7 @@ all ${IMAGE}:
all: ${FLOPPY} bsd.rd
bsd.gz: bsd.rd
- gzip ${GZIPFLAGS} < bsd.rd > bsd.gz
+ gzip -9nv < bsd.rd > bsd.gz
${FLOPPY}: bsd.gz ${BOOT} /usr/
dd if=/dev/zero of=${FLOPPY} count=${FLOPPYSIZE}
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index c31056d51bb..299c58ec282 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2019/04/28 15:21:50 deraadt Exp $
+# $OpenBSD: Makefile,v 1.36 2019/04/28 16:26:07 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -14,8 +14,6 @@ FLOPPY= floppyB${REV}.fs
FLOPPYSIZE?= 2880
FLOPPYTYPE?= floppy
-GZIPFLAGS?= -9nv
-
DISKTYPE= rdroot
MAKEFSARGS_RD= -o disklabel=${DISKTYPE},minfree=0,density=8192
@@ -29,7 +27,7 @@ all ${IMAGE}:
all: ${FLOPPY} bsd.rd
bsd.gz: bsd.rd
- gzip ${GZIPFLAGS} < bsd.rd > bsd.gz
+ gzip -9nv < bsd.rd > bsd.gz
${FLOPPY}: bsd.gz ${BOOT} /usr/
dd if=/dev/zero of=${FLOPPY} count=${FLOPPYSIZE}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 12:49:05 +0000