Update to kernel 2.6.26-grml[64]

diff --git a/debian/changelog b/debian/changelog
index 02b8703..3aeb4f9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 grml-live (0.9) unstable; urgency=low
 
+  * Update to kernel 2.6.26-grml[64].
   * Drop sysutils from package lists.
   * Add ext3grep to GRML_FULL.
   * Integrate /etc/grml/fai/config/package_config/GRML_FORENSIC.
@@ -27,8 +28,9 @@ grml-live (0.9) unstable; urgency=low
   * Improve usage information screen.
   * Display progress of squashfs, when building via a buildsystem
     just set -no-progress in $SQUASHFS_OPTIONS instead.
+  * Use linux-kernel-headers-grml in grml-medium.
 
- -- Michael Prokop <mika@grml.org>  Sun, 17 Aug 2008 23:51:19 +0200
+ -- Michael Prokop <mika@grml.org>  Mon, 18 Aug 2008 00:03:14 +0200
 
 grml-live (0.8) unstable; urgency=low
 

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 9290935..ff6499a 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -2083,48 +2083,45 @@ grml-files
 # we want to use linux-kernel-headers-grml instead of linux-libc-dev:
 linux-kernel-headers-grml
 
-## current kernel version 2.6.23-grml:
-acx100-2.6.23-grml
-at76-usb-modules-2.6.23-grml
-atl2-modules-2.6.23-grml
-aufs-modules-2.6.23-grml
-bcm5700-module-2.6.23-grml
-drbd8-2.6.23-grml
-exmap-modules-2.6.23-grml
-#fglrx-kernel-2.6.23-grml
-grml-kerneladdons-2.6.23
-gspca-modules-2.6.23-grml
-ipw3945-modules-2.6.23-grml
-iscsitarget-module-2.6.23-grml
-ivtv-modules-2.6.23-grml
-kqemu-modules-2.6.23-grml
-linux-doc-2.6.23-grml
-linux-headers-2.6.23-grml
-linux-image-2.6.23-grml
-#linux-source-2.6.23-grml
-linux-wlan-ng-modules-2.6.23-grml
-loop-aes-modules-2.6.23-grml
-lzma-modules-2.6.23-grml
-madwifi-modules-2.6.23-grml
-ndiswrapper-modules-2.6.23-grml
-nozomi-modules-2.6.23-grml
-#nvidia-kernel-2.6.23-grml
-openafs-modules-2.6.23-grml
-#open-vm-modules-2.6.23-grml
-qc-usb-modules-2.6.23-grml
-r6040-modules-2.6.23-grml
-realtime-lsm-module-2.6.23-grml
-rt2400-modules-2.6.23-grml
-rt2500-modules-2.6.23-grml
-rt73-module-2.6.23-grml
-sl-modem-modules-2.6.23-grml
-squashfs-modules-2.6.23-grml
-sysprof-module-2.6.23-grml
-tp-smapi-modules-2.6.23-grml
-truecrypt-2.6.23-grml
-#virtualbox-ose-modules-2.6.23-grml
-virtualbox-ose-guest-modules-2.6.23-grml virtualbox-ose-guest-utils
-#zaptel-modules-2.6.23-grml
+## current kernel version 2.6.26-grml:
+acx100-2.6.26-grml
+at76-usb-modules-2.6.26-grml
+atl2-modules-2.6.26-grml
+aufs-modules-2.6.26-grml
+drbd8-2.6.26-grml
+exmap-modules-2.6.26-grml
+#fglrx-kernel-2.6.26-grml
+grml-kerneladdons-2.6.26
+gspca-modules-2.6.26-grml
+iscsitarget-module-2.6.26-grml
+ivtv-modules-2.6.26-grml
+kqemu-modules-2.6.26-grml
+linux-doc-2.6.26-grml
+linux-headers-2.6.26-grml
+linux-image-2.6.26-grml
+#linux-source-2.6.26-grml
+linux-uvc-modules-2.6.26-grml
+linux-wlan-ng-modules-2.6.26-grml
+loop-aes-modules-2.6.26-grml
+lzma-modules-2.6.26-grml
+madwifi-modules-2.6.26-grml
+ndiswrapper-modules-2.6.26-grml
+#nvidia-kernel-2.6.26-grml
+openafs-modules-2.6.26-grml
+#open-vm-modules-2.6.26-grml
+qc-usb-modules-2.6.26-grml
+rt2400-modules-2.6.26-grml
+rt2500-modules-2.6.26-grml
+rt73-modules-2.6.26-grml
+sl-modem-modules-2.6.26-grml
+speakup-modules-2.6.26-grml
+squashfs-modules-2.6.26-grml
+sysprof-module-2.6.26-grml
+tp-smapi-modules-2.6.26-grml
+truecrypt-2.6.26-grml
+virtualbox-ose-guest-modules-2.6.26-grml virtualbox-ose-guest-utils
+#virtualbox-ose-modules-2.6.26-grml
+#zaptel-modules-2.6.26-grml
 ## }}}
 
 ## amd64 specific packages {{{
@@ -2134,36 +2131,32 @@ PACKAGES aptitude AMD64
 grml64
 grml-files64
 
-## current kernel version 2.6.23-grml64:
-acx100-2.6.23-grml64
-at76-usb-modules-2.6.23-grml64
-atl2-modules-2.6.23-grml64
-aufs-modules-2.6.23-grml64
-drbd8-2.6.23-grml64
-exmap-modules-2.6.23-grml64
-# grml64-kerneladdons-2.6.23
-gspca-modules-2.6.23-grml64
-ipw3945-modules-2.6.23-grml64
-ivtv-modules-2.6.23-grml64
-kqemu-modules-2.6.23-grml64
-linux-doc-2.6.23-grml64
-linux-headers-2.6.23-grml64
-linux-image-2.6.23-grml64
-#linux-source-2.6.23-grml
-linux-uvc-modules-2.6.23-grml
-loop-aes-modules-2.6.23-grml64
-lzma-modules-2.6.23-grml64
-madwifi-modules-2.6.23-grml64
-ndiswrapper-modules-2.6.23-grml64
-nozomi-modules-2.6.23-grml64
-openafs-modules-2.6.23-grml64
-qc-usb-modules-2.6.23-grml64
-realtime-lsm-module-2.6.23-grml64
-rt2400-modules-2.6.23-grml64
-rt2500-modules-2.6.23-grml64
-squashfs-modules-2.6.23-grml64
-sysprof-module-2.6.23-grml64
-truecrypt-2.6.23-grml64
+## current kernel version 2.6.26-grml64:
+acx100-2.6.26-grml64
+at76-usb-modules-2.6.26-grml64
+atl2-modules-2.6.26-grml64
+aufs-modules-2.6.26-grml64
+drbd8-2.6.26-grml64
+exmap-modules-2.6.26-grml64
+# grml64-kerneladdons-2.6.26
+gspca-modules-2.6.26-grml64
+ivtv-modules-2.6.26-grml64
+kqemu-modules-2.6.26-grml64
+linux-doc-2.6.26-grml64
+linux-headers-2.6.26-grml64
+linux-image-2.6.26-grml64
+#linux-source-2.6.26-grml
+loop-aes-modules-2.6.26-grml64
+lzma-modules-2.6.26-grml64
+madwifi-modules-2.6.26-grml64
+ndiswrapper-modules-2.6.26-grml64
+openafs-modules-2.6.26-grml64
+qc-usb-modules-2.6.26-grml64
+rt2400-modules-2.6.26-grml64
+rt2500-modules-2.6.26-grml64
+squashfs-modules-2.6.26-grml64
+sysprof-module-2.6.26-grml64
+truecrypt-2.6.26-grml64
 ## }}}
 
 # vim: foldmethod=marker

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index dce2d99..5f2f882 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -283,25 +283,28 @@ zip
 zsh
 
 PACKAGES aptitude I386 
-at76-usb-modules-2.6.23-grml
-atl2-modules-2.6.23-grml
-atl2-modules-2.6.23-grml
-aufs-modules-2.6.23-grml
-grml-kerneladdons-2.6.23
-linux-image-2.6.23-grml
-lzma-modules-2.6.23-grml
-madwifi-modules-2.6.23-grml madwifi-tools
+
+# we want to use linux-kernel-headers-grml instead of linux-libc-dev:
+linux-kernel-headers-grml
+
+at76-usb-modules-2.6.26-grml
+atl2-modules-2.6.26-grml
+aufs-modules-2.6.26-grml
+#grml-kerneladdons-2.6.26
+linux-image-2.6.26-grml
+lzma-modules-2.6.26-grml
+madwifi-modules-2.6.26-grml madwifi-tools
 powernowd
-rt2400-modules-2.6.23-grml rt2500-modules-2.6.23-grml rt73-module-2.6.23-grml firmware-ralink
-squashfs-modules-2.6.23-grml
-truecrypt-2.6.23-grml
+rt2400-modules-2.6.26-grml rt2500-modules-2.6.26-grml rt73-module-2.6.26-grml firmware-ralink
+squashfs-modules-2.6.26-grml
+#truecrypt-2.6.26-grml
 virtualbox-ose-guest-utils
 
 PACKAGES aptitude AMD64
-atl2-modules-2.6.23-grml64
-aufs-modules-2.6.23-grml64
-linux-image-2.6.23-grml64
-lzma-modules-2.6.23-grml64
-madwifi-modules-2.6.23-grml64 madwifi-tools
-squashfs-modules-2.6.23-grml64
-truecrypt-2.6.23-grml64
+atl2-modules-2.6.26-grml64
+aufs-modules-2.6.26-grml64
+linux-image-2.6.26-grml64
+lzma-modules-2.6.26-grml64
+madwifi-modules-2.6.26-grml64 madwifi-tools
+squashfs-modules-2.6.26-grml64
+truecrypt-2.6.26-grml64

diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 7ee85d7..dc31313 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -191,4 +191,4 @@ PACKAGES aptitude I386
 linux-image-2.6.20-grml-small aufs-modules-2.6.20-grml-small
 
 PACKAGES aptitude AMD64
-linux-image-2.6.23-grml64 aufs-modules-2.6.23-grml64
+linux-image-2.6.26-grml64 aufs-modules-2.6.26-grml64 squashfs-modules-2.6.26-grml64 lzma-modules-2.6.26-grml64