SW: Move firmware packages to GRMLBASE

We want to have the firmware packages on all Grml based ISOs.

List based on output generated via:

  ( echo -e '\n# firmware packages' ;  apt-cache search firmware | \
    awk '$1 ~/(^firmware|firmware$|firmware-linux-free|firmware-linux-nonfree$)/{print $1}' | \
    egrep -v '(midisport|wlan-ng|installer|crystal|ivtv)' | sort ) >> GRMLBASE

Signed-off-by: Michael Prokop <mika@grml.org>

diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE
index 8a4c970..c806957 100644 (file)
--- a/etc/grml/fai/config/package_config/GRMLBASE
+++ b/etc/grml/fai/config/package_config/GRMLBASE
@@ -52,3 +52,25 @@ uuid-runtime
 vlock
 wireless-tools
 wpasupplicant
+
+# firmware packages
+atmel-firmware
+bluez-firmware
+firmware-atheros
+firmware-bnx2
+firmware-bnx2x
+firmware-brcm80211
+firmware-intelwimax
+firmware-ipw2x00
+firmware-iwlwifi
+firmware-libertas
+firmware-linux
+firmware-linux-free
+firmware-linux-nonfree
+firmware-myricom
+firmware-netxen
+firmware-qlogic
+firmware-ralink
+firmware-realtek
+libertas-firmware
+zd1211-firmware

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index e92e83c..29fded9 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -156,15 +156,6 @@ comgt
 dnsmasq
 ethstatus
 ethtool
-firmware-bnx2
-firmware-bnx2x
-firmware-brcm80211
-firmware-iwlwifi
-firmware-myricom
-firmware-netxen
-firmware-qlogic
-firmware-ralink
-firmware-realtek
 hostapd
 ifenslave-2.6
 iftop
@@ -331,10 +322,6 @@ lshw
 numactl
 usbview
 
-# kernels
-firmware-linux-free
-firmware-linux-nonfree
-
 PACKAGES aptitude I386
 linux-image-i386-grml
 

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index a9c3750..98a1c4c 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -45,10 +45,6 @@ ed
 eterm
 ethtool
 findutils
-firmware-brcm80211
-firmware-iwlwifi
-firmware-ralink
-firmware-realtek
 fluxbox
 fuse
 gddrescue

diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 5e1d579..bd334f9 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -24,8 +24,6 @@ e2fsprogs
 ed
 ethtool
 findutils
-firmware-bnx2
-firmware-bnx2x
 gddrescue
 grml-paste
 grml-quickconfig-standard

diff --git a/etc/grml/fai/config/package_config/GRML_XL b/etc/grml/fai/config/package_config/GRML_XL
index d75adef..6ffaf0f 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_XL
+++ b/etc/grml/fai/config/package_config/GRML_XL
@@ -1425,20 +1425,12 @@ zzuf
 
 ## non-free {{{
 agrep
-atmel-firmware
-bluez-firmware
-firmware-brcm80211
-firmware-iwlwifi
-firmware-qlogic
-firmware-ralink
-firmware-realtek
 iozone3
 lha
 manpages-posix
 netperf
 python-profiler
 unrar
-zd1211-firmware
 ## }}}
 
 ## kernel-version dependent packages {{{