* [gentoo-commits] proj/releng:master commit in: releases/weekly/specs/hppa/, releases/weekly/specs/ia64/, ...
@ 2012-07-09 22:58 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 2+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-07-09 22:58 UTC (permalink / raw
To: gentoo-commits
commit: 52b5a70dd75e5ec9a66b05923de120fdcad300ee
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 9 22:57:45 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Jul 9 22:57:45 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=52b5a70d
Added busybox to the remaining install-cd stages - fixes bug 189286.
---
releases/weekly/specs/alpha/installcd-stage1.spec | 5 +++--
releases/weekly/specs/hppa/installcd-stage1.spec | 5 +++--
releases/weekly/specs/ia64/installcd-stage1.spec | 5 +++--
.../weekly/specs/ppc/ppc64/installcd-stage1.spec | 5 +++--
.../specs/sparc/sparc64/installcd-stage1.spec | 5 +++--
5 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/releases/weekly/specs/alpha/installcd-stage1.spec b/releases/weekly/specs/alpha/installcd-stage1.spec
index 1f5c98f..7e92c6c 100644
--- a/releases/weekly/specs/alpha/installcd-stage1.spec
+++ b/releases/weekly/specs/alpha/installcd-stage1.spec
@@ -61,7 +61,7 @@ livecd/packages:
# net-wireless/wpa_supplicant
# net-wireless/zd1201-firmware
# sys-apps/apmd
- sys-block/eject
+ sys-apps/busybox
sys-apps/ethtool
# sys-apps/fxload
sys-apps/hdparm
@@ -71,11 +71,12 @@ livecd/packages:
# sys-apps/memtester
# no keywords on alpha
# sys-apps/netplug
- sys-block/parted
# sys-apps/powerpc-utils
# sys-apps/ibm-powerpc-utils
# sys-apps/ibm-powerpc-utils-papr
sys-apps/sdparm
+ sys-block/eject
+ sys-block/parted
# sys-block/partimage
# sys-block/qla-fc-firmware
# sys-boot/yaboot
diff --git a/releases/weekly/specs/hppa/installcd-stage1.spec b/releases/weekly/specs/hppa/installcd-stage1.spec
index f82959f..a81178c 100644
--- a/releases/weekly/specs/hppa/installcd-stage1.spec
+++ b/releases/weekly/specs/hppa/installcd-stage1.spec
@@ -63,7 +63,7 @@ livecd/packages:
# net-wireless/wpa_supplicant
# net-wireless/zd1201-firmware
sys-apps/apmd
- sys-block/eject
+ sys-apps/busybox
sys-apps/ethtool
sys-apps/fxload
sys-apps/hdparm
@@ -72,11 +72,12 @@ livecd/packages:
# sys-apps/lssbus
sys-apps/memtester
sys-apps/netplug
- sys-block/parted
# sys-apps/powerpc-utils
# sys-apps/ibm-powerpc-utils
# sys-apps/ibm-powerpc-utils-papr
sys-apps/sdparm
+ sys-block/eject
+ sys-block/parted
# sys-block/partimage
# sys-block/qla-fc-firmware
# sys-boot/yaboot
diff --git a/releases/weekly/specs/ia64/installcd-stage1.spec b/releases/weekly/specs/ia64/installcd-stage1.spec
index e37cf4f..a58d24c 100644
--- a/releases/weekly/specs/ia64/installcd-stage1.spec
+++ b/releases/weekly/specs/ia64/installcd-stage1.spec
@@ -60,7 +60,7 @@ livecd/packages:
# net-wireless/wpa_supplicant
# net-wireless/zd1201-firmware
# sys-apps/apmd
- sys-block/eject
+ sys-apps/busybox
sys-apps/ethtool
sys-apps/fxload
sys-apps/hdparm
@@ -69,11 +69,12 @@ livecd/packages:
# sys-apps/lssbus
# sys-apps/memtester
# sys-apps/netplug
- sys-block/parted
# sys-apps/powerpc-utils
# sys-apps/ibm-powerpc-utils
# sys-apps/ibm-powerpc-utils-papr
sys-apps/sdparm
+ sys-block/eject
+ sys-block/parted
# sys-block/partimage
# sys-block/qla-fc-firmware
# sys-boot/yaboot
diff --git a/releases/weekly/specs/ppc/ppc64/installcd-stage1.spec b/releases/weekly/specs/ppc/ppc64/installcd-stage1.spec
index e9ff401..c4c56a1 100644
--- a/releases/weekly/specs/ppc/ppc64/installcd-stage1.spec
+++ b/releases/weekly/specs/ppc/ppc64/installcd-stage1.spec
@@ -60,17 +60,18 @@ livecd/packages:
net-wireless/wireless-tools
net-wireless/wpa_supplicant
sys-apps/apmd
- sys-block/eject
+ sys-apps/busybox
sys-apps/ethtool
sys-apps/fxload
sys-apps/hdparm
sys-apps/iproute2
# sys-apps/lssbus
sys-apps/memtester
- sys-block/parted
sys-apps/ibm-powerpc-utils
# sys-apps/ibm-powerpc-utils-papr
sys-apps/sdparm
+ sys-block/eject
+ sys-block/parted
sys-block/partimage
# sys-block/qla-fc-firmware
sys-boot/yaboot
diff --git a/releases/weekly/specs/sparc/sparc64/installcd-stage1.spec b/releases/weekly/specs/sparc/sparc64/installcd-stage1.spec
index 77d2ba7..f93e01b 100644
--- a/releases/weekly/specs/sparc/sparc64/installcd-stage1.spec
+++ b/releases/weekly/specs/sparc/sparc64/installcd-stage1.spec
@@ -68,7 +68,7 @@ livecd/packages:
# net-wireless/zd1201-firmware
# net-wireless/zd1211-firmware
# sys-apps/apmd
- sys-block/eject
+ sys-apps/busybox
sys-apps/ethtool
sys-apps/fxload
sys-apps/hdparm
@@ -77,11 +77,12 @@ livecd/packages:
sys-apps/lssbus
sys-apps/memtester
# sys-apps/netplug
- sys-block/parted
# sys-apps/powerpc-utils
# sys-apps/ibm-powerpc-utils
# sys-apps/ibm-powerpc-utils-papr
sys-apps/sdparm
+ sys-block/eject
+ sys-block/parted
# sys-block/partimage
sys-block/qla-fc-firmware
# sys-boot/yaboot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/releng:master commit in: releases/weekly/specs/hppa/, releases/weekly/specs/ia64/, ...
@ 2018-07-13 17:18 Ben Kohler
0 siblings, 0 replies; 2+ messages in thread
From: Ben Kohler @ 2018-07-13 17:18 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-13 17:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-09 22:58 [gentoo-commits] proj/releng:master commit in: releases/weekly/specs/hppa/, releases/weekly/specs/ia64/, Jorge Manuel B. S. Vicetto
-- strict thread matches above, loose matches on Subject: below --
2018-07-13 17:18 Ben Kohler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox