From c95d0fb3c74a8bb8b883b067874ff605fb617dfd Mon Sep 17 00:00:00 2001 From: Ben Kohler Date: Thu, 2 Aug 2018 08:38:43 -0500 Subject: specs: more firmware-related fixes on amd64/x86 livecds Several changes here: -Fix sorting on previous addition, and elsewhere -Move several firmwares from net-wireless/ to sys-firmware/ -Remove obsolete prism54-firmware -Remove iwl* firmware (bundled in linux-firmware) -Add linux-firmware where it's missing --- .../weekly/specs/amd64/hardened/admincd-stage1-selinux.spec | 4 ++-- releases/weekly/specs/amd64/hardened/admincd-stage1.spec | 4 ++-- releases/weekly/specs/amd64/installcd-stage1.spec | 4 ++-- releases/weekly/specs/amd64/livecd-stage1.spec | 12 ++++-------- releases/weekly/specs/amd64/livecd-stage2.spec | 3 +-- releases/weekly/specs/amd64/livedvd-stage1.spec | 12 ++++-------- releases/weekly/specs/amd64/livedvd-stage2.spec | 2 +- releases/weekly/specs/x86/hardened/admincd-stage1.spec | 4 ++-- releases/weekly/specs/x86/hardened/installcd-stage1.spec | 12 ++++-------- .../weekly/specs/x86/hardened/installcd-stage2-minimal.spec | 2 +- releases/weekly/specs/x86/i686/livecd-stage1.spec | 12 ++++-------- releases/weekly/specs/x86/i686/livedvd-stage1.spec | 12 ++++-------- 12 files changed, 31 insertions(+), 52 deletions(-) diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec index 917e1c3f..d6ceaeaf 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec @@ -115,8 +115,6 @@ livecd/packages: net-proxy/tsocks net-vpn/openvpn net-wireless/b43-fwcutter - sys-firmware/ipw2100-firmware - sys-firmware/ipw2200-firmware ### Masked (~amd64) # net-wireless/bcm43xx-fwcutter net-wireless/iw @@ -170,6 +168,8 @@ livecd/packages: sys-block/partimage sys-block/tw_cli sys-boot/grub + sys-firmware/ipw2100-firmware + sys-firmware/ipw2200-firmware sys-fs/btrfs-progs sys-fs/cryptsetup sys-fs/ddrescue diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec index 6b1e35d8..b9356be6 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec @@ -118,8 +118,6 @@ livecd/packages: net-proxy/tsocks net-vpn/openvpn net-wireless/b43-fwcutter - sys-firmware/ipw2100-firmware - sys-firmware/ipw2200-firmware ### Masked (~amd64) # net-wireless/bcm43xx-fwcutter net-wireless/iw @@ -173,6 +171,8 @@ livecd/packages: sys-block/partimage sys-block/tw_cli sys-boot/grub + sys-firmware/ipw2100-firmware + sys-firmware/ipw2200-firmware sys-fs/btrfs-progs sys-fs/cryptsetup sys-fs/ddrescue diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec b/releases/weekly/specs/amd64/installcd-stage1.spec index 66e972a3..e783faad 100644 --- a/releases/weekly/specs/amd64/installcd-stage1.spec +++ b/releases/weekly/specs/amd64/installcd-stage1.spec @@ -57,8 +57,6 @@ livecd/packages: net-proxy/dante net-proxy/tsocks net-wireless/b43-fwcutter - sys-firmware/ipw2100-firmware - sys-firmware/ipw2200-firmware ### Masked (~keywords) # net-wireless/bcm43xx-fwcutter net-wireless/iw @@ -79,6 +77,8 @@ livecd/packages: sys-apps/usbutils sys-block/parted sys-block/partimage + sys-firmware/ipw2100-firmware + sys-firmware/ipw2200-firmware sys-fs/btrfs-progs sys-fs/cryptsetup sys-fs/dmraid diff --git a/releases/weekly/specs/amd64/livecd-stage1.spec b/releases/weekly/specs/amd64/livecd-stage1.spec index 952e32b9..34c70ff7 100644 --- a/releases/weekly/specs/amd64/livecd-stage1.spec +++ b/releases/weekly/specs/amd64/livecd-stage1.spec @@ -75,13 +75,8 @@ livecd/packages: net-wireless/b43-fwcutter ### Masked (~amd64) # net-wireless/bcm43xx-fwcutter - net-wireless/ipw2100-firmware - net-wireless/ipw2200-firmware - net-wireless/prism54-firmware net-wireless/wireless-tools net-wireless/wpa_supplicant - net-wireless/zd1201-firmware - net-wireless/zd1211-firmware ### Masked (no keywords) sys-apps/ethtool sys-apps/fxload @@ -123,9 +118,10 @@ livecd/packages: sys-devel/distcc ### Masked (no keywords) # sys-devel/gcc-hppa64 - sys-firmware/iwl3945-ucode - sys-firmware/iwl4965-ucode - sys-firmware/iwl5000-ucode + sys-firmware/ipw2100-firmware + sys-firmware/ipw2200-firmware + sys-firmware/zd1201-firmware + sys-firmware/zd1211-firmware sys-fs/cryptsetup sys-fs/dmraid sys-fs/dosfstools diff --git a/releases/weekly/specs/amd64/livecd-stage2.spec b/releases/weekly/specs/amd64/livecd-stage2.spec index ae71674d..f267697e 100644 --- a/releases/weekly/specs/amd64/livecd-stage2.spec +++ b/releases/weekly/specs/amd64/livecd-stage2.spec @@ -41,9 +41,8 @@ boot/kernel/gentoo/packages: # net-wireless/rt2500 ### Masked (~amd64) # net-wireless/rtl8187 - sys-apps/pcmciautils - + sys-kernel/linux-firmware sys-fs/ntfs3g livecd/empty: diff --git a/releases/weekly/specs/amd64/livedvd-stage1.spec b/releases/weekly/specs/amd64/livedvd-stage1.spec index 2fcb7011..8cda37ee 100644 --- a/releases/weekly/specs/amd64/livedvd-stage1.spec +++ b/releases/weekly/specs/amd64/livedvd-stage1.spec @@ -175,15 +175,10 @@ livecd/packages: ### Masked (~amd64) # net-wireless/bcm43xx-fwcutter net-wireless/gnome-bluetooth - net-wireless/ipw2100-firmware - net-wireless/ipw2200-firmware net-wireless/kdebluetooth - net-wireless/prism54-firmware net-wireless/wepattack net-wireless/wireless-tools net-wireless/wpa_supplicant - net-wireless/zd1201-firmware - net-wireless/zd1211-firmware rox-base/rox ### Masked sys-apps/dmidecode @@ -240,9 +235,10 @@ livecd/packages: ### Masked (no keyword) # sys-devel/gcc-hppa64 sys-devel/gdb - sys-firmware/iwl3945-ucode - sys-firmware/iwl4965-ucode - sys-firmware/iwl5000-ucode + sys-firmware/ipw2100-firmware + sys-firmware/ipw2200-firmware + sys-firmware/zd1201-firmware + sys-firmware/zd1211-firmware sys-fs/cryptsetup sys-fs/dmraid sys-fs/dosfstools diff --git a/releases/weekly/specs/amd64/livedvd-stage2.spec b/releases/weekly/specs/amd64/livedvd-stage2.spec index b02c8a30..27356540 100644 --- a/releases/weekly/specs/amd64/livedvd-stage2.spec +++ b/releases/weekly/specs/amd64/livedvd-stage2.spec @@ -42,8 +42,8 @@ boot/kernel/gentoo/packages: # net-wireless/rt2500 ### Masked (~amd64) # net-wireless/rtl8187 - sys-apps/pcmciautils + sys-kernel/linux-firmware livecd/empty: /var/tmp diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/weekly/specs/x86/hardened/admincd-stage1.spec index e308a56b..158ca49e 100644 --- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec +++ b/releases/weekly/specs/x86/hardened/admincd-stage1.spec @@ -118,8 +118,6 @@ livecd/packages: net-proxy/tsocks net-vpn/openvpn net-wireless/b43-fwcutter - sys-firmware/ipw2100-firmware - sys-firmware/ipw2200-firmware ### Masked (~amd64) # net-wireless/bcm43xx-fwcutter net-wireless/iw @@ -173,6 +171,8 @@ livecd/packages: sys-block/partimage sys-block/tw_cli sys-boot/grub + sys-firmware/ipw2100-firmware + sys-firmware/ipw2200-firmware sys-fs/btrfs-progs sys-fs/cryptsetup sys-fs/ddrescue diff --git a/releases/weekly/specs/x86/hardened/installcd-stage1.spec b/releases/weekly/specs/x86/hardened/installcd-stage1.spec index 12fb3500..1c88c9ec 100644 --- a/releases/weekly/specs/x86/hardened/installcd-stage1.spec +++ b/releases/weekly/specs/x86/hardened/installcd-stage1.spec @@ -49,13 +49,8 @@ livecd/packages: net-misc/vconfig net-proxy/dante net-proxy/tsocks - net-wireless/ipw2100-firmware - net-wireless/ipw2200-firmware - net-wireless/prism54-firmware net-wireless/wireless-tools net-wireless/wpa_supplicant - net-wireless/zd1201-firmware - net-wireless/zd1211-firmware sys-apps/ethtool sys-apps/fxload sys-apps/hdparm @@ -67,9 +62,10 @@ livecd/packages: sys-apps/sdparm # sys-block/partimage # sys-block/qla-fc-firmware - sys-firmware/iwl3945-ucode - sys-firmware/iwl4965-ucode - sys-firmware/iwl5000-ucode + sys-firmware/ipw2100-firmware + sys-firmware/ipw2200-firmware + sys-firmware/zd1201-firmware + sys-firmware/zd1211-firmware sys-fs/cryptsetup sys-fs/dmraid sys-fs/dosfstools diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec index a7a610c1..50d153e5 100644 --- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec @@ -75,8 +75,8 @@ boot/kernel/gentoo/packages: net-wireless/hostap-utils # net-dialup/fritzcapi # net-dialup/fcdsl - sys-apps/pcmciautils + sys-kernel/linux-firmware livecd/unmerge: app-admin/eselect diff --git a/releases/weekly/specs/x86/i686/livecd-stage1.spec b/releases/weekly/specs/x86/i686/livecd-stage1.spec index ed8580a7..26fcee01 100644 --- a/releases/weekly/specs/x86/i686/livecd-stage1.spec +++ b/releases/weekly/specs/x86/i686/livecd-stage1.spec @@ -74,13 +74,8 @@ livecd/packages: ### Masked by ~x86 # net-wireless/b43-fwcutter # net-wireless/bcm43xx-fwcutter - net-wireless/ipw2100-firmware - net-wireless/ipw2200-firmware - net-wireless/prism54-firmware net-wireless/wireless-tools net-wireless/wpa_supplicant - net-wireless/zd1201-firmware - net-wireless/zd1211-firmware sys-apps/ethtool sys-apps/fxload sys-apps/hdparm @@ -110,9 +105,10 @@ livecd/packages: # sys-devel/binutils-hppa64 sys-devel/distcc # sys-devel/gcc-hppa64 - sys-firmware/iwl3945-ucode - sys-firmware/iwl4965-ucode - sys-firmware/iwl5000-ucode + sys-firmware/ipw2100-firmware + sys-firmware/ipw2200-firmware + sys-firmware/zd1201-firmware + sys-firmware/zd1211-firmware sys-fs/dmraid sys-fs/dosfstools sys-fs/e2fsprogs diff --git a/releases/weekly/specs/x86/i686/livedvd-stage1.spec b/releases/weekly/specs/x86/i686/livedvd-stage1.spec index 09483182..ad5f93d7 100644 --- a/releases/weekly/specs/x86/i686/livedvd-stage1.spec +++ b/releases/weekly/specs/x86/i686/livedvd-stage1.spec @@ -167,15 +167,10 @@ livecd/packages: # net-wireless/b43-fwcutter # net-wireless/bcm43xx-fwcutter net-wireless/gnome-bluetooth - net-wireless/ipw2100-firmware - net-wireless/ipw2200-firmware net-wireless/kdebluetooth - net-wireless/prism54-firmware net-wireless/wepattack net-wireless/wireless-tools net-wireless/wpa_supplicant - net-wireless/zd1201-firmware - net-wireless/zd1211-firmware rox-base/rox sys-apps/dmidecode sys-apps/ethtool @@ -217,9 +212,10 @@ livecd/packages: sys-devel/distcc # sys-devel/gcc-hppa64 sys-devel/gdb - sys-firmware/iwl3945-ucode - sys-firmware/iwl4965-ucode - sys-firmware/iwl5000-ucode + sys-firmware/ipw2100-firmware + sys-firmware/ipw2200-firmware + sys-firmware/zd1201-firmware + sys-firmware/zd1211-firmware sys-fs/dmraid sys-fs/dosfstools sys-fs/e2fsprogs -- cgit v1.2.3-65-gdbad