From owner-svn-src-projects@FreeBSD.ORG Fri Feb 13 00:08:34 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53C056D8; Fri, 13 Feb 2015 00:08:34 +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 349B618E; Fri, 13 Feb 2015 00:08:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1D08YVu092066; Fri, 13 Feb 2015 00:08:34 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1D08X7Z092061; Fri, 13 Feb 2015 00:08:33 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201502130008.t1D08X7Z092061@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 00:08:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278644 - in projects/release-install-debug: . release/scripts 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 00:08:34 -0000 Author: gjb Date: Fri Feb 13 00:08:32 2015 New Revision: 278644 URL: https://svnweb.freebsd.org/changeset/base/278644 Log: Separate /boot/kernel/*.symbols into its own distribution set, kernel_symbols.txz, which is selected by default. Provide a manifest description for kernel_symbols.txz. Fix installing LOCAL_DISTRIBUTIONS by properly setting the BSDINSTALL_FETCHDEST and BSDINSTALL_DISTDIR environment variables, enforcing the local MANIFEST is used. When generating DISTMENU (used to populate the available distribution sets for selection), do not exclude all of the available base* and kernel* distributions, which allows the base-dbg.txz and kernel.*.txz to be listed. Sponsored by: The FreeBSD Foundation Modified: projects/release-install-debug/Makefile.inc1 projects/release-install-debug/release/scripts/make-manifest.sh projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Modified: projects/release-install-debug/Makefile.inc1 ============================================================================== --- projects/release-install-debug/Makefile.inc1 Fri Feb 13 00:06:07 2015 (r278643) +++ projects/release-install-debug/Makefile.inc1 Fri Feb 13 00:08:32 2015 (r278644) @@ -1143,18 +1143,40 @@ packagekernel: .if defined(NO_ROOT) cd ${DESTDIR}/${DISTDIR}/kernel; \ tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \ + --exclude '*.symbols' \ + @${DESTDIR}/${DISTDIR}/kernel.meta + cd ${DESTDIR}/${DISTDIR}/kernel; \ + tar cvJf ${DESTDIR}/${DISTDIR}/kernel_symbols.txz \ + --include '*/*/*.symbols' \ @${DESTDIR}/${DISTDIR}/kernel.meta .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \ + --exclude '*.symbols' \ + @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta + cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ + tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}_symbols.txz \ + --include '*/*/*.symbols' \ @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta .endfor .else cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz . + tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \ + --exclude '*.symbols' \ + . + cd ${DESTDIR}/${DISTDIR}/kernel; \ + tar cvJf ${DESTDIR}/${DISTDIR}/kernel_symbols.txz \ + --include '*/*/*.symbols' \ + $$(eval find .) .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz . + tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \ + --exclude '*.symbols' \ + . + cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ + tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}_symbols.txz \ + --include '*/*/*.symbols' \ + $$(eval find .) .endfor .endif Modified: projects/release-install-debug/release/scripts/make-manifest.sh ============================================================================== --- projects/release-install-debug/release/scripts/make-manifest.sh Fri Feb 13 00:06:07 2015 (r278643) +++ projects/release-install-debug/release/scripts/make-manifest.sh Fri Feb 13 00:08:32 2015 (r278644) @@ -24,6 +24,7 @@ desc_doc="${doc}" desc_games="${games}" desc_games_dbg="${games} (Debugging)" desc_kernel="${kernel} (MANDATORY)" +desc_kernel_symbols="${kernel} (Debugging symbols)" desc_kernel_alt="Alternate ${kernel}" desc_lib32="${lib32}" desc_lib32_dbg="${lib32} (Debugging)" @@ -38,6 +39,7 @@ default_base_dbg=off default_games_dbg=off default_lib32_dbg=off default_kernel_alt=off +default_kernel_symbols=on for i in ${*}; do dist="${i}" Modified: projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto ============================================================================== --- projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Fri Feb 13 00:06:07 2015 (r278643) +++ projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Fri Feb 13 00:08:32 2015 (r278644) @@ -66,7 +66,7 @@ bsdinstall hostname || error "Set hostna export DISTRIBUTIONS="base.txz kernel.txz" if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then - DISTMENU=`awk -F'\t' '!/^(kernel|base)/{print $4,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST` + DISTMENU=`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $4,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST` exec 3>&1 EXTRA_DISTS=$( eval dialog \ @@ -215,7 +215,18 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then fi if [ ! -z "$LOCAL_DISTRIBUTIONS" ]; then - env DISTRIBUTIONS="$LOCAL_DISTRIBUTIONS" bsdinstall distfetch || \ + # Download to a directory in the new system as scratch space + BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist" + mkdir -p "$BSDINSTALL_FETCHDEST" || error "Could not create directory $BSDINSTALL_FETCHDEST" + # Try to use any existing distfiles + if [ -d $BSDINSTALL_DISTDIR ]; then + DISTDIR_IS_UNIONFS=1 + mount_nullfs -o union "$BSDINSTALL_FETCHDEST" "$BSDINSTALL_DISTDIR" + export BSDINSTALL_DISTDIR="$BSDINSTALL_FETCHDEST" + fi + env DISTRIBUTIONS="$LOCAL_DISTRIBUTIONS" \ + BSDINSTALL_DISTSITE="file:///usr/freebsd-dist" \ + bsdinstall distfetch || \ error "Failed to fetch distribution from local media" fi