From owner-svn-src-projects@FreeBSD.ORG Thu Nov 27 07:19:38 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E1B7DB1; Thu, 27 Nov 2014 07:19:38 +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 0B03D750; Thu, 27 Nov 2014 07:19:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR7JbD9056606; Thu, 27 Nov 2014 07:19:37 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR7Jb0L056605; Thu, 27 Nov 2014 07:19:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411270719.sAR7Jb0L056605@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 27 Nov 2014 07:19:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275173 - in projects/building-blocks/tools: . build/mk 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: Thu, 27 Nov 2014 07:19:38 -0000 Author: ngie Date: Thu Nov 27 07:19:36 2014 New Revision: 275173 URL: https://svnweb.freebsd.org/changeset/base/275173 Log: Ignore boot and remove from MK_BOOT additions done in previous commit Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh ============================================================================== --- projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Thu Nov 27 07:17:32 2014 (r275172) +++ projects/building-blocks/tools/add-optional-obsolete-files-entries.sh Thu Nov 27 07:19:36 2014 (r275173) @@ -46,6 +46,6 @@ done sed -e 's,^,OLD_FILES+=,' \ -e '/lib\/.*\.so\.[0-9]\.*/s/OLD_FILES+=/OLD_LIBS+=/g'; find -d -s . -type d -mindepth 1 -and \! -empty | \ - egrep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/(examples|man)|usr/share/man/man[0-9])$' | \ + egrep -v '^\./(boot|s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/(examples|man)|usr/share/man/man[0-9])$' | \ sed -e 's,^,OLD_DIRS+=,' ) | sed -e 's,+=\./,+=,' Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Thu Nov 27 07:17:32 2014 (r275172) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Thu Nov 27 07:19:36 2014 (r275173) @@ -345,7 +345,6 @@ OLD_FILES+=usr/share/man/man8/version.4t OLD_FILES+=usr/share/man/man8/zfsboot.8.gz OLD_FILES+=usr/share/man/man8/zfsloader.8.gz OLD_DIRS+=boot/defaults -OLD_DIRS+=boot .endif .if ${MK_BOOTPARAMD} == no