From owner-svn-src-projects@FreeBSD.ORG Tue Jun 10 23:22:17 2014 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AB4F6D97; Tue, 10 Jun 2014 23:22:17 +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 8B0F12E68; Tue, 10 Jun 2014 23:22:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5ANMHha084238; Tue, 10 Jun 2014 23:22:17 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5ANMHe8084237; Tue, 10 Jun 2014 23:22:17 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201406102322.s5ANMHe8084237@svn.freebsd.org> From: Glen Barber Date: Tue, 10 Jun 2014 23:22:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r267345 - projects/release-debugdist/release 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 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: Tue, 10 Jun 2014 23:22:17 -0000 Author: gjb Date: Tue Jun 10 23:22:17 2014 New Revision: 267345 URL: http://svnweb.freebsd.org/changeset/base/267345 Log: Remove the hammer used to remove *.debug files in the resulting ISO image userland. Explicitly set MK_DEBUG_FILES=no, which overrides the WITH_DEBUG_FILES=1 and WITHOUT_DEBUG_FILES=1 collisions previously experienced. This change allows us to create the {base,kernel}_debug.txz distributions without accidentally installing the *.debug files on the medium itself. Inspired by: jmmv Tested on: projects/release-debugdist@r267344 Sponsored by: The FreeBSD Foundation Modified: projects/release-debugdist/release/Makefile Modified: projects/release-debugdist/release/Makefile ============================================================================== --- projects/release-debugdist/release/Makefile Tue Jun 10 23:03:41 2014 (r267344) +++ projects/release-debugdist/release/Makefile Tue Jun 10 23:22:17 2014 (r267345) @@ -155,7 +155,8 @@ system: packagesystem mkdir -p release cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \ DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \ - WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 MK_TESTS=no WITHOUT_LIB32=1 + WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 MK_TESTS=no WITHOUT_LIB32=1 \ + MK_DEBUG_FILES=no # Copy distfiles mkdir -p release/usr/freebsd-dist for dist in MANIFEST $$(ls *.txz | grep -v 'debug'); \ @@ -172,10 +173,6 @@ system: packagesystem echo debug.witness.trace=0 >> release/etc/sysctl.conf cp ${.CURDIR}/rc.local release/etc touch ${.TARGET} -# Apply a hammer to remove *.debug files, if they exist. -.if defined(WITH_DEBUG_FILES) - find ${.OBJDIR}/release -mindepth 1 -name \*.debug -delete -.endif bootonly: packagesystem # Install system @@ -186,7 +183,7 @@ bootonly: packagesystem WITHOUT_INSTALLLIB=1 WITHOUT_LIB32=1 WITHOUT_MAIL=1 \ WITHOUT_NCP=1 WITHOUT_TOOLCHAIN=1 WITHOUT_PROFILE=1 \ WITHOUT_INSTALLIB=1 WITHOUT_RESCUE=1 WITHOUT_DICT=1 \ - WITHOUT_KERNEL_SYMBOLS=1 MK_TESTS=no + WITHOUT_KERNEL_SYMBOLS=1 MK_TESTS=no MK_DEBUG_FILES=no # Copy manifest only (no distfiles) to get checksums mkdir -p bootonly/usr/freebsd-dist cp MANIFEST bootonly/usr/freebsd-dist @@ -200,17 +197,13 @@ bootonly: packagesystem echo hostid_enable=\"NO\" >> bootonly/etc/rc.conf echo debug.witness.trace=0 >> bootonly/etc/sysctl.conf cp ${.CURDIR}/rc.local bootonly/etc -# Apply a hammer to remove *.debug files, if they exist. -.if defined(WITH_DEBUG_FILES) - find ${.OBJDIR}/${.TARGET} -mindepth 1 -name \*.debug -delete -.endif dvd: # Install system mkdir -p ${.TARGET} cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \ DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \ - MK_TESTS=no + MK_TESTS=no MK_DEBUG_FILES=no # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist for dist in MANIFEST $$(ls *.txz | grep -v 'debug'); \ @@ -227,10 +220,6 @@ dvd: echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf cp ${.CURDIR}/rc.local ${.TARGET}/etc touch ${.TARGET} -# Apply a hammer to remove *.debug files, if they exist. -.if defined(WITH_DEBUG_FILES) - find ${.OBJDIR}/${.TARGET} -mindepth 1 -name \*.debug -delete -.endif release.iso: disc1.iso disc1.iso: system