commit: 88db5d9d5778816d2af1b50871bca36944654ac9
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 17:34:09 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed May 22 17:56:24 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=88db5d9d
specs: clean out unneeded kernel/packages & kernel/use
None of the packages we have in boot/kernel/gentoo/packages actually
need to be build after the kernel or per-kernel. The ones we want to
keep installed should be moved to livecd/packages in livecd-stage1. I
have dropped sys-kernel/linux-firmware since it's already a dependency
of genkernel.
Since there will be no additional packages installed from
boot/kernel/gentoo/packages, we do not need boot/kernel/gentoo/use at
all either.
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
.../amd64/hardened/admincd-stage1-selinux.spec | 3 ++
.../specs/amd64/hardened/admincd-stage1.spec | 3 ++
.../amd64/hardened/admincd-stage2-selinux.spec | 58 +--------------------
.../specs/amd64/hardened/admincd-stage2.spec | 58 +--------------------
releases/weekly/specs/amd64/installcd-stage1.spec | 3 ++
.../specs/amd64/installcd-stage2-minimal.spec | 58 ---------------------
.../sparc/sparc64/installcd-stage2-minimal.spec | 22 --------
.../weekly/specs/x86/hardened/admincd-stage1.spec | 3 ++
.../weekly/specs/x86/hardened/admincd-stage2.spec | 58 ---------------------
releases/weekly/specs/x86/installcd-stage1.spec | 3 ++
.../weekly/specs/x86/installcd-stage2-minimal.spec | 59 ----------------------
11 files changed, 17 insertions(+), 311 deletions(-)
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
index aaac8046..f6d05583 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
@@ -29,6 +29,7 @@ livecd/use:
livecd/packages:
app-accessibility/brltty
+ app-accessibility/espeakup
app-admin/hddtemp
app-admin/passook
app-admin/pwgen
@@ -80,6 +81,7 @@ livecd/packages:
dev-lang/perl
dev-lang/python
media-gfx/fbgrab
+ media-sound/alsa-utils
net-analyzer/iptraf-ng
net-analyzer/openbsd-netcat
net-analyzer/tcptraceroute
@@ -149,6 +151,7 @@ livecd/packages:
sys-apps/mlocate
sys-apps/netplug
sys-apps/pciutils
+ sys-apps/pcmciautils
sys-apps/sdparm
sys-apps/usbutils
sys-apps/sed
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
index 971cc3bf..a4affcc6 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
@@ -29,6 +29,7 @@ livecd/use:
livecd/packages:
app-accessibility/brltty
+ app-accessibility/espeakup
app-admin/hddtemp
app-admin/passook
app-admin/pwgen
@@ -83,6 +84,7 @@ livecd/packages:
dev-lang/python
dev-vcs/git
media-gfx/fbgrab
+ media-sound/alsa-utils
net-analyzer/iptraf-ng
net-analyzer/openbsd-netcat
net-analyzer/tcptraceroute
@@ -152,6 +154,7 @@ livecd/packages:
sys-apps/mlocate
sys-apps/netplug
sys-apps/pciutils
+ sys-apps/pcmciautils
sys-apps/sdparm
sys-apps/usbutils
sys-apps/sed
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
index b28fe707..30e4c078 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
@@ -17,64 +17,8 @@ boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
boot/kernel/gentoo/config:
@REPO_DIR@/releases/weekly/kconfig/amd64/admincd-4.4.8-r1-selinux.config
-boot/kernel/gentoo/use:
- -*
- alsa
- alsa_pcm_plugins_adpcm
- alsa_pcm_plugins_alaw
- alsa_pcm_plugins_asym
- alsa_pcm_plugins_copy
- alsa_pcm_plugins_dmix
- alsa_pcm_plugins_dshare
- alsa_pcm_plugins_dsnoop
- alsa_pcm_plugins_empty
- alsa_pcm_plugins_extplug
- alsa_pcm_plugins_file
- alsa_pcm_plugins_hooks
- alsa_pcm_plugins_iec958
- alsa_pcm_plugins_ioplug
- alsa_pcm_plugins_ladspa
- alsa_pcm_plugins_lfloat
- alsa_pcm_plugins_linear
- alsa_pcm_plugins_meter
- alsa_pcm_plugins_mmap_emul
- alsa_pcm_plugins_mulaw
- alsa_pcm_plugins_multi
- alsa_pcm_plugins_null
- alsa_pcm_plugins_plug
- alsa_pcm_plugins_rate
- alsa_pcm_plugins_route
- alsa_pcm_plugins_share
- alsa_pcm_plugins_shm
- alsa_pcm_plugins_softvol
- atm
- fbcon
- ipv6
- livecd
- lvm1
- midi
- modules
- ncurses
- nls
- nptl
- pam
- png
- portaudio
- readline
- socks5
- ssl
- truetype
- unicode
- usb
-boot/kernel/gentoo/packages:
-### These need to be added for software speech.
- app-accessibility/espeakup
- media-libs/alsa-oss
- media-sound/alsa-utils
-
- sys-apps/pcmciautils
- sys-kernel/linux-firmware
+#boot/kernel/gentoo/packages:
# ZFS is disabled until spl can build with CONFIG_PAX_RANDKSTACK
# sys-kernel/spl
# sys-fs/zfs
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
index 79516ffd..51643e38 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
@@ -17,64 +17,8 @@ boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
boot/kernel/gentoo/config:
@REPO_DIR@/releases/weekly/kconfig/amd64/admincd-4.14.83.config
-boot/kernel/gentoo/use:
- -*
- alsa
- alsa_pcm_plugins_adpcm
- alsa_pcm_plugins_alaw
- alsa_pcm_plugins_asym
- alsa_pcm_plugins_copy
- alsa_pcm_plugins_dmix
- alsa_pcm_plugins_dshare
- alsa_pcm_plugins_dsnoop
- alsa_pcm_plugins_empty
- alsa_pcm_plugins_extplug
- alsa_pcm_plugins_file
- alsa_pcm_plugins_hooks
- alsa_pcm_plugins_iec958
- alsa_pcm_plugins_ioplug
- alsa_pcm_plugins_ladspa
- alsa_pcm_plugins_lfloat
- alsa_pcm_plugins_linear
- alsa_pcm_plugins_meter
- alsa_pcm_plugins_mmap_emul
- alsa_pcm_plugins_mulaw
- alsa_pcm_plugins_multi
- alsa_pcm_plugins_null
- alsa_pcm_plugins_plug
- alsa_pcm_plugins_rate
- alsa_pcm_plugins_route
- alsa_pcm_plugins_share
- alsa_pcm_plugins_shm
- alsa_pcm_plugins_softvol
- atm
- fbcon
- ipv6
- livecd
- lvm1
- midi
- modules
- ncurses
- nls
- nptl
- pam
- png
- portaudio
- readline
- socks5
- ssl
- truetype
- unicode
- usb
-boot/kernel/gentoo/packages:
-### These need to be added for software speech.
- app-accessibility/espeakup
- media-libs/alsa-oss
- media-sound/alsa-utils
-
- sys-apps/pcmciautils
- sys-kernel/linux-firmware
+#boot/kernel/gentoo/packages:
# ZFS is disabled until spl can build with CONFIG_PAX_RANDKSTACK
# sys-kernel/spl
# sys-fs/zfs
diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec
b/releases/weekly/specs/amd64/installcd-stage1.spec
index e783faad..601f4269 100644
--- a/releases/weekly/specs/amd64/installcd-stage1.spec
+++ b/releases/weekly/specs/amd64/installcd-stage1.spec
@@ -27,6 +27,7 @@ livecd/use:
livecd/packages:
app-accessibility/brltty
+ app-accessibility/espeakup
app-admin/hddtemp
app-admin/passook
app-admin/pwgen
@@ -39,6 +40,7 @@ livecd/packages:
app-portage/mirrorselect
app-text/wgetpaste
media-gfx/fbgrab
+ media-sound/alsa-utils
net-analyzer/traceroute
net-dialup/mingetty
net-dialup/pptpclient
@@ -73,6 +75,7 @@ livecd/packages:
sys-apps/memtester
sys-apps/netplug
sys-apps/pciutils
+ sys-apps/pcmciautils
sys-apps/sdparm
sys-apps/usbutils
sys-block/parted
diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
index d1dc28e1..12bd0292 100644
--- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
@@ -17,64 +17,6 @@ boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
boot/kernel/gentoo/config:
@REPO_DIR@/releases/weekly/kconfig/amd64/installcd-4.14.52.config
-boot/kernel/gentoo/use:
- -*
- alsa
- alsa_pcm_plugins_adpcm
- alsa_pcm_plugins_alaw
- alsa_pcm_plugins_asym
- alsa_pcm_plugins_copy
- alsa_pcm_plugins_dmix
- alsa_pcm_plugins_dshare
- alsa_pcm_plugins_dsnoop
- alsa_pcm_plugins_empty
- alsa_pcm_plugins_extplug
- alsa_pcm_plugins_file
- alsa_pcm_plugins_hooks
- alsa_pcm_plugins_iec958
- alsa_pcm_plugins_ioplug
- alsa_pcm_plugins_ladspa
- alsa_pcm_plugins_lfloat
- alsa_pcm_plugins_linear
- alsa_pcm_plugins_meter
- alsa_pcm_plugins_mmap_emul
- alsa_pcm_plugins_mulaw
- alsa_pcm_plugins_multi
- alsa_pcm_plugins_null
- alsa_pcm_plugins_plug
- alsa_pcm_plugins_rate
- alsa_pcm_plugins_route
- alsa_pcm_plugins_share
- alsa_pcm_plugins_shm
- alsa_pcm_plugins_softvol
- atm
- fbcon
- ipv6
- livecd
- lvm1
- midi
- modules
- ncurses
- nls
- nptl
- pam
- png
- portaudio
- readline
- socks5
- ssl
- truetype
- unicode
- usb
-
-boot/kernel/gentoo/packages:
-### These need to be added for software speech.
- app-accessibility/espeakup
- media-libs/alsa-oss
- media-sound/alsa-utils
-
- sys-apps/pcmciautils
- sys-kernel/linux-firmware
livecd/unmerge:
app-admin/eselect
diff --git a/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec
b/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec
index 14689917..5b72eab1 100644
--- a/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec
@@ -19,28 +19,6 @@ boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
boot/kernel/gentoo/config:
@REPO_DIR@/releases/weekly/kconfig/sparc/installcd-4.19.44.config
-boot/kernel/gentoo/use:
- -*
- atm
- fbcon
- ipv6
- livecd
- lvm1
- modules
- ncurses
- nls
- nptl
- pam
- png
- readline
- socks5
- ssl
- truetype
- unicode
- usb
-
-boot/kernel/gentoo/packages:
- sys-kernel/linux-firmware
livecd/unmerge:
app-admin/eselect
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec
b/releases/weekly/specs/x86/hardened/admincd-stage1.spec
index 9afdc44e..3e559c0e 100644
--- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec
+++ b/releases/weekly/specs/x86/hardened/admincd-stage1.spec
@@ -29,6 +29,7 @@ livecd/use:
livecd/packages:
app-accessibility/brltty
+ app-accessibility/espeakup
app-admin/hddtemp
app-admin/passook
app-admin/pwgen
@@ -83,6 +84,7 @@ livecd/packages:
dev-lang/python
dev-vcs/git
media-gfx/fbgrab
+ media-sound/alsa-utils
net-analyzer/iptraf-ng
net-analyzer/openbsd-netcat
net-analyzer/tcptraceroute
@@ -152,6 +154,7 @@ livecd/packages:
sys-apps/mlocate
sys-apps/netplug
sys-apps/pciutils
+ sys-apps/pcmciautils
sys-apps/sdparm
sys-apps/usbutils
sys-apps/sed
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec
b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
index 17910c3d..49f75ea2 100644
--- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
@@ -18,64 +18,6 @@ boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
boot/kernel/gentoo/config:
@REPO_DIR@/releases/weekly/kconfig/x86/admincd-3.18.9.config
-boot/kernel/gentoo/use:
- -*
- alsa
- alsa_pcm_plugins_adpcm
- alsa_pcm_plugins_alaw
- alsa_pcm_plugins_asym
- alsa_pcm_plugins_copy
- alsa_pcm_plugins_dmix
- alsa_pcm_plugins_dshare
- alsa_pcm_plugins_dsnoop
- alsa_pcm_plugins_empty
- alsa_pcm_plugins_extplug
- alsa_pcm_plugins_file
- alsa_pcm_plugins_hooks
- alsa_pcm_plugins_iec958
- alsa_pcm_plugins_ioplug
- alsa_pcm_plugins_ladspa
- alsa_pcm_plugins_lfloat
- alsa_pcm_plugins_linear
- alsa_pcm_plugins_meter
- alsa_pcm_plugins_mmap_emul
- alsa_pcm_plugins_mulaw
- alsa_pcm_plugins_multi
- alsa_pcm_plugins_null
- alsa_pcm_plugins_plug
- alsa_pcm_plugins_rate
- alsa_pcm_plugins_route
- alsa_pcm_plugins_share
- alsa_pcm_plugins_shm
- alsa_pcm_plugins_softvol
- atm
- fbcon
- ipv6
- livecd
- lvm1
- midi
- modules
- ncurses
- nls
- nptl
- pam
- png
- portaudio
- readline
- socks5
- ssl
- truetype
- unicode
- usb
-
-boot/kernel/gentoo/packages:
-### These need to be added for software speech.
- app-accessibility/espeakup
- media-libs/alsa-oss
- media-sound/alsa-utils
-
- sys-apps/pcmciautils
- sys-kernel/linux-firmware
livecd/unmerge:
app-admin/eselect
diff --git a/releases/weekly/specs/x86/installcd-stage1.spec
b/releases/weekly/specs/x86/installcd-stage1.spec
index 8deb066a..fd964867 100644
--- a/releases/weekly/specs/x86/installcd-stage1.spec
+++ b/releases/weekly/specs/x86/installcd-stage1.spec
@@ -26,6 +26,7 @@ livecd/use:
livecd/packages:
app-accessibility/brltty
+ app-accessibility/espeakup
app-admin/hddtemp
app-admin/passook
app-admin/pwgen
@@ -38,6 +39,7 @@ livecd/packages:
app-portage/mirrorselect
app-text/wgetpaste
media-gfx/fbgrab
+ media-sound/alsa-utils
net-analyzer/traceroute
net-dialup/mingetty
net-dialup/pptpclient
@@ -74,6 +76,7 @@ livecd/packages:
sys-apps/memtester
sys-apps/netplug
sys-apps/pciutils
+ sys-apps/pcmciautils
sys-apps/sdparm
sys-apps/usbutils
sys-block/parted
diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec
b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
index 08298059..e5afaf13 100644
--- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
@@ -18,65 +18,6 @@ boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
boot/kernel/gentoo/config:
@REPO_DIR@/releases/weekly/kconfig/x86/installcd-4.14.52.config
-boot/kernel/gentoo/use:
- -*
- alsa
- alsa_pcm_plugins_adpcm
- alsa_pcm_plugins_alaw
- alsa_pcm_plugins_asym
- alsa_pcm_plugins_copy
- alsa_pcm_plugins_dmix
- alsa_pcm_plugins_dshare
- alsa_pcm_plugins_dsnoop
- alsa_pcm_plugins_empty
- alsa_pcm_plugins_extplug
- alsa_pcm_plugins_file
- alsa_pcm_plugins_hooks
- alsa_pcm_plugins_iec958
- alsa_pcm_plugins_ioplug
- alsa_pcm_plugins_ladspa
- alsa_pcm_plugins_lfloat
- alsa_pcm_plugins_linear
- alsa_pcm_plugins_meter
- alsa_pcm_plugins_mmap_emul
- alsa_pcm_plugins_mulaw
- alsa_pcm_plugins_multi
- alsa_pcm_plugins_null
- alsa_pcm_plugins_plug
- alsa_pcm_plugins_rate
- alsa_pcm_plugins_route
- alsa_pcm_plugins_share
- alsa_pcm_plugins_shm
- alsa_pcm_plugins_softvol
- atm
- fbcon
- ipv6
- livecd
- lvm1
- midi
- modules
- ncurses
- nls
- nptl
- pam
- png
- portaudio
- readline
- socks5
- ssl
- truetype
- unicode
- usb
-
-boot/kernel/gentoo/packages:
-### These need to be added for software speech.
- app-accessibility/espeakup
- media-libs/alsa-oss
- media-sound/alsa-utils
- net-wireless/hostap-utils
-
- sys-apps/pcmciautils
- sys-kernel/linux-firmware
livecd/unmerge:
app-admin/eselect
