From e4135d2fc25458544ecb52d284ce8854823610a6 Mon Sep 17 00:00:00 2001 From: semarie Date: Sat, 13 Feb 2021 18:48:23 +0000 Subject: [PATCH] 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@ --- distrib/alpha/miniroot/Makefile | 4 ++-- distrib/amd64/iso/Makefile | 4 ++-- distrib/amd64/ramdiskA/Makefile | 6 +++--- distrib/amd64/ramdisk_cd/Makefile | 6 +++--- distrib/i386/iso/Makefile | 4 ++-- distrib/i386/ramdisk/Makefile | 6 +++--- distrib/i386/ramdisk_cd/Makefile | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/distrib/alpha/miniroot/Makefile b/distrib/alpha/miniroot/Makefile index b4bd90de0c5..a694b4ac4f0 100644 --- a/distrib/alpha/miniroot/Makefile +++ b/distrib/alpha/miniroot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2021/02/13 18:41:52 semarie Exp $ +# $OpenBSD: Makefile,v 1.21 2021/02/13 18:48:23 semarie Exp $ FS= miniroot${OSrev}.img FSSIZE= 5760 @@ -90,7 +90,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 .eh_frame -R .SUNW_ctf -R .shstrtab instbin + strip -R .eh_frame -R .shstrtab instbin instbin.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile index 7fbb458e826..7571f4ed0da 100644 --- a/distrib/amd64/iso/Makefile +++ b/distrib/amd64/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.42 2021/02/13 18:46:52 semarie Exp $ +# $OpenBSD: Makefile,v 1.43 2021/02/13 18:48:23 semarie Exp $ FS= install${OSrev}.img FSSIZE= 1359872 @@ -41,7 +41,7 @@ ${FS}: ${BASE} ${XBASE} bsd.rd .endif 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 mkdir -p ${MOUNT_POINT}/${OSREV}/${MACHINE} diff --git a/distrib/amd64/ramdiskA/Makefile b/distrib/amd64/ramdiskA/Makefile index e54809a7eb4..deb5306ad38 100644 --- a/distrib/amd64/ramdiskA/Makefile +++ b/distrib/amd64/ramdiskA/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2021/02/13 18:46:52 semarie Exp $ +# $OpenBSD: Makefile,v 1.13 2021/02/13 18:48:23 semarie Exp $ FS= floppy${OSrev}.img FSSIZE= 2880 @@ -20,7 +20,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 @@ -61,7 +61,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/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile index f05d2bf730e..e3319770277 100644 --- a/distrib/amd64/ramdisk_cd/Makefile +++ b/distrib/amd64/ramdisk_cd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2021/02/13 18:46:52 semarie Exp $ +# $OpenBSD: Makefile,v 1.27 2021/02/13 18:48:23 semarie Exp $ FS= miniroot${OSrev}.img FSSIZE= 9920 @@ -27,7 +27,7 @@ ${FS}: bsd.gz umount ${MOUNT_POINT} 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 @@ -84,7 +84,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/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 -- 2.20.1