diff options
| author | Sebastien Marie <semarie@cvs.openbsd.org> | 2021-02-13 18:46:53 +0000 |
|---|---|---|
| committer | Sebastien Marie <semarie@cvs.openbsd.org> | 2021-02-13 18:46:53 +0000 |
| commit | 9528a80cb5f641c3c74e3411c1e91b4599af4ae9 (patch) | |
| tree | 02d5c670beecee5f1e08cf213bd1ac7d4f5ba24f /distrib/i386 | |
| parent | 6e65d62b8031e9048da3442adc6246af1cf02221 (diff) | |
distrib: merge "cp a b; strip b" to "objcopy -S a b"
ok deraadt@ danj@
Diffstat (limited to 'distrib/i386')
| -rw-r--r-- | distrib/i386/iso/Makefile | 5 | ||||
| -rw-r--r-- | distrib/i386/ramdisk/Makefile | 8 | ||||
| -rw-r--r-- | distrib/i386/ramdisk_cd/Makefile | 8 |
3 files changed, 8 insertions, 13 deletions
diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile index 1b142328723..b02d2e6509c 100644 --- a/distrib/i386/iso/Makefile +++ b/distrib/i386/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2021/01/05 15:10:42 deraadt Exp $ +# $OpenBSD: Makefile,v 1.31 2021/02/13 18:46:52 semarie Exp $ FS= install${OSrev}.img FSSIZE= 921600 @@ -27,8 +27,7 @@ ${FS}: ${BASE} ${XBASE} bsd.rd disklabel -w `cat vnd` ${FSDISKTYPE} 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 -R .comment -R .SUNW_ctf ${MOUNT_POINT}/boot + objcopy -S -R .comment -R .SUNW_ctf ${DESTDIR}/usr/mdec/boot ${MOUNT_POINT}/boot installboot -v -r ${MOUNT_POINT} `cat vnd` \ ${DESTDIR}/usr/mdec/biosboot ${MOUNT_POINT}/boot install -c -m 555 -o root -g wheel bsd.rd ${MOUNT_POINT}/bsd diff --git a/distrib/i386/ramdisk/Makefile b/distrib/i386/ramdisk/Makefile index 2c14e42580d..34ec8ceafc8 100644 --- a/distrib/i386/ramdisk/Makefile +++ b/distrib/i386/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2021/02/13 18:44:18 semarie Exp $ +# $OpenBSD: Makefile,v 1.11 2021/02/13 18:46:52 semarie Exp $ FS= floppy${OSrev}.img FSSIZE= 2880 @@ -21,8 +21,7 @@ ${FS}: bsd.gz disklabel -w `cat vnd` ${FSDISKTYPE} 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 -R .comment -R .SUNW_ctf ${.OBJDIR}/boot + objcopy -S -R .comment -R .SUNW_ctf ${DESTDIR}/usr/mdec/fdboot ${.OBJDIR}/boot installboot -v -r ${MOUNT_POINT} `cat vnd` \ ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot install -c -m 555 -o root -g wheel bsd.gz ${MOUNT_POINT}/bsd @@ -35,8 +34,7 @@ MRDISKTYPE= rdroot MRMAKEFSARGS= -o disklabel=${MRDISKTYPE},minfree=0,density=4096 bsd.gz: bsd.rd - cp bsd.rd bsd.strip - strip -R .comment -R .SUNW_ctf bsd.strip + objcopy -S -R .comment -R .SUNW_ctf bsd.rd bsd.strip gzip -9cn bsd.strip > bsd.gz bsd.rd: mr.fs bsd diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile index 0acdef913c5..2f4713ede1c 100644 --- a/distrib/i386/ramdisk_cd/Makefile +++ b/distrib/i386/ramdisk_cd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2021/02/13 18:44:18 semarie Exp $ +# $OpenBSD: Makefile,v 1.20 2021/02/13 18:46:52 semarie Exp $ FS= miniroot${OSrev}.img FSSIZE= 8064 @@ -24,8 +24,7 @@ ${FS}: bsd.gz disklabel -w `cat vnd` ${FSDISKTYPE} 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 -R .comment -R .SUNW_ctf ${.OBJDIR}/boot + objcopy -S -R .comment -R .SUNW_ctf ${DESTDIR}/usr/mdec/boot ${.OBJDIR}/boot installboot -v -r ${MOUNT_POINT} `cat vnd` \ ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot install -c -m 555 -o root -g wheel bsd.gz ${MOUNT_POINT}/bsd @@ -54,8 +53,7 @@ MRDISKTYPE= rdrootb MRMAKEFSARGS= -o disklabel=${MRDISKTYPE},minfree=0,density=4096 bsd.gz: bsd.rd - cp bsd.rd bsd.strip - strip -R .comment -R .SUNW_ctf bsd.strip + objcopy -S -R .comment -R .SUNW_ctf bsd.rd bsd.strip gzip -9cn bsd.strip > bsd.gz bsd.rd: mr.fs bsd |