| 1 |
commit: c95d0fb3c74a8bb8b883b067874ff605fb617dfd |
| 2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 2 13:38:43 2018 +0000 |
| 4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 2 13:38:43 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c95d0fb3 |
| 7 |
|
| 8 |
specs: more firmware-related fixes on amd64/x86 livecds |
| 9 |
|
| 10 |
Several changes here: |
| 11 |
|
| 12 |
-Fix sorting on previous addition, and elsewhere |
| 13 |
-Move several firmwares from net-wireless/ to sys-firmware/ |
| 14 |
-Remove obsolete prism54-firmware |
| 15 |
-Remove iwl* firmware (bundled in linux-firmware) |
| 16 |
-Add linux-firmware where it's missing |
| 17 |
|
| 18 |
.../weekly/specs/amd64/hardened/admincd-stage1-selinux.spec | 4 ++-- |
| 19 |
releases/weekly/specs/amd64/hardened/admincd-stage1.spec | 4 ++-- |
| 20 |
releases/weekly/specs/amd64/installcd-stage1.spec | 4 ++-- |
| 21 |
releases/weekly/specs/amd64/livecd-stage1.spec | 12 ++++-------- |
| 22 |
releases/weekly/specs/amd64/livecd-stage2.spec | 3 +-- |
| 23 |
releases/weekly/specs/amd64/livedvd-stage1.spec | 12 ++++-------- |
| 24 |
releases/weekly/specs/amd64/livedvd-stage2.spec | 2 +- |
| 25 |
releases/weekly/specs/x86/hardened/admincd-stage1.spec | 4 ++-- |
| 26 |
releases/weekly/specs/x86/hardened/installcd-stage1.spec | 12 ++++-------- |
| 27 |
.../weekly/specs/x86/hardened/installcd-stage2-minimal.spec | 2 +- |
| 28 |
releases/weekly/specs/x86/i686/livecd-stage1.spec | 12 ++++-------- |
| 29 |
releases/weekly/specs/x86/i686/livedvd-stage1.spec | 12 ++++-------- |
| 30 |
12 files changed, 31 insertions(+), 52 deletions(-) |
| 31 |
|
| 32 |
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec |
| 33 |
index 917e1c3f..d6ceaeaf 100644 |
| 34 |
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec |
| 35 |
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec |
| 36 |
@@ -115,8 +115,6 @@ livecd/packages: |
| 37 |
net-proxy/tsocks |
| 38 |
net-vpn/openvpn |
| 39 |
net-wireless/b43-fwcutter |
| 40 |
- sys-firmware/ipw2100-firmware |
| 41 |
- sys-firmware/ipw2200-firmware |
| 42 |
### Masked (~amd64) |
| 43 |
# net-wireless/bcm43xx-fwcutter |
| 44 |
net-wireless/iw |
| 45 |
@@ -170,6 +168,8 @@ livecd/packages: |
| 46 |
sys-block/partimage |
| 47 |
sys-block/tw_cli |
| 48 |
sys-boot/grub |
| 49 |
+ sys-firmware/ipw2100-firmware |
| 50 |
+ sys-firmware/ipw2200-firmware |
| 51 |
sys-fs/btrfs-progs |
| 52 |
sys-fs/cryptsetup |
| 53 |
sys-fs/ddrescue |
| 54 |
|
| 55 |
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec |
| 56 |
index 6b1e35d8..b9356be6 100644 |
| 57 |
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec |
| 58 |
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec |
| 59 |
@@ -118,8 +118,6 @@ livecd/packages: |
| 60 |
net-proxy/tsocks |
| 61 |
net-vpn/openvpn |
| 62 |
net-wireless/b43-fwcutter |
| 63 |
- sys-firmware/ipw2100-firmware |
| 64 |
- sys-firmware/ipw2200-firmware |
| 65 |
### Masked (~amd64) |
| 66 |
# net-wireless/bcm43xx-fwcutter |
| 67 |
net-wireless/iw |
| 68 |
@@ -173,6 +171,8 @@ livecd/packages: |
| 69 |
sys-block/partimage |
| 70 |
sys-block/tw_cli |
| 71 |
sys-boot/grub |
| 72 |
+ sys-firmware/ipw2100-firmware |
| 73 |
+ sys-firmware/ipw2200-firmware |
| 74 |
sys-fs/btrfs-progs |
| 75 |
sys-fs/cryptsetup |
| 76 |
sys-fs/ddrescue |
| 77 |
|
| 78 |
diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec b/releases/weekly/specs/amd64/installcd-stage1.spec |
| 79 |
index 66e972a3..e783faad 100644 |
| 80 |
--- a/releases/weekly/specs/amd64/installcd-stage1.spec |
| 81 |
+++ b/releases/weekly/specs/amd64/installcd-stage1.spec |
| 82 |
@@ -57,8 +57,6 @@ livecd/packages: |
| 83 |
net-proxy/dante |
| 84 |
net-proxy/tsocks |
| 85 |
net-wireless/b43-fwcutter |
| 86 |
- sys-firmware/ipw2100-firmware |
| 87 |
- sys-firmware/ipw2200-firmware |
| 88 |
### Masked (~keywords) |
| 89 |
# net-wireless/bcm43xx-fwcutter |
| 90 |
net-wireless/iw |
| 91 |
@@ -79,6 +77,8 @@ livecd/packages: |
| 92 |
sys-apps/usbutils |
| 93 |
sys-block/parted |
| 94 |
sys-block/partimage |
| 95 |
+ sys-firmware/ipw2100-firmware |
| 96 |
+ sys-firmware/ipw2200-firmware |
| 97 |
sys-fs/btrfs-progs |
| 98 |
sys-fs/cryptsetup |
| 99 |
sys-fs/dmraid |
| 100 |
|
| 101 |
diff --git a/releases/weekly/specs/amd64/livecd-stage1.spec b/releases/weekly/specs/amd64/livecd-stage1.spec |
| 102 |
index 952e32b9..34c70ff7 100644 |
| 103 |
--- a/releases/weekly/specs/amd64/livecd-stage1.spec |
| 104 |
+++ b/releases/weekly/specs/amd64/livecd-stage1.spec |
| 105 |
@@ -75,13 +75,8 @@ livecd/packages: |
| 106 |
net-wireless/b43-fwcutter |
| 107 |
### Masked (~amd64) |
| 108 |
# net-wireless/bcm43xx-fwcutter |
| 109 |
- net-wireless/ipw2100-firmware |
| 110 |
- net-wireless/ipw2200-firmware |
| 111 |
- net-wireless/prism54-firmware |
| 112 |
net-wireless/wireless-tools |
| 113 |
net-wireless/wpa_supplicant |
| 114 |
- net-wireless/zd1201-firmware |
| 115 |
- net-wireless/zd1211-firmware |
| 116 |
### Masked (no keywords) |
| 117 |
sys-apps/ethtool |
| 118 |
sys-apps/fxload |
| 119 |
@@ -123,9 +118,10 @@ livecd/packages: |
| 120 |
sys-devel/distcc |
| 121 |
### Masked (no keywords) |
| 122 |
# sys-devel/gcc-hppa64 |
| 123 |
- sys-firmware/iwl3945-ucode |
| 124 |
- sys-firmware/iwl4965-ucode |
| 125 |
- sys-firmware/iwl5000-ucode |
| 126 |
+ sys-firmware/ipw2100-firmware |
| 127 |
+ sys-firmware/ipw2200-firmware |
| 128 |
+ sys-firmware/zd1201-firmware |
| 129 |
+ sys-firmware/zd1211-firmware |
| 130 |
sys-fs/cryptsetup |
| 131 |
sys-fs/dmraid |
| 132 |
sys-fs/dosfstools |
| 133 |
|
| 134 |
diff --git a/releases/weekly/specs/amd64/livecd-stage2.spec b/releases/weekly/specs/amd64/livecd-stage2.spec |
| 135 |
index ae71674d..f267697e 100644 |
| 136 |
--- a/releases/weekly/specs/amd64/livecd-stage2.spec |
| 137 |
+++ b/releases/weekly/specs/amd64/livecd-stage2.spec |
| 138 |
@@ -41,9 +41,8 @@ boot/kernel/gentoo/packages: |
| 139 |
# net-wireless/rt2500 |
| 140 |
### Masked (~amd64) |
| 141 |
# net-wireless/rtl8187 |
| 142 |
- |
| 143 |
sys-apps/pcmciautils |
| 144 |
- |
| 145 |
+ sys-kernel/linux-firmware |
| 146 |
sys-fs/ntfs3g |
| 147 |
|
| 148 |
livecd/empty: |
| 149 |
|
| 150 |
diff --git a/releases/weekly/specs/amd64/livedvd-stage1.spec b/releases/weekly/specs/amd64/livedvd-stage1.spec |
| 151 |
index 2fcb7011..8cda37ee 100644 |
| 152 |
--- a/releases/weekly/specs/amd64/livedvd-stage1.spec |
| 153 |
+++ b/releases/weekly/specs/amd64/livedvd-stage1.spec |
| 154 |
@@ -175,15 +175,10 @@ livecd/packages: |
| 155 |
### Masked (~amd64) |
| 156 |
# net-wireless/bcm43xx-fwcutter |
| 157 |
net-wireless/gnome-bluetooth |
| 158 |
- net-wireless/ipw2100-firmware |
| 159 |
- net-wireless/ipw2200-firmware |
| 160 |
net-wireless/kdebluetooth |
| 161 |
- net-wireless/prism54-firmware |
| 162 |
net-wireless/wepattack |
| 163 |
net-wireless/wireless-tools |
| 164 |
net-wireless/wpa_supplicant |
| 165 |
- net-wireless/zd1201-firmware |
| 166 |
- net-wireless/zd1211-firmware |
| 167 |
rox-base/rox |
| 168 |
### Masked |
| 169 |
sys-apps/dmidecode |
| 170 |
@@ -240,9 +235,10 @@ livecd/packages: |
| 171 |
### Masked (no keyword) |
| 172 |
# sys-devel/gcc-hppa64 |
| 173 |
sys-devel/gdb |
| 174 |
- sys-firmware/iwl3945-ucode |
| 175 |
- sys-firmware/iwl4965-ucode |
| 176 |
- sys-firmware/iwl5000-ucode |
| 177 |
+ sys-firmware/ipw2100-firmware |
| 178 |
+ sys-firmware/ipw2200-firmware |
| 179 |
+ sys-firmware/zd1201-firmware |
| 180 |
+ sys-firmware/zd1211-firmware |
| 181 |
sys-fs/cryptsetup |
| 182 |
sys-fs/dmraid |
| 183 |
sys-fs/dosfstools |
| 184 |
|
| 185 |
diff --git a/releases/weekly/specs/amd64/livedvd-stage2.spec b/releases/weekly/specs/amd64/livedvd-stage2.spec |
| 186 |
index b02c8a30..27356540 100644 |
| 187 |
--- a/releases/weekly/specs/amd64/livedvd-stage2.spec |
| 188 |
+++ b/releases/weekly/specs/amd64/livedvd-stage2.spec |
| 189 |
@@ -42,8 +42,8 @@ boot/kernel/gentoo/packages: |
| 190 |
# net-wireless/rt2500 |
| 191 |
### Masked (~amd64) |
| 192 |
# net-wireless/rtl8187 |
| 193 |
- |
| 194 |
sys-apps/pcmciautils |
| 195 |
+ sys-kernel/linux-firmware |
| 196 |
|
| 197 |
livecd/empty: |
| 198 |
/var/tmp |
| 199 |
|
| 200 |
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/weekly/specs/x86/hardened/admincd-stage1.spec |
| 201 |
index e308a56b..158ca49e 100644 |
| 202 |
--- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec |
| 203 |
+++ b/releases/weekly/specs/x86/hardened/admincd-stage1.spec |
| 204 |
@@ -118,8 +118,6 @@ livecd/packages: |
| 205 |
net-proxy/tsocks |
| 206 |
net-vpn/openvpn |
| 207 |
net-wireless/b43-fwcutter |
| 208 |
- sys-firmware/ipw2100-firmware |
| 209 |
- sys-firmware/ipw2200-firmware |
| 210 |
### Masked (~amd64) |
| 211 |
# net-wireless/bcm43xx-fwcutter |
| 212 |
net-wireless/iw |
| 213 |
@@ -173,6 +171,8 @@ livecd/packages: |
| 214 |
sys-block/partimage |
| 215 |
sys-block/tw_cli |
| 216 |
sys-boot/grub |
| 217 |
+ sys-firmware/ipw2100-firmware |
| 218 |
+ sys-firmware/ipw2200-firmware |
| 219 |
sys-fs/btrfs-progs |
| 220 |
sys-fs/cryptsetup |
| 221 |
sys-fs/ddrescue |
| 222 |
|
| 223 |
diff --git a/releases/weekly/specs/x86/hardened/installcd-stage1.spec b/releases/weekly/specs/x86/hardened/installcd-stage1.spec |
| 224 |
index 12fb3500..1c88c9ec 100644 |
| 225 |
--- a/releases/weekly/specs/x86/hardened/installcd-stage1.spec |
| 226 |
+++ b/releases/weekly/specs/x86/hardened/installcd-stage1.spec |
| 227 |
@@ -49,13 +49,8 @@ livecd/packages: |
| 228 |
net-misc/vconfig |
| 229 |
net-proxy/dante |
| 230 |
net-proxy/tsocks |
| 231 |
- net-wireless/ipw2100-firmware |
| 232 |
- net-wireless/ipw2200-firmware |
| 233 |
- net-wireless/prism54-firmware |
| 234 |
net-wireless/wireless-tools |
| 235 |
net-wireless/wpa_supplicant |
| 236 |
- net-wireless/zd1201-firmware |
| 237 |
- net-wireless/zd1211-firmware |
| 238 |
sys-apps/ethtool |
| 239 |
sys-apps/fxload |
| 240 |
sys-apps/hdparm |
| 241 |
@@ -67,9 +62,10 @@ livecd/packages: |
| 242 |
sys-apps/sdparm |
| 243 |
# sys-block/partimage |
| 244 |
# sys-block/qla-fc-firmware |
| 245 |
- sys-firmware/iwl3945-ucode |
| 246 |
- sys-firmware/iwl4965-ucode |
| 247 |
- sys-firmware/iwl5000-ucode |
| 248 |
+ sys-firmware/ipw2100-firmware |
| 249 |
+ sys-firmware/ipw2200-firmware |
| 250 |
+ sys-firmware/zd1201-firmware |
| 251 |
+ sys-firmware/zd1211-firmware |
| 252 |
sys-fs/cryptsetup |
| 253 |
sys-fs/dmraid |
| 254 |
sys-fs/dosfstools |
| 255 |
|
| 256 |
diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec |
| 257 |
index a7a610c1..50d153e5 100644 |
| 258 |
--- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec |
| 259 |
+++ b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec |
| 260 |
@@ -75,8 +75,8 @@ boot/kernel/gentoo/packages: |
| 261 |
net-wireless/hostap-utils |
| 262 |
# net-dialup/fritzcapi |
| 263 |
# net-dialup/fcdsl |
| 264 |
- |
| 265 |
sys-apps/pcmciautils |
| 266 |
+ sys-kernel/linux-firmware |
| 267 |
|
| 268 |
livecd/unmerge: |
| 269 |
app-admin/eselect |
| 270 |
|
| 271 |
diff --git a/releases/weekly/specs/x86/i686/livecd-stage1.spec b/releases/weekly/specs/x86/i686/livecd-stage1.spec |
| 272 |
index ed8580a7..26fcee01 100644 |
| 273 |
--- a/releases/weekly/specs/x86/i686/livecd-stage1.spec |
| 274 |
+++ b/releases/weekly/specs/x86/i686/livecd-stage1.spec |
| 275 |
@@ -74,13 +74,8 @@ livecd/packages: |
| 276 |
### Masked by ~x86 |
| 277 |
# net-wireless/b43-fwcutter |
| 278 |
# net-wireless/bcm43xx-fwcutter |
| 279 |
- net-wireless/ipw2100-firmware |
| 280 |
- net-wireless/ipw2200-firmware |
| 281 |
- net-wireless/prism54-firmware |
| 282 |
net-wireless/wireless-tools |
| 283 |
net-wireless/wpa_supplicant |
| 284 |
- net-wireless/zd1201-firmware |
| 285 |
- net-wireless/zd1211-firmware |
| 286 |
sys-apps/ethtool |
| 287 |
sys-apps/fxload |
| 288 |
sys-apps/hdparm |
| 289 |
@@ -110,9 +105,10 @@ livecd/packages: |
| 290 |
# sys-devel/binutils-hppa64 |
| 291 |
sys-devel/distcc |
| 292 |
# sys-devel/gcc-hppa64 |
| 293 |
- sys-firmware/iwl3945-ucode |
| 294 |
- sys-firmware/iwl4965-ucode |
| 295 |
- sys-firmware/iwl5000-ucode |
| 296 |
+ sys-firmware/ipw2100-firmware |
| 297 |
+ sys-firmware/ipw2200-firmware |
| 298 |
+ sys-firmware/zd1201-firmware |
| 299 |
+ sys-firmware/zd1211-firmware |
| 300 |
sys-fs/dmraid |
| 301 |
sys-fs/dosfstools |
| 302 |
sys-fs/e2fsprogs |
| 303 |
|
| 304 |
diff --git a/releases/weekly/specs/x86/i686/livedvd-stage1.spec b/releases/weekly/specs/x86/i686/livedvd-stage1.spec |
| 305 |
index 09483182..ad5f93d7 100644 |
| 306 |
--- a/releases/weekly/specs/x86/i686/livedvd-stage1.spec |
| 307 |
+++ b/releases/weekly/specs/x86/i686/livedvd-stage1.spec |
| 308 |
@@ -167,15 +167,10 @@ livecd/packages: |
| 309 |
# net-wireless/b43-fwcutter |
| 310 |
# net-wireless/bcm43xx-fwcutter |
| 311 |
net-wireless/gnome-bluetooth |
| 312 |
- net-wireless/ipw2100-firmware |
| 313 |
- net-wireless/ipw2200-firmware |
| 314 |
net-wireless/kdebluetooth |
| 315 |
- net-wireless/prism54-firmware |
| 316 |
net-wireless/wepattack |
| 317 |
net-wireless/wireless-tools |
| 318 |
net-wireless/wpa_supplicant |
| 319 |
- net-wireless/zd1201-firmware |
| 320 |
- net-wireless/zd1211-firmware |
| 321 |
rox-base/rox |
| 322 |
sys-apps/dmidecode |
| 323 |
sys-apps/ethtool |
| 324 |
@@ -217,9 +212,10 @@ livecd/packages: |
| 325 |
sys-devel/distcc |
| 326 |
# sys-devel/gcc-hppa64 |
| 327 |
sys-devel/gdb |
| 328 |
- sys-firmware/iwl3945-ucode |
| 329 |
- sys-firmware/iwl4965-ucode |
| 330 |
- sys-firmware/iwl5000-ucode |
| 331 |
+ sys-firmware/ipw2100-firmware |
| 332 |
+ sys-firmware/ipw2200-firmware |
| 333 |
+ sys-firmware/zd1201-firmware |
| 334 |
+ sys-firmware/zd1211-firmware |
| 335 |
sys-fs/dmraid |
| 336 |
sys-fs/dosfstools |
| 337 |
sys-fs/e2fsprogs |
Archives