commit: 89d7daf0b43797924fd92d649edf5656343cfcfc
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 13 17:15:55 2018 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 17:15:55 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=89d7daf0
specs: add /boot to livecd/empty to work around bug 661084
Due to bug 661084, the /boot/System* and other wildcard matches in
livecd/rm are not functional. This causes us to ship a duplicate copy
of kernel/initramfs, wasting space.
I've added /boot to livecd/empty to work around this for now. I only
added this to specs where /boot/* things were already in livecd/rm.
releases/weekly/specs/alpha/installcd-stage2-minimal.spec | 1 +
releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec | 1 +
releases/weekly/specs/amd64/hardened/admincd-stage2.spec | 1 +
releases/weekly/specs/amd64/installcd-stage2-minimal.spec | 1 +
releases/weekly/specs/hppa/installcd-stage2-minimal.spec | 1 +
releases/weekly/specs/hppa/installcd-stage2-universal.spec | 1 +
releases/weekly/specs/ia64/installcd-stage2-minimal.spec | 1 +
releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec | 1 +
releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec | 1 +
releases/weekly/specs/x86/hardened/admincd-stage2.spec | 1 +
releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec | 1 +
releases/weekly/specs/x86/installcd-stage2-minimal.spec | 1 +
12 files changed, 12 insertions(+)
diff --git a/releases/weekly/specs/alpha/installcd-stage2-minimal.spec
b/releases/weekly/specs/alpha/installcd-stage2-minimal.spec
index 939a26bb..af6a41be 100644
--- a/releases/weekly/specs/alpha/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/alpha/installcd-stage2-minimal.spec
@@ -111,6 +111,7 @@ livecd/unmerge:
sys-kernel/linux-headers
livecd/empty:
+ /boot
/etc/cron.daily
/etc/cron.hourly
/etc/cron.monthly
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
index a5b0c595..ea73cfb4 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
@@ -125,6 +125,7 @@ livecd/unmerge:
sys-kernel/linux-headers
livecd/empty:
+ /boot
/etc/cron.daily
/etc/cron.hourly
/etc/cron.monthly
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
index 5b88d76d..bd0477c9 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
@@ -125,6 +125,7 @@ livecd/unmerge:
sys-kernel/linux-headers
livecd/empty:
+ /boot
/etc/cron.daily
/etc/cron.hourly
/etc/cron.monthly
diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
index 1b1dbeef..092cc341 100644
--- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
@@ -121,6 +121,7 @@ livecd/unmerge:
sys-kernel/linux-headers
livecd/empty:
+ /boot
/etc/cron.daily
/etc/cron.hourly
/etc/cron.monthly
diff --git a/releases/weekly/specs/hppa/installcd-stage2-minimal.spec
b/releases/weekly/specs/hppa/installcd-stage2-minimal.spec
index d7f5ab58..cc834182 100644
--- a/releases/weekly/specs/hppa/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/hppa/installcd-stage2-minimal.spec
@@ -140,6 +140,7 @@ livecd/unmerge:
x11-misc/shared-mime-info
livecd/empty:
+ /boot
/etc/cron.daily
/etc/cron.hourly
/etc/cron.monthly
diff --git a/releases/weekly/specs/hppa/installcd-stage2-universal.spec
b/releases/weekly/specs/hppa/installcd-stage2-universal.spec
index b51a2de5..cd1ddb4b 100644
--- a/releases/weekly/specs/hppa/installcd-stage2-universal.spec
+++ b/releases/weekly/specs/hppa/installcd-stage2-universal.spec
@@ -117,6 +117,7 @@ livecd/unmerge:
sys-kernel/linux-headers
livecd/empty:
+ /boot
/etc/cron.daily
/etc/cron.hourly
/etc/cron.monthly
diff --git a/releases/weekly/specs/ia64/installcd-stage2-minimal.spec
b/releases/weekly/specs/ia64/installcd-stage2-minimal.spec
index 278a9ada..d0e7cbdc 100644
--- a/releases/weekly/specs/ia64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/ia64/installcd-stage2-minimal.spec
@@ -89,6 +89,7 @@ livecd/unmerge:
sys-kernel/linux-headers
livecd/empty:
+ /boot
/etc/cron.daily
/etc/cron.hourly
/etc/cron.monthly
diff --git a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec
b/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec
index 44a1dedd..b30db4a8 100644
--- a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec
@@ -145,6 +145,7 @@ livecd/unmerge:
sys-kernel/linux-headers
livecd/empty:
+ /boot
/etc/cron.daily
/etc/cron.hourly
/etc/cron.monthly
diff --git a/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec
b/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec
index c7a61e41..e5a389c3 100644
--- a/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec
@@ -83,6 +83,7 @@ livecd/unmerge:
sys-kernel/linux-headers
livecd/empty:
+ /boot
/etc/cron.daily
/etc/cron.hourly
/etc/cron.monthly
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec
b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
index 7c1614ff..3aef9108 100644
--- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
@@ -121,6 +121,7 @@ livecd/unmerge:
sys-kernel/linux-headers
livecd/empty:
+ /boot
/etc/cron.daily
/etc/cron.hourly
/etc/cron.monthly
diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
index afa190e6..3debe89c 100644
--- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
@@ -128,6 +128,7 @@ livecd/unmerge:
sys-kernel/linux-headers
livecd/empty:
+ /boot
/etc/cron.daily
/etc/cron.hourly
/etc/cron.monthly
diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec
b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
index d57ac1b0..13976bd3 100644
--- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
@@ -122,6 +122,7 @@ livecd/unmerge:
sys-kernel/linux-headers
livecd/empty:
+ /boot
/etc/cron.daily
/etc/cron.hourly
/etc/cron.monthly
