From owner-svn-src-projects@FreeBSD.ORG Fri Feb 13 20:53:21 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A24EFADA; Fri, 13 Feb 2015 20:53:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 72E409D0; Fri, 13 Feb 2015 20:53:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1DKrLOg088015; Fri, 13 Feb 2015 20:53:21 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1DKrLUJ088013; Fri, 13 Feb 2015 20:53:21 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201502132053.t1DKrLUJ088013@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 13 Feb 2015 20:53:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278707 - in projects/release-install-debug: release usr.sbin/bsdinstall/scripts X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Feb 2015 20:53:21 -0000 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" ;;