Update for kernel 2.6.38-grml[64], featuring LZMA/XZ support - requiring squashfs...

diff --git a/debian/control b/debian/control
index 6d14f7a..92c99c1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.grml.org/?p=grml-live.git
 
 Package: grml-live
 Architecture: all
-Depends: ${misc:Depends}, bc, fai-client (>= 3.4.0), fai-server (>= 3.4.0), mkisofs | genisoimage, mksh, moreutils, squashfs-tools (>= 1:4.1-1), wget
+Depends: ${misc:Depends}, bc, fai-client (>= 3.4.0), fai-server (>= 3.4.0), mkisofs | genisoimage, mksh, moreutils, squashfs-tools (>= 1:4.2-1), wget
 Recommends: grml-live-addons, grml-live-db, ia32-libs
 Suggests: fai-doc
 Description: build system for creating a Grml (based) Linux live system

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 8f7946f..3809075 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -193,7 +193,7 @@ Increase verbosity in the build process.
 
   -z::
 
-Use ZLIB instead of LZMA compression in mksquashfs part of the build process.
+Use ZLIB instead of LZMA/XZ compression in mksquashfs part of the build process.
 
 [[usage-examples]]
 Usage examples
@@ -475,9 +475,9 @@ For further information see next section.
 Current state of grml-live with squashfs-tools and kernel
 ---------------------------------------------------------
 
-Use squashfs-tools >=4.1-1 (available from Grml repositories as well as from
-Debian/experimental) to build Grml (based) ISOs featuring kernel version
-2.6.36-grml[64].
+Use squashfs-tools >=4.2-1 (available from Grml repositories as well as from
+Debian/unstable) to build Grml (based) ISOs featuring kernel version
+2.6.38-grml[64].
 
 ////////////////////////////////////////////////////////////////////////////////
 Difference between squashfs-lzma-tools, squashfs-lzma-tools4 and squashfs-tools

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 3fa6926..a6181e2 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -1621,7 +1621,7 @@ PACKAGES aptitude I386
 
 ## general:
 grml
-linux-tools-2.6.36
+linux-tools-2.6.38
 
 # i386-only software
 athcool
@@ -1637,22 +1637,22 @@ spicctrl
 # use linux-kernel-headers-grml instead of linux-libc-dev?
 # linux-kernel-headers-grml
 
-## current kernel version 2.6.36-grml:
-#fglrx-kernel-2.6.36-grml
-iscsitarget-module-2.6.36-grml
-linux-doc-2.6.36-grml
-linux-headers-2.6.36-grml
-linux-image-2.6.36-grml
-#linux-source-2.6.36-grml
-loop-aes-modules-2.6.36-grml
-ndiswrapper-modules-2.6.36-grml
-#nvidia-kernel-2.6.36-grml
-openafs-modules-2.6.36-grml
-speakup-modules-2.6.36-grml
-sysprof-module-2.6.36-grml
-tp-smapi-modules-2.6.36-grml
-virtualbox-ose-guest-modules-2.6.36-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
-xtables-addons-modules-2.6.36-grml
+## current kernel version 2.6.38-grml:
+#fglrx-kernel-2.6.38-grml
+iscsitarget-module-2.6.38-grml
+linux-doc-2.6.38-grml
+linux-headers-2.6.38-grml
+linux-image-2.6.38-grml
+#linux-source-2.6.38-grml
+loop-aes-modules-2.6.38-grml
+ndiswrapper-modules-2.6.38-grml
+#nvidia-kernel-2.6.38-grml
+openafs-modules-2.6.38-grml
+speakup-modules-2.6.38-grml
+sysprof-module-2.6.38-grml
+tp-smapi-modules-2.6.38-grml
+virtualbox-ose-guest-modules-2.6.38-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+xtables-addons-modules-2.6.38-grml
 ## }}}
 
 ## amd64 specific packages {{{
@@ -1660,24 +1660,24 @@ PACKAGES aptitude AMD64
 
 ## general:
 grml64
-linux-tools-2.6.36
+linux-tools-2.6.38
 
-## current kernel version 2.6.36-grml64:
-#fglrx-kernel-2.6.36-grml64
-iscsitarget-module-2.6.36-grml64
-linux-doc-2.6.36-grml64
-linux-headers-2.6.36-grml64
-linux-image-2.6.36-grml64
-#linux-source-2.6.36-grml
-loop-aes-modules-2.6.36-grml64
-ndiswrapper-modules-2.6.36-grml64
-#nvidia-kernel-2.6.36-grml64
-openafs-modules-2.6.36-grml64
-speakup-modules-2.6.36-grml64
-sysprof-module-2.6.36-grml64
-tp-smapi-modules-2.6.36-grml64
-xtables-addons-modules-2.6.36-grml64
-virtualbox-ose-guest-modules-2.6.36-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+## current kernel version 2.6.38-grml64:
+#fglrx-kernel-2.6.38-grml64
+iscsitarget-module-2.6.38-grml64
+linux-doc-2.6.38-grml64
+linux-headers-2.6.38-grml64
+linux-image-2.6.38-grml64
+#linux-source-2.6.38-grml
+loop-aes-modules-2.6.38-grml64
+ndiswrapper-modules-2.6.38-grml64
+#nvidia-kernel-2.6.38-grml64
+openafs-modules-2.6.38-grml64
+speakup-modules-2.6.38-grml64
+sysprof-module-2.6.38-grml64
+tp-smapi-modules-2.6.38-grml64
+xtables-addons-modules-2.6.38-grml64
+virtualbox-ose-guest-modules-2.6.38-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
 ## }}}
 
 # vim: foldmethod=marker

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index ce1fcef..7c3c7dd 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -193,9 +193,9 @@ PACKAGES aptitude I386
 # we want to use linux-kernel-headers-grml instead of linux-libc-dev:
 linux-kernel-headers-grml
 
-linux-image-2.6.36-grml
+linux-image-2.6.38-grml
 powernowd
-virtualbox-ose-guest-modules-2.6.36-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+virtualbox-ose-guest-modules-2.6.38-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
 
 PACKAGES aptitude AMD64
-linux-image-2.6.36-grml64
+linux-image-2.6.38-grml64

diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 5eab7e3..407187c 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -131,7 +131,7 @@ zoo
 zsh
 
 PACKAGES aptitude I386
-linux-image-2.6.36-grml
+linux-image-2.6.38-grml
 
 PACKAGES aptitude AMD64
-linux-image-2.6.36-grml64
+linux-image-2.6.38-grml64

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 659e22c..2586fd0 100644 (file)
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -105,9 +105,6 @@
 # Specify user with UID 1000 on live-system:
 # USERNAME=grml
 
-# Specify options for Squashfs build stage (running mksquashfs):
-# SQUASHFS_OPTIONS="-nolzma"
-
 # Which bootloader do you want to use? Default: isolinux
 # Supported values: isolinux, grub, grub2
 # BOOT_METHOD='isolinux'
@@ -173,7 +170,7 @@
 # SQUASHFS_BINARY='mksquashfs'
 
 # Options that should be used by mksquashfs during build process.
-# Defaults to '-b 256k' and the according LZMA option.
+# Defaults to '-b 256k' and the according LZMA/XZ option.
 # SQUASHFS_OPTIONS='-b 256k'
 
 # exclude files from compressed squashfs file using the

diff --git a/grml-live b/grml-live
index ff15b56..0669d18 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -59,7 +59,7 @@ Usage: $PN [options, see as follows]
    -u                      update existing chroot instead of rebuilding it from scratch
    -v <version_number>     specify version number of the release
    -V                      increase verbosity in the build process
-   -z                      use ZLIB instead of LZMA compression
+   -z                      use ZLIB instead of LZMA/XZ compression
 
 Usage examples:
 
@@ -322,7 +322,7 @@ if [ -z "$FORCE" ] ; then
    [ -n "$DEFAULT_BOOTOPTIONS" ] && echo "  Adding default bootoptions: \"$DEFAULT_BOOTOPTIONS\""
    [ -n "$FAI_ARGS" ]            && echo "  Additional arguments for FAI: $FAI_ARGS"
    [ -n "$LOGFILE" ]             && echo "  Logging to file:   $LOGFILE"
-   [ -n "$SQUASHFS_ZLIB" ]       && echo "  Using ZLIB (instead of LZMA) compression."
+   [ -n "$SQUASHFS_ZLIB" ]       && echo "  Using ZLIB (instead of LZMA/XZ) compression."
    [ -n "$SQUASHFS_OPTIONS" ]    && echo "  Using SQUASHFS_OPTIONS ${SQUASHFS_OPTIONS}"
    [ -n "$VERBOSE" ]             && echo "  Using VERBOSE mode."
    [ -n "$UPDATE" ]              && echo "  Executing UPDATE instead of fresh installation."
@@ -967,9 +967,9 @@ else
      # use blocksize 256k as this gives best result with regards to time + compression
      SQUASHFS_OPTIONS="-b 256k"
 
-     # set lzma compression by default, unless -z option has been specified on command line
+     # set lzma/xz compression by default, unless -z option has been specified on command line
      if [ -z "$SQUASHFS_ZLIB" ] ; then
-        SQUASHFS_OPTIONS="$SQUASHFS_OPTIONS -comp lzma"
+        SQUASHFS_OPTIONS="$SQUASHFS_OPTIONS -comp xz"
      fi
    fi