From: Michael Prokop Date: Thu, 31 Oct 2019 15:17:48 +0000 (+0100) Subject: SW: use Debian kernel packages instead of our custom Grml ones X-Git-Tag: v0.34.4~8 X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=4ad251e65d40f3a73d213a0aae5954ab3f0db93a SW: use Debian kernel packages instead of our custom Grml ones Maintaining and keeping our linux-image-i386-grml + linux-image-amd64-grml packages requires manpower we currently don't really have. Instead let's see whether switching to the kernel packages provided by Debian fits our needs. (This might not be the case if we need different configuration options, defaults, extra patches or the release cycle doesn't fit for us, but it's worth a try, so let's find out.) See https://github.com/grml/grml/issues/139 --- diff --git a/docs/grml-live.txt b/docs/grml-live.txt index 5733323..455889f 100644 --- a/docs/grml-live.txt +++ b/docs/grml-live.txt @@ -348,12 +348,11 @@ ISO size. defining a Grml system. Important parts of the buildprocess are specified in this class as well, so unless you have a really good reason you should always use this class. Please be aware that using *just* the GRMLBASE class won't be -enough, because the kernel packages (e.g. linux-image-i386-grml + -linux-image-amd64-grml) are chosen in further GRML_* classes (to provide maximum -flexibility with kernel selection). If you don't want to use the existing -GRML_FULL or GRML_SMALL classes, define your own CLASS file choosing the kernel -package you want to use (and don't forget to include your CLASS in the arguments -of grml-live's -c... command line option). +enough, because the kernel packages (e.g. linux-image-*) are chosen in further +GRML_* classes (to provide maximum flexibility with kernel selection). If you +don't want to use the existing GRML_FULL or GRML_SMALL classes, define your own +CLASS file choosing the kernel package you want to use (and don't forget to +include your CLASS in the arguments of grml-live's -c... command line option). * GRML_FULL: full featured Grml, also known as the "normal", full grml as introduced in December 2011 (~600MB ISO size). diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL index cf2c8f7..abe9224 100644 --- a/etc/grml/fai/config/package_config/GRML_FULL +++ b/etc/grml/fai/config/package_config/GRML_FULL @@ -342,9 +342,9 @@ stress man-db PACKAGES install I386 -linux-image-i386-grml +linux-image-686 linux-cpupower PACKAGES install AMD64 -linux-image-amd64-grml +linux-image-amd64 linux-cpupower diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL index 8793000..96dc42b 100644 --- a/etc/grml/fai/config/package_config/GRML_SMALL +++ b/etc/grml/fai/config/package_config/GRML_SMALL @@ -99,7 +99,7 @@ zip zsh PACKAGES install I386 -linux-image-i386-grml +linux-image-686 PACKAGES install AMD64 -linux-image-amd64-grml +linux-image-amd64