From 5eeadc8d26da940a20adfe1c6fa9c325fc08b293 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Mon, 6 Feb 2012 10:00:09 +0000 Subject: [PATCH] Ensure default for new initramfs compression is used. Signed-off-by: Robin H. Johnson --- ChangeLog | 7 +++++++ arch/alpha/config.sh | 1 + arch/arm/config.sh | 1 + arch/ia64/config.sh | 1 + arch/mips/config.sh | 3 ++- arch/parisc/config.sh | 1 + arch/parisc64/config.sh | 1 + arch/ppc/config.sh | 1 + arch/ppc64/config.sh | 1 + arch/sparc/config.sh | 1 + arch/sparc64/config.sh | 1 + arch/um/config.sh | 1 + arch/x86/config.sh | 1 + arch/x86_64/config.sh | 1 + 14 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c0a09cb..9f52685 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,13 @@ # Distributed under the GPL v2 # $Id$ + 06 Feb 2012; Robin H. Johnson arch/alpha/config.sh, + arch/arm/config.sh, arch/ia64/config.sh, arch/mips/config.sh, + arch/parisc/config.sh, arch/parisc64/config.sh, arch/ppc/config.sh, + arch/ppc64/config.sh, arch/sparc/config.sh, arch/sparc64/config.sh, + arch/um/config.sh, arch/x86/config.sh, arch/x86_64/config.sh: + Ensure default for new initramfs compression is used. + 06 Feb 2012; Robin H. Johnson gen_initramfs.sh: Bugfixes in new code branches that I didn't test fully. diff --git a/arch/alpha/config.sh b/arch/alpha/config.sh index 2692f23..68805fd 100755 --- a/arch/alpha/config.sh +++ b/arch/alpha/config.sh @@ -11,6 +11,7 @@ KERNEL_BINARY="arch/alpha/boot/vmlinux.gz" # command line. # DEFAULT_COMPRESS_INITRD=yes +DEFAULT_COMPRESS_INITRD_TYPE=best DEFAULT_MAKEOPTS="-j2" diff --git a/arch/arm/config.sh b/arch/arm/config.sh index 7ce427e..240a027 100755 --- a/arch/arm/config.sh +++ b/arch/arm/config.sh @@ -11,6 +11,7 @@ KERNEL_BINARY="arch/arm/boot/zImage" # command line. # DEFAULT_COMPRESS_INITRD=yes +DEFAULT_COMPRESS_INITRD_TYPE=best DEFAULT_MAKEOPTS="-j2" diff --git a/arch/ia64/config.sh b/arch/ia64/config.sh index 9b61bce..3e9fd84 100755 --- a/arch/ia64/config.sh +++ b/arch/ia64/config.sh @@ -11,6 +11,7 @@ KERNEL_BINARY="vmlinux.gz" # command line. # DEFAULT_COMPRESS_INITRD=yes +DEFAULT_COMPRESS_INITRD_TYPE=best DEFAULT_MAKEOPTS="-j2" diff --git a/arch/mips/config.sh b/arch/mips/config.sh index 939fb96..49b4050 100755 --- a/arch/mips/config.sh +++ b/arch/mips/config.sh @@ -21,7 +21,8 @@ CMD_INSTALL=0 # Arch-specific defaults that can be overridden in the config file or on the # command line. # -DEFAULT_COMPRESS_INITRD="yes" +DEFAULT_COMPRESS_INITRD=yes +DEFAULT_COMPRESS_INITRD_TYPE=best DEFAULT_KERNEL_MAKE=make DEFAULT_UTILS_MAKE=make DEFAULT_UTILS_CC=gcc diff --git a/arch/parisc/config.sh b/arch/parisc/config.sh index c31b316..e74e1a3 100755 --- a/arch/parisc/config.sh +++ b/arch/parisc/config.sh @@ -11,6 +11,7 @@ KERNEL_BINARY="vmlinux" # command line. # DEFAULT_COMPRESS_INITRD=yes +DEFAULT_COMPRESS_INITRD_TYPE=best DEFAULT_MAKEOPTS="-j2" diff --git a/arch/parisc64/config.sh b/arch/parisc64/config.sh index c31b316..e74e1a3 100755 --- a/arch/parisc64/config.sh +++ b/arch/parisc64/config.sh @@ -11,6 +11,7 @@ KERNEL_BINARY="vmlinux" # command line. # DEFAULT_COMPRESS_INITRD=yes +DEFAULT_COMPRESS_INITRD_TYPE=best DEFAULT_MAKEOPTS="-j2" diff --git a/arch/ppc/config.sh b/arch/ppc/config.sh index e661c5a..c40ba0f 100755 --- a/arch/ppc/config.sh +++ b/arch/ppc/config.sh @@ -10,6 +10,7 @@ KERNEL_BINARY="vmlinux" # command line. # DEFAULT_COMPRESS_INITRD=yes +DEFAULT_COMPRESS_INITRD_TYPE=best DEFAULT_MAKEOPTS="-j2" diff --git a/arch/ppc64/config.sh b/arch/ppc64/config.sh index e661c5a..c40ba0f 100755 --- a/arch/ppc64/config.sh +++ b/arch/ppc64/config.sh @@ -10,6 +10,7 @@ KERNEL_BINARY="vmlinux" # command line. # DEFAULT_COMPRESS_INITRD=yes +DEFAULT_COMPRESS_INITRD_TYPE=best DEFAULT_MAKEOPTS="-j2" diff --git a/arch/sparc/config.sh b/arch/sparc/config.sh index 3d62347..fc87def 100755 --- a/arch/sparc/config.sh +++ b/arch/sparc/config.sh @@ -13,6 +13,7 @@ USECOLOR="no" # command line. # DEFAULT_COMPRESS_INITRD=yes +DEFAULT_COMPRESS_INITRD_TYPE=best DEFAULT_MAKEOPTS="-j1" diff --git a/arch/sparc64/config.sh b/arch/sparc64/config.sh index 563ebd9..618a0ab 100755 --- a/arch/sparc64/config.sh +++ b/arch/sparc64/config.sh @@ -13,6 +13,7 @@ USECOLOR="no" # command line. # DEFAULT_COMPRESS_INITRD=yes +DEFAULT_COMPRESS_INITRD_TYPE=best DEFAULT_MAKEOPTS="-j2" diff --git a/arch/um/config.sh b/arch/um/config.sh index 7955a85..2abe935 100755 --- a/arch/um/config.sh +++ b/arch/um/config.sh @@ -13,6 +13,7 @@ ARCH_HAVENOPREPARE=yes # command line. # DEFAULT_COMPRESS_INITRD=yes +DEFAULT_COMPRESS_INITRD_TYPE=best DEFAULT_MAKEOPTS="-j2" diff --git a/arch/x86/config.sh b/arch/x86/config.sh index 6f14cef..d34afb2 100755 --- a/arch/x86/config.sh +++ b/arch/x86/config.sh @@ -11,6 +11,7 @@ KERNEL_BINARY="arch/i386/boot/bzImage" # command line. # DEFAULT_COMPRESS_INITRD=yes +DEFAULT_COMPRESS_INITRD_TYPE=best DEFAULT_MAKEOPTS="-j2" diff --git a/arch/x86_64/config.sh b/arch/x86_64/config.sh index 0a903e1..78b9167 100755 --- a/arch/x86_64/config.sh +++ b/arch/x86_64/config.sh @@ -11,6 +11,7 @@ KERNEL_BINARY="arch/x86_64/boot/bzImage" # command line. # DEFAULT_COMPRESS_INITRD=yes +DEFAULT_COMPRESS_INITRD_TYPE=best DEFAULT_MAKEOPTS="-j2" -- 2.26.2