[gentoo-commits] proj/releng:master commit in: releases/weekly/specs/x86/i686/, releases/weekly/specs/amd64/, ...

2018-08-02 Thread Ben Kohler
commit: c95d0fb3c74a8bb8b883b067874ff605fb617dfd
Author: Ben Kohler  gentoo  org>
AuthorDate: Thu Aug  2 13:38:43 2018 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Thu Aug  2 13:38:43 2018 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=c95d0fb3

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
+ 

[gentoo-commits] proj/releng:master commit in: releases/weekly/specs/x86/i686/, releases/weekly/specs/amd64/hardened/, ...

2018-04-09 Thread Ben Kohler
commit: 6286776992e1eb2ee9254f41656f6f3f8c00a524
Author: Ben Kohler  gmail  com>
AuthorDate: Mon Apr  9 13:51:10 2018 +
Commit: Ben Kohler  gmail  com>
CommitDate: Mon Apr  9 13:51:10 2018 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=62867769

releases/weekly/specs/*/*cd-stage1.spec: remove dead ntlmaps pkg

net-proxy/ntlmaps was removed from ::gentoo in 2016 [1], time to remove
it from installcd package list.

[1] 
https://gitweb.gentoo.org/repo/gentoo.git/commit/net-proxy/ntlmaps?id=031ceb4bc4a53dca5c20906459ff08b8c48f7c5e

 releases/weekly/specs/alpha/installcd-stage1.spec| 1 -
 releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec | 1 -
 releases/weekly/specs/amd64/hardened/admincd-stage1.spec | 1 -
 releases/weekly/specs/amd64/installcd-stage1.spec| 1 -
 releases/weekly/specs/amd64/livecd-stage1.spec   | 1 -
 releases/weekly/specs/amd64/livedvd-stage1.spec  | 1 -
 releases/weekly/specs/hppa/installcd-stage1.spec | 1 -
 releases/weekly/specs/hppa/installcd-stage2-minimal.spec | 1 -
 releases/weekly/specs/ia64/installcd-stage1.spec | 1 -
 releases/weekly/specs/ppc/ppc64/installcd-stage1.spec| 1 -
 releases/weekly/specs/sparc/sparc64/installcd-stage1.spec| 1 -
 releases/weekly/specs/x86/hardened/admincd-stage1.spec   | 1 -
 releases/weekly/specs/x86/hardened/installcd-stage1.spec | 1 -
 releases/weekly/specs/x86/i686/livecd-stage1.spec| 1 -
 releases/weekly/specs/x86/i686/livedvd-stage1.spec   | 1 -
 releases/weekly/specs/x86/installcd-stage1.spec  | 1 -
 16 files changed, 16 deletions(-)

diff --git a/releases/weekly/specs/alpha/installcd-stage1.spec 
b/releases/weekly/specs/alpha/installcd-stage1.spec
index 300e7eaf..b2a2f250 100644
--- a/releases/weekly/specs/alpha/installcd-stage1.spec
+++ b/releases/weekly/specs/alpha/installcd-stage1.spec
@@ -50,7 +50,6 @@ livecd/packages:
net-misc/rdate
 #  net-misc/vconfig
net-proxy/dante
-#  net-proxy/ntlmaps
net-proxy/tsocks
 #  net-wireless/ipw2100-firmware
 #  net-wireless/ipw2200-firmware

diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec 
b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
index c24c5d3e..70365c39 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
@@ -115,7 +115,6 @@ livecd/packages:
net-misc/wget
net-misc/whois
net-proxy/dante
-#  net-proxy/ntlmaps
net-proxy/tsocks
net-vpn/openvpn
net-wireless/b43-fwcutter

diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec 
b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
index 8cc0b8aa..c07f82b7 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
@@ -118,7 +118,6 @@ livecd/packages:
net-misc/wget
net-misc/whois
net-proxy/dante
-#  net-proxy/ntlmaps
net-proxy/tsocks
net-vpn/openvpn
net-wireless/b43-fwcutter

diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec 
b/releases/weekly/specs/amd64/installcd-stage1.spec
index f0efe78c..acdf93ae 100644
--- a/releases/weekly/specs/amd64/installcd-stage1.spec
+++ b/releases/weekly/specs/amd64/installcd-stage1.spec
@@ -58,7 +58,6 @@ livecd/packages:
net-misc/rsync
net-misc/vconfig
net-proxy/dante
-#  net-proxy/ntlmaps
net-proxy/tsocks
net-wireless/b43-fwcutter
 ### Masked (~keywords)

diff --git a/releases/weekly/specs/amd64/livecd-stage1.spec 
b/releases/weekly/specs/amd64/livecd-stage1.spec
index d3d187a6..31e773ee 100644
--- a/releases/weekly/specs/amd64/livecd-stage1.spec
+++ b/releases/weekly/specs/amd64/livecd-stage1.spec
@@ -72,7 +72,6 @@ livecd/packages:
net-misc/whois
net-p2p/bittorrent
net-proxy/dante
-#  net-proxy/ntlmaps
net-proxy/tsocks
net-wireless/b43-fwcutter
 ### Masked (~amd64)

diff --git a/releases/weekly/specs/amd64/livedvd-stage1.spec 
b/releases/weekly/specs/amd64/livedvd-stage1.spec
index f23255ab..2d5dd9b6 100644
--- a/releases/weekly/specs/amd64/livedvd-stage1.spec
+++ b/releases/weekly/specs/amd64/livedvd-stage1.spec
@@ -167,7 +167,6 @@ livecd/packages:
net-p2p/limewire
net-print/cups
net-proxy/dante
-#  net-proxy/ntlmaps
net-proxy/tsocks
 ### Masked (~amd64)
 #  net-wireless/aircrack-ng

diff --git a/releases/weekly/specs/hppa/installcd-stage1.spec 
b/releases/weekly/specs/hppa/installcd-stage1.spec
index bfa9b9e3..b027e997 100644
--- a/releases/weekly/specs/hppa/installcd-stage1.spec
+++ b/releases/weekly/specs/hppa/installcd-stage1.spec
@@ -47,7 +47,6 @@ livecd/packages: