diff options
| author |   semarie <semarie@openbsd.org> | 2021-02-13 18:44:17 +0000 |
|---|---|---|
| committer | semarie <semarie@openbsd.org> | 2021-02-13 18:44:17 +0000 |
| commit | d9bc45a63765eaa428ef988da6863ba171d41f7c (patch) | |
| tree | 81c1eb8da36cc1ec9e0721ae2aa9351219a3b9e7 /distrib | |
| parent | distrib: merge objcopy -Sg and strip commands (diff) | |
| download | wireguard-openbsd-d9bc45a63765eaa428ef988da6863ba171d41f7c.tar.xz wireguard-openbsd-d9bc45a63765eaa428ef988da6863ba171d41f7c.zip | |
distrib: remove duplicate strip(1) calls
"strip -R section" command run "strip" (without option) as well.
there is no need to call both.
(binaries checked with sha1)
original diff from danj@
ok deraadt@
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/amd64/iso/Makefile | 3 | ||||
| -rw-r--r-- | distrib/amd64/ramdiskA/Makefile | 4 | ||||
| -rw-r--r-- | distrib/amd64/ramdisk_cd/Makefile | 4 | ||||
| -rw-r--r-- | distrib/i386/ramdisk/Makefile | 4 | ||||
| -rw-r--r-- | distrib/i386/ramdisk_cd/Makefile | 4 | ||||
| -rw-r--r-- | distrib/loongson/ramdisk/Makefile | 3 |
6 files changed, 6 insertions, 16 deletions
diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile index d70f3985817..a7d270dac06 100644 --- a/distrib/amd64/iso/Makefile +++ b/distrib/amd64/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.40 2021/01/05 15:10:42 deraadt Exp $ +# $OpenBSD: Makefile,v 1.41 2021/02/13 18:44:17 semarie Exp $ FS= install${OSrev}.img FSSIZE= 1359872 @@ -42,7 +42,6 @@ ${FS}: ${BASE} ${XBASE} bsd.rd newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} cp ${DESTDIR}/usr/mdec/boot ${MOUNT_POINT}/boot - strip ${MOUNT_POINT}/boot strip -R .comment -R .SUNW_ctf ${MOUNT_POINT}/boot installboot -v -r ${MOUNT_POINT} `cat vnd` \ ${DESTDIR}/usr/mdec/biosboot ${MOUNT_POINT}/boot diff --git a/distrib/amd64/ramdiskA/Makefile b/distrib/amd64/ramdiskA/Makefile index abb5ffe94fc..53b594f364e 100644 --- a/distrib/amd64/ramdiskA/Makefile +++ b/distrib/amd64/ramdiskA/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2020/05/18 06:20:43 otto Exp $ +# $OpenBSD: Makefile,v 1.11 2021/02/13 18:44:17 semarie Exp $ FS= floppy${OSrev}.img FSSIZE= 2880 @@ -21,7 +21,6 @@ ${FS}: bsd.gz newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} cp ${DESTDIR}/usr/mdec/fdboot ${.OBJDIR}/boot - strip ${.OBJDIR}/boot strip -R .comment -R .SUNW_ctf ${.OBJDIR}/boot installboot -v -r ${MOUNT_POINT} `cat vnd` \ ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot @@ -36,7 +35,6 @@ MRMAKEFSARGS= -o disklabel=${MRDISKTYPE},minfree=0,density=4096 bsd.gz: bsd.rd cp bsd.rd bsd.strip - strip bsd.strip strip -R .comment -R .SUNW_ctf bsd.strip gzip -9cn bsd.strip > bsd.gz diff --git a/distrib/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile index 1b0cb7903dc..acd6a510205 100644 --- a/distrib/amd64/ramdisk_cd/Makefile +++ b/distrib/amd64/ramdisk_cd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2021/01/05 15:10:42 deraadt Exp $ +# $OpenBSD: Makefile,v 1.25 2021/02/13 18:44:18 semarie Exp $ FS= miniroot${OSrev}.img FSSIZE= 9920 @@ -28,7 +28,6 @@ ${FS}: bsd.gz newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} cp ${DESTDIR}/usr/mdec/boot ${.OBJDIR}/boot - strip ${.OBJDIR}/boot strip -R .comment -R .SUNW_ctf ${.OBJDIR}/boot installboot -v -r ${MOUNT_POINT} `cat vnd` \ ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot @@ -59,7 +58,6 @@ MRMAKEFSARGS= -o disklabel=${MRDISKTYPE},minfree=0,density=4096 bsd.gz: bsd.rd cp bsd.rd bsd.strip - strip bsd.strip strip -R .comment -R .SUNW_ctf bsd.strip gzip -9cn bsd.strip > bsd.gz diff --git a/distrib/i386/ramdisk/Makefile b/distrib/i386/ramdisk/Makefile index 62cc705677a..2c14e42580d 100644 --- a/distrib/i386/ramdisk/Makefile +++ b/distrib/i386/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2020/05/18 06:20:43 otto Exp $ +# $OpenBSD: Makefile,v 1.10 2021/02/13 18:44:18 semarie Exp $ FS= floppy${OSrev}.img FSSIZE= 2880 @@ -22,7 +22,6 @@ ${FS}: bsd.gz newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} cp ${DESTDIR}/usr/mdec/fdboot ${.OBJDIR}/boot - strip ${.OBJDIR}/boot strip -R .comment -R .SUNW_ctf ${.OBJDIR}/boot installboot -v -r ${MOUNT_POINT} `cat vnd` \ ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot @@ -37,7 +36,6 @@ MRMAKEFSARGS= -o disklabel=${MRDISKTYPE},minfree=0,density=4096 bsd.gz: bsd.rd cp bsd.rd bsd.strip - strip bsd.strip strip -R .comment -R .SUNW_ctf bsd.strip gzip -9cn bsd.strip > bsd.gz diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile index 77fdc3e10fc..0acdef913c5 100644 --- a/distrib/i386/ramdisk_cd/Makefile +++ b/distrib/i386/ramdisk_cd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2021/01/05 15:10:43 deraadt Exp $ +# $OpenBSD: Makefile,v 1.19 2021/02/13 18:44:18 semarie Exp $ FS= miniroot${OSrev}.img FSSIZE= 8064 @@ -25,7 +25,6 @@ ${FS}: bsd.gz newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} cp ${DESTDIR}/usr/mdec/boot ${.OBJDIR}/boot - strip ${.OBJDIR}/boot strip -R .comment -R .SUNW_ctf ${.OBJDIR}/boot installboot -v -r ${MOUNT_POINT} `cat vnd` \ ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot @@ -56,7 +55,6 @@ MRMAKEFSARGS= -o disklabel=${MRDISKTYPE},minfree=0,density=4096 bsd.gz: bsd.rd cp bsd.rd bsd.strip - strip bsd.strip strip -R .comment -R .SUNW_ctf bsd.strip gzip -9cn bsd.strip > bsd.gz diff --git a/distrib/loongson/ramdisk/Makefile b/distrib/loongson/ramdisk/Makefile index b236a4f07ca..4e5775a407b 100644 --- a/distrib/loongson/ramdisk/Makefile +++ b/distrib/loongson/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2020/05/17 17:04:27 deraadt Exp $ +# $OpenBSD: Makefile,v 1.28 2021/02/13 18:44:18 semarie Exp $ FS= miniroot${OSrev}.img FSSIZE= 18432 @@ -46,7 +46,6 @@ ${CDROM}: bsd.rd bsd.strip: bsd.rd cp bsd.rd bsd.strip - strip bsd.strip strip -R .comment -R .SUNW_ctf bsd.strip bsd.rd: mr.fs bsd |