diff options
| author | jmmv <jmmv@FreeBSD.org> | 2015-10-20 20:35:34 +0000 |
|---|---|---|
| committer | jmmv <jmmv@FreeBSD.org> | 2015-10-20 20:35:34 +0000 |
| commit | a4eadb1256729b6022936cd04486358a48f355cc (patch) | |
| tree | 10348f5801e4603fdc9c32e5ed2f13127e113773 /etc | |
| parent | c517f862f223ae255168c4fe163c9ee06e3ef841 (diff) | |
| download | FreeBSD-src-a4eadb1256729b6022936cd04486358a48f355cc.zip FreeBSD-src-a4eadb1256729b6022936cd04486358a48f355cc.tar.gz | |
Handle lib32 files during delete-old* when MK_LIB32=no.
Extend OptionalObsoleteFiles.inc to delete all lib32 files when MK_LIB32 is
set to no on a system that previously had lib32 libraries installed.
Also, to prevent "make delete-old-dirs" from always deleting lib32 directories
after an installworld, move the lib32 subtree to its own mtree file that only
gets applied when MK_LIB32=yes.
Test: Ran "make delete-old" and "make delete-old-libs" on a system that never
had MK_LIB32 enabled, and on a system where MK_LIB32 was enabled and later
disabled. Did this both on amd64 and powerpc64.
Test: Ran "make tinderbox" without errors.
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D3923
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 7 | ||||
| -rw-r--r-- | etc/mtree/BSD.debug.dist | 6 | ||||
| -rw-r--r-- | etc/mtree/BSD.lib32.dist | 14 | ||||
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 6 | ||||
| -rw-r--r-- | etc/mtree/Makefile | 4 |
5 files changed, 25 insertions, 12 deletions
diff --git a/etc/Makefile b/etc/Makefile index 24c83d1..bb62db9 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -151,6 +151,9 @@ BIN1+= regdomain.xml BIN2= netstart pccard_ether rc.suspend rc.resume MTREE= BSD.debug.dist BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist +.if ${MK_LIB32} != "no" +MTREE+= BSD.lib32.dist +.endif .if ${MK_TESTS} != "no" MTREE+= BSD.tests.dist .endif @@ -344,6 +347,10 @@ MTREES= mtree/BSD.root.dist / \ .if ${MK_GROFF} != "no" MTREES+= mtree/BSD.groff.dist /usr .endif +.if ${MK_LIB32} != "no" +MTREES+= mtree/BSD.lib32.dist /usr +MTREES+= mtree/BSD.lib32.dist /usr/lib/debug/usr +.endif .if ${MK_TESTS} != "no" MTREES+= mtree/BSD.tests.dist ${TESTSBASE} MTREES+= mtree/BSD.tests.dist /usr/lib/debug/${TESTSBASE} diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist index 8df0a72..e760e01 100644 --- a/etc/mtree/BSD.debug.dist +++ b/etc/mtree/BSD.debug.dist @@ -41,12 +41,6 @@ private .. .. - lib32 - i18n - .. - private - .. - .. libexec bsdinstall .. diff --git a/etc/mtree/BSD.lib32.dist b/etc/mtree/BSD.lib32.dist new file mode 100644 index 0000000..a82368f --- /dev/null +++ b/etc/mtree/BSD.lib32.dist @@ -0,0 +1,14 @@ +# $FreeBSD$ +# +# Please see the file src/etc/mtree/README before making changes to this file. +# + +/set type=dir uname=root gname=wheel mode=0755 +. + lib32 + dtrace + .. + i18n + .. + .. +.. diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index d9cdcd1..8d571e0 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -43,12 +43,6 @@ .. .. .. - lib32 - dtrace - .. - i18n - .. - .. libdata gcc .. diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile index afed370..1a941e4 100644 --- a/etc/mtree/Makefile +++ b/etc/mtree/Makefile @@ -5,6 +5,7 @@ FILES= ${_BSD.debug.dist} \ BSD.include.dist \ BSD.root.dist \ + ${_BSD.lib32.dist} \ ${_BSD.sendmail.dist} \ ${_BSD.tests.dist} \ BSD.usr.dist \ @@ -16,6 +17,9 @@ _BSD.debug.dist= BSD.debug.dist .if ${MK_GROFF} != "no" _BSD.groff.dist= BSD.groff.dist .endif +.if ${MK_LIB32} != "no" +_BSD.lib32.dist= BSD.lib32.dist +.endif .if ${MK_SENDMAIL} != "no" _BSD.sendmail.dist= BSD.sendmail.dist .endif |
