distrib: remove .comment section systematically

remove this section as part of crunchgen generated commands.
it avoids calling "strip -R .comment" for some but not all architectures.

ok deraadt@ danj@

diff --git a/distrib/amd64/ramdiskA/Makefile b/distrib/amd64/ramdiskA/Makefile
index deb5306..c8e3da8 100644 (file)
--- a/distrib/amd64/ramdiskA/Makefile
+++ b/distrib/amd64/ramdiskA/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.13 2021/02/13 18:48:23 semarie Exp $
+#      $OpenBSD: Makefile,v 1.14 2021/02/13 18:52:08 semarie Exp $
 
 FS=            floppy${OSrev}.img
 FSSIZE=                2880
@@ -61,7 +61,6 @@ 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 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 e331977..ba206c0 100644 (file)
--- a/distrib/amd64/ramdisk_cd/Makefile
+++ b/distrib/amd64/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.27 2021/02/13 18:48:23 semarie Exp $
+#      $OpenBSD: Makefile,v 1.28 2021/02/13 18:52:08 semarie Exp $
 
 FS=            miniroot${OSrev}.img
 FSSIZE=                9920
@@ -84,7 +84,6 @@ 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 instbin
 
 instbin.conf: ${LISTS}
        awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf

diff --git a/distrib/i386/ramdisk/Makefile b/distrib/i386/ramdisk/Makefile
index 4fe1111..688f317 100644 (file)
--- a/distrib/i386/ramdisk/Makefile
+++ b/distrib/i386/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.12 2021/02/13 18:48:23 semarie Exp $
+#      $OpenBSD: Makefile,v 1.13 2021/02/13 18:52:08 semarie Exp $
 
 FS=            floppy${OSrev}.img
 FSSIZE=                2880
@@ -62,7 +62,6 @@ 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 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 b8c93be..81178b5 100644 (file)
--- a/distrib/i386/ramdisk_cd/Makefile
+++ b/distrib/i386/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.21 2021/02/13 18:48:23 semarie Exp $
+#      $OpenBSD: Makefile,v 1.22 2021/02/13 18:52:08 semarie Exp $
 
 FS=            miniroot${OSrev}.img
 FSSIZE=                8064
@@ -81,7 +81,6 @@ 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 instbin
 
 instbin.conf: ${LISTS}
        awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf

diff --git a/usr.sbin/crunchgen/crunchgen.c b/usr.sbin/crunchgen/crunchgen.c
index 48b5f06..3b312b3 100644 (file)
--- a/usr.sbin/crunchgen/crunchgen.c
+++ b/usr.sbin/crunchgen/crunchgen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crunchgen.c,v 1.21 2018/10/18 14:25:14 naddy Exp $         */
+/* $OpenBSD: crunchgen.c,v 1.22 2021/02/13 18:52:08 semarie Exp $       */
 
 /*
  * Copyright (c) 1994 University of Maryland
@@ -928,7 +928,7 @@ top_makefile_rules(FILE * outmk)
            execfname, execfname);
        fprintf(outmk, "\t$(CC) -static -L. ${LDFLAGS} -o $@ %s.o $(CRUNCHED_OBJS) $(LIBS)\n",
            execfname);
-       fprintf(outmk, "\t$(STRIP) %s\n", execfname);
+       fprintf(outmk, "\t$(STRIP) -R .comment %s\n", execfname);
 
        fprintf(outmk, "\n");
        fprintf(outmk, ".if !empty(CLIB)\n");