svn commit: r275173 - in projects/building-blocks/tools: . build/mk

[Garrett Cooper]

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