Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/common Fix stupid typo (=+ instead of +=).



details:   https://anonhg.NetBSD.org/src/rev/9096131f849d
branches:  trunk
changeset: 836129:9096131f849d
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Sep 28 15:03:34 2018 +0000

description:
Fix stupid typo (=+ instead of +=).
Remove hard coded debug sets removal, now that the configurable
variant works.
Prepare for .tar.xz sets.

diffstat:

 distrib/common/Makefile.bootcd |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 48a461a54704 -r 9096131f849d distrib/common/Makefile.bootcd
--- a/distrib/common/Makefile.bootcd    Fri Sep 28 14:45:16 2018 +0000
+++ b/distrib/common/Makefile.bootcd    Fri Sep 28 15:03:34 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.bootcd,v 1.40 2018/06/25 12:18:22 martin Exp $
+#      $NetBSD: Makefile.bootcd,v 1.41 2018/09/28 15:03:34 martin Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -53,7 +53,10 @@
 CDRELEASE_EXCLUDE=     -s ',./installation/cdrom.*,,gp'
 .endif
 .if defined(CDRELEASE_NODEBUG)
-CDRELEASE_EXCLUDE=+    -s ',./binary/sets/debug.tgz,,gp'       -s ',./binary/sets/xdebug.tgz,,gp'
+CDRELEASE_EXCLUDE+=    -s ',./binary/sets/debug.tgz,,gp'
+CDRELEASE_EXCLUDE+=    -s ',./binary/sets/xdebug.tgz,,gp'
+CDRELEASE_EXCLUDE+=    -s ',./binary/sets/debug.tar.xz,,gp'
+CDRELEASE_EXCLUDE+=    -s ',./binary/sets/xdebug.tar.xz,,gp'
 .endif
 .if !defined(CDRELEASE_LIVEIMAGE)
 CDRELEASE_EXCLUDE+=    -s ',./installation/liveimage.*,,gp'
@@ -189,8 +192,6 @@
                ${TOOL_PAX} ${PAX_TIMESTAMP}                            \
                        -rw -pe ${PAX_v}                                \
                        ${CDRELEASE_EXCLUDE}                            \
-                       -s ',./binary/sets/debug.tgz,,gp'               \
-                       -s ',./binary/sets/xdebug.tgz,,gp'              \
                        . $$release_destdir;                            \
                cd "${CUROBJDIR}";                                      \
        fi



Home | Main Index | Thread Index | Old Index