diff options
| author | Sebastien Marie <semarie@cvs.openbsd.org> | 2021-02-13 18:48:24 +0000 |
|---|---|---|
| committer | Sebastien Marie <semarie@cvs.openbsd.org> | 2021-02-13 18:48:24 +0000 |
| commit | 40b7edf159b3e0c0cb600af0521513ec5390bb11 (patch) | |
| tree | 1977cc611b0ab590ae0f811bac917c9075eebd32 /distrib/i386 | |
| parent | 9528a80cb5f641c3c74e3411c1e91b4599af4ae9 (diff) | |
distrib: remove .SUNW_ctf only on kernels
the .SUNW_ctf section is added by ctfstrip(1), which is only used for kernels.
ok deraadt@ danj@
Diffstat (limited to 'distrib/i386')
| -rw-r--r-- | distrib/i386/iso/Makefile | 4 | ||||
| -rw-r--r-- | distrib/i386/ramdisk/Makefile | 6 | ||||
| -rw-r--r-- | distrib/i386/ramdisk_cd/Makefile | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile index b02d2e6509c..69373c5a20e 100644 --- a/distrib/i386/iso/Makefile +++ b/distrib/i386/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2021/02/13 18:46:52 semarie Exp $ +# $OpenBSD: Makefile,v 1.32 2021/02/13 18:48:23 semarie Exp $ FS= install${OSrev}.img FSSIZE= 921600 @@ -27,7 +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} - objcopy -S -R .comment -R .SUNW_ctf ${DESTDIR}/usr/mdec/boot ${MOUNT_POINT}/boot + objcopy -S -R .comment ${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 34ec8ceafc8..4fe1111d5d7 100644 --- a/distrib/i386/ramdisk/Makefile +++ b/distrib/i386/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2021/02/13 18:46:52 semarie Exp $ +# $OpenBSD: Makefile,v 1.12 2021/02/13 18:48:23 semarie Exp $ FS= floppy${OSrev}.img FSSIZE= 2880 @@ -21,7 +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} - objcopy -S -R .comment -R .SUNW_ctf ${DESTDIR}/usr/mdec/fdboot ${.OBJDIR}/boot + objcopy -S -R .comment ${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 @@ -62,7 +62,7 @@ instbin.mk instbin.cache instbin.c: instbin.conf instbin: instbin.mk instbin.cache instbin.c ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all - strip -R .comment -R .SUNW_ctf instbin + strip -R .comment instbin instbin.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile index 2f4713ede1c..b8c93be81e3 100644 --- a/distrib/i386/ramdisk_cd/Makefile +++ b/distrib/i386/ramdisk_cd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2021/02/13 18:46:52 semarie Exp $ +# $OpenBSD: Makefile,v 1.21 2021/02/13 18:48:23 semarie Exp $ FS= miniroot${OSrev}.img FSSIZE= 8064 @@ -24,7 +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} - objcopy -S -R .comment -R .SUNW_ctf ${DESTDIR}/usr/mdec/boot ${.OBJDIR}/boot + objcopy -S -R .comment ${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 @@ -81,7 +81,7 @@ instbin.mk instbin.cache instbin.c: instbin.conf instbin: instbin.mk instbin.cache instbin.c ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all - strip -R .comment -R .SUNW_ctf instbin + strip -R .comment instbin instbin.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf |