svn commit: r278707 - in projects/release-install-debug: release usr.sbin/bsdinstall/scripts
Glen Barber
gjb at FreeBSD.org
Fri Feb 13 20:53:21 UTC 2015
Author: gjb
Date: Fri Feb 13 20:53:20 2015
New Revision: 278707
URL: https://svnweb.freebsd.org/changeset/base/278707
Log:
Explicitly exclude (base|lib32)-dbg from the installation
ISOs to ensure kernel{,.*}-dbg.txz are available.
Exclude local *-dbg.txz distribution sets from DEBUG_LIST.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-install-debug/release/Makefile
projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto
Modified: projects/release-install-debug/release/Makefile
==============================================================================
--- projects/release-install-debug/release/Makefile Fri Feb 13 20:52:23 2015 (r278706)
+++ projects/release-install-debug/release/Makefile Fri Feb 13 20:53:20 2015 (r278707)
@@ -188,7 +188,7 @@ disc1: packagesystem
MK_DEBUG_FILES=no
# Copy distfiles
mkdir -p ${.TARGET}/usr/freebsd-dist
- for dist in MANIFEST $$(ls *.txz | grep -v -- '-dbg'); \
+ for dist in MANIFEST $$(ls *.txz | grep -vE -- '(base|lib32)-dbg'); \
do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
done
# Copy documentation, if generated
@@ -237,7 +237,7 @@ dvd: packagesystem
MK_TESTS=no MK_DEBUG_FILES=no
# Copy distfiles
mkdir -p ${.TARGET}/usr/freebsd-dist
- for dist in MANIFEST $$(ls *.txz | grep -v -- '-dbg'); \
+ for dist in MANIFEST $$(ls *.txz | grep -v -- '(base|lib32)-dbg'); \
do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
done
# Copy documentation, if generated
Modified: projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Fri Feb 13 20:52:23 2015 (r278706)
+++ projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Fri Feb 13 20:53:20 2015 (r278707)
@@ -67,6 +67,7 @@ bsdinstall hostname || error "Set hostna
export DISTRIBUTIONS="base.txz kernel.txz"
if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then
DISTMENU=`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $4,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST`
+ DISTMENU="$(echo ${DISTMENU} | tr '_' '-')"
exec 3>&1
EXTRA_DISTS=$( eval dialog \
@@ -183,6 +184,8 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
for _DISTRIBUTION in $DISTRIBUTIONS; do
case $_DISTRIBUTION in
*-dbg.*)
+ [ -e $BSDINSTALL_DISTDIR/$_DISTRIBUTION ] \
+ && continue
WANT_DEBUG=true
DEBUG_LIST="\n$DEBUG_LIST\n$_DISTRIBUTION"
;;
More information about the svn-src-projects
mailing list