# HG changeset patch # User Pascal Bellard # Date 1296839335 -3600 # Node ID ff1a7dcc34bf5e35d05509e826658a7b70203350 # Parent 400f1eeafa97f1fb32a88f0c0e1ee80e64caf19b kernel: no more /proc/config.gz diff -r 400f1eeafa97 -r ff1a7dcc34bf kernel-isa/receipt --- a/kernel-isa/receipt Thu Feb 03 11:46:35 2011 +0100 +++ b/kernel-isa/receipt Fri Feb 04 18:08:55 2011 +0100 @@ -15,5 +15,6 @@ cp -a $WOK/kernel-modular/linux-$VERSION/$PACKAGE $fs/boot/bzImage cp -a $WOK/kernel-modular/linux-$VERSION/System.map-${PACKAGE#kernel-} $fs/boot/System.map cp -a $WOK/kernel-modular/linux-$VERSION/config-${PACKAGE#kernel-} $fs/boot/config + cp -a $_pkg/../config-busybox $fs/boot/config } diff -r 400f1eeafa97 -r ff1a7dcc34bf kernel-lguest/receipt --- a/kernel-lguest/receipt Thu Feb 03 11:46:35 2011 +0100 +++ b/kernel-lguest/receipt Fri Feb 04 18:08:55 2011 +0100 @@ -15,4 +15,5 @@ cp -a $WOK/kernel-modular/linux-$VERSION/$PACKAGE $fs/boot/bzImage cp -a $WOK/kernel-modular/linux-$VERSION/System.map-${PACKAGE#kernel-} $fs/boot/System.map cp -a $WOK/kernel-modular/linux-$VERSION/config-${PACKAGE#kernel-} $fs/boot/config + cp -a $_pkg/../config-busybox $fs/boot/config } diff -r 400f1eeafa97 -r ff1a7dcc34bf kernel-modular/receipt --- a/kernel-modular/receipt Thu Feb 03 11:46:35 2011 +0100 +++ b/kernel-modular/receipt Fri Feb 04 18:08:55 2011 +0100 @@ -23,6 +23,7 @@ tazwok cook busybox fi cp $WOK/busybox/busybox*/rootfs.cpio $src + cp $WOK/busybox/busybox*/.config $src/config-busybox # this is code to help update the kernel version faster #for i in $(grep -l 'WANTED="linux"' $WOK/*/receipt) @@ -124,6 +125,7 @@ cp -a $_pkg/../$PACKAGE $fs/boot/bzImage cp -a $_pkg/../System.map-${PACKAGE#kernel-} $fs/boot/System.map cp -a $_pkg/../config-${PACKAGE#kernel-} $fs/boot/config + cp -a $_pkg/../config-busybox $fs/boot/config # Compress all modules. #./stuff/gztazmod.sh $_pkg/lib/modules/$VERSION-slitaz } diff -r 400f1eeafa97 -r ff1a7dcc34bf kernel-modular/stuff/linux-2.6.37-slitaz.config-i486-isa --- a/kernel-modular/stuff/linux-2.6.37-slitaz.config-i486-isa Thu Feb 03 11:46:35 2011 +0100 +++ b/kernel-modular/stuff/linux-2.6.37-slitaz.config-i486-isa Fri Feb 04 18:08:55 2011 +0100 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/i386 2.6.37 Kernel Configuration -# Sun Jan 30 23:08:13 2011 +# Fri Feb 4 17:59:29 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -99,8 +99,7 @@ CONFIG_TINY_RCU=y # CONFIG_PREEMPT_RCU is not set # CONFIG_TREE_RCU_TRACE is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y +# CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=12 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y # CONFIG_NAMESPACES is not set @@ -109,7 +108,7 @@ CONFIG_INITRAMFS_SOURCE="rootfs.cpio" CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 -CONFIG_RD_GZIP=y +# CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set CONFIG_RD_LZMA=y # CONFIG_RD_LZO is not set @@ -915,7 +914,6 @@ CONFIG_ZLIB_DEFLATE=y # CONFIG_XZ_DEC is not set # CONFIG_XZ_DEC_BCJ is not set -CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_LZMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y diff -r 400f1eeafa97 -r ff1a7dcc34bf kernel-modular/stuff/linux-2.6.37-slitaz.config-i486-lguest --- a/kernel-modular/stuff/linux-2.6.37-slitaz.config-i486-lguest Thu Feb 03 11:46:35 2011 +0100 +++ b/kernel-modular/stuff/linux-2.6.37-slitaz.config-i486-lguest Fri Feb 04 18:08:55 2011 +0100 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/i386 2.6.37 Kernel Configuration -# Sun Jan 30 23:06:32 2011 +# Fri Feb 4 18:01:17 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -99,8 +99,7 @@ CONFIG_TINY_RCU=y # CONFIG_PREEMPT_RCU is not set # CONFIG_TREE_RCU_TRACE is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y +# CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=12 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y # CONFIG_NAMESPACES is not set @@ -109,7 +108,7 @@ CONFIG_INITRAMFS_SOURCE="rootfs.cpio" CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 -CONFIG_RD_GZIP=y +# CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set CONFIG_RD_LZMA=y # CONFIG_RD_LZO is not set @@ -847,10 +846,8 @@ CONFIG_CRC32=y # CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set -CONFIG_ZLIB_INFLATE=y # CONFIG_XZ_DEC is not set # CONFIG_XZ_DEC_BCJ is not set -CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_LZMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y diff -r 400f1eeafa97 -r ff1a7dcc34bf kernel-modular/stuff/linux-2.6.37-slitaz.config-i486-modular --- a/kernel-modular/stuff/linux-2.6.37-slitaz.config-i486-modular Thu Feb 03 11:46:35 2011 +0100 +++ b/kernel-modular/stuff/linux-2.6.37-slitaz.config-i486-modular Fri Feb 04 18:08:55 2011 +0100 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/i386 2.6.37 Kernel Configuration -# Mon Jan 31 15:19:41 2011 +# Fri Feb 4 17:57:18 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -100,8 +100,7 @@ CONFIG_TINY_RCU=y # CONFIG_PREEMPT_RCU is not set # CONFIG_TREE_RCU_TRACE is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y +# CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=12 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y # CONFIG_CGROUPS is not set @@ -112,7 +111,7 @@ CONFIG_INITRAMFS_SOURCE="rootfs.cpio" CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 -CONFIG_RD_GZIP=y +# CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set CONFIG_RD_LZMA=y # CONFIG_RD_LZO is not set @@ -4713,13 +4712,12 @@ CONFIG_CRC32=y CONFIG_CRC7=m CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m CONFIG_LZO_COMPRESS=m CONFIG_LZO_DECOMPRESS=m # CONFIG_XZ_DEC is not set # CONFIG_XZ_DEC_BCJ is not set -CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_LZMA=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m