Reapplied LZMA compression of kernel image and initramfs (not working).

diff --git a/config/kernel/kernel.config b/config/kernel/kernel.config
index c7b44609a126aa91a0565fbec168ff764fb45bbd..c0c85404950fb8e612dfc593beb8efb4c4590fa5 100644 (file)
--- a/config/kernel/kernel.config
+++ b/config/kernel/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.24-ipfire1
-# Sat Mar 22 10:19:51 2008
+# Sat Apr  5 23:42:13 2008
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -62,7 +62,7 @@ CONFIG_POSIX_MQUEUE=y
 # CONFIG_PID_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
+# CONFIG_IKCONFIG_PROC is not set
 CONFIG_LOG_BUF_SHIFT=18
 # CONFIG_CGROUPS is not set
 CONFIG_FAIR_GROUP_SCHED=y
@@ -71,11 +71,10 @@ CONFIG_FAIR_USER_SCHED=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_LZMA_INITRD=y
-# CONFIG_LZMA_INITRD_KMALLOC_ONLY is not set
+# CONFIG_LZMA_INITRD is not set
 CONFIG_LZMA_INITRAM_FS=y
-# CONFIG_LZMA_INITRAM_FS_SMALLMEM is not set
-# CONFIG_LZMA_INITRAM_FS_KMALLOC_ONLY is not set
+CONFIG_LZMA_INITRAM_FS_SMALLMEM=y
+CONFIG_LZMA_INITRAM_FS_KMALLOC_ONLY=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y

diff --git a/lfs/cdrom b/lfs/cdrom
index dfa3e92e2bfa559ac11aaf16851672137345097b..0c8d3986e65a7df1db7ba0e060c166ce34275abf 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -51,22 +51,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        find $(DIR_SOURCE)/rootfiles/core -maxdepth 1 -type f | xargs cat | \
                grep -v ^# | sed -e "s/KVER/$(KVER)/g" | sort | uniq > $(CDROM_DIR)/archive.files
        
-       wc -l < $(CDROM_DIR)/archive.files > $(CDROM_DIR)/numberof.files
-       
        cd / && cpio -o -H newc < $(CDROM_DIR)/archive.files \
                > $(CDROM_DIR)/$(SNAME)-$(VERSION).img.tmp 2>$(CDROM_DIR)/archive.errors
-
+       
        @cat $(CDROM_DIR)/archive.errors
        @if grep -q "No such file or directory" < $(CDROM_DIR)/archive.errors; then \
                exit 1; \
        fi
        
-       lzma -fcz $(CDROM_DIR)/$(SNAME)-$(VERSION).img.tmp > \
-                                               $(CDROM_DIR)/$(SNAME)-$(VERSION).img
+       lzma_sdk e $(CDROM_DIR)/$(SNAME)-$(VERSION).img.tmp \
+                                                $(CDROM_DIR)/$(SNAME)-$(VERSION).img
        
        # These files won't be included in the iso
        @rm -f $(CDROM_DIR)/archive.{files,errors} $(CDROM_DIR)/$(SNAME)-$(VERSION).img.tmp
-
+       
        # Other files
        sed 's/VERSION/$(VERSION)/' $(DIR_CONF)/cdrom/README.txt > $(CDROM_DIR)/README
        cp -vf $(DIR_SRC)/doc/COPYING                                                           $(CDROM_DIR)
@@ -93,5 +91,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                -boot-info-table . > $(IMAGES_DIR)/$(SNAME)-$(VERSION).$(MACHINE).iso
        
        @rm -rf $(CDROM_DIR)/* $(CDROM_DIR)/.$(SNAME)info
-
+       
        ### REBUILD THIS AT EVERY PASS

diff --git a/lfs/initramfs b/lfs/initramfs
index e61a9fe842fb57053d0521c4c34dcbe158edea27..dd77a4a8e6ef2ef34bb335584b7d174590bb9016 100644 (file)
--- a/lfs/initramfs
+++ b/lfs/initramfs
@@ -175,7 +175,9 @@ $(TARGET) :
        ### compressing everything
        #
        -find $(INSTALLER_DIR) -name .svn -exec rm -rf {} \;
-       cd $(INSTALLER_DIR) && find . | cpio -o -H newc | lzma e -si -so > \
+       cd $(INSTALLER_DIR) && find . | cpio -o -H newc | gzip -9 > \
        /images/initramfs-$(VERSION).img
-               
+       
+       #| lzma_sdk e -d16 -si -so
+       
        @$(POSTBUILD)

diff --git a/lfs/linux b/lfs/linux
index de371cd53f5c77074e371d9690272c5a810a2b3b..478dbebb28b937859d2bf231c4b5ae376a0402cd 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -42,8 +42,11 @@ EXTRAVERSION = $(shell echo "$(FULLVER)" | cut -c 7-)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) reiser4-for-$(VER).patch $(THISAPP)-lzma-init-ia32.patch \
-                                       $(THISAPP)-lzma-vmlinuz-x86.patch
+objects = $(DL_FILE) reiser4-for-$(VER).patch \
+       $(THISAPP)-lzma-init-3.patch \
+       $(THISAPP)-lzma-init-sdk-3.patch \
+       $(THISAPP)-lzma-vmlinuz-x86-3.patch \
+       $(THISAPP)-lzma-vmlinuz-x86-sdk-3.patch
 
 install : $(TARGET)
 
@@ -66,8 +69,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        
        ### LZMA
        #
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-lzma-init-ia32.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-lzma-vmlinuz-x86.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-lzma-init-3.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-lzma-init-sdk-3.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-lzma-vmlinuz-x86-3.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-lzma-vmlinuz-x86-sdk-3.patch
 
 ifeq "$(STAGE)" "toolchain"
        install -dv $(TOOLS_DIR)/include

diff --git a/lfs/lzma b/lfs/lzma
index 4c847844bb1a5abf0ae6380311bcf065bc7ffcc9..acc2eafb1437c84b2d7d23bb4f8c8b5a3d611cdc 100644 (file)
--- a/lfs/lzma
+++ b/lfs/lzma
@@ -25,10 +25,10 @@
 include Config
 
 PKG_NAME   = lzma
-VER        = 4.32.5
+VER        = 457
 
-THISAPP    = $(PKG_NAME)-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = $(PKG_NAME)$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -52,11 +52,15 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_SRC)/$(THISAPP) && mkdir $(DIR_SRC)/$(THISAPP)
+       @cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) -C $(THISAPP)
        
-       cd $(DIR_APP) && ./configure --prefix=/usr
-       cd $(DIR_APP) && make -j $(PARALLELISM)
-       cd $(DIR_APP) && make install
+       cd $(DIR_APP) && make -C CPP/7zip/Compress/LZMA_Alone \
+               -f makefile.gcc -j $(PARALLELISM) CXX="g++ $(CXXFLAGS)" CXX_C="gcc $(CFLAGS)"
+       
+       install -m 755 \
+               $(DIR_APP)/CPP/7zip/Compress/LZMA_Alone/lzma \
+               /usr/bin/lzma_sdk
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/rootfiles/core/lzma b/src/rootfiles/core/lzma
index e326bfdbae3812b66b5f55bd9b1b53c49f94e25e..82e17524c5b868048df4379ecfe5cf53ee2e1cd6 100644 (file)
--- a/src/rootfiles/core/lzma
+++ b/src/rootfiles/core/lzma
@@ -1,30 +1 @@
-usr/bin/lzcat
-#usr/bin/lzcmp
-#usr/bin/lzdiff
-#usr/bin/lzegrep
-#usr/bin/lzfgrep
-#usr/bin/lzgrep
-#usr/bin/lzless
-usr/bin/lzma
-usr/bin/lzmadec
-usr/bin/lzmainfo
-#usr/bin/lzmore
-usr/bin/unlzma
-#usr/include/lzmadec.h
-#usr/lib/liblzmadec.a
-#usr/lib/liblzmadec.la
-usr/lib/liblzmadec.so
-usr/lib/liblzmadec.so.0
-usr/lib/liblzmadec.so.0.0.0
-#usr/share/man/man1/lzcat.1
-#usr/share/man/man1/lzcmp.1
-#usr/share/man/man1/lzdiff.1
-#usr/share/man/man1/lzegrep.1
-#usr/share/man/man1/lzfgrep.1
-#usr/share/man/man1/lzgrep.1
-#usr/share/man/man1/lzless.1
-#usr/share/man/man1/lzma.1
-#usr/share/man/man1/lzmadec.1
-#usr/share/man/man1/lzmainfo.1
-#usr/share/man/man1/lzmore.1
-#usr/share/man/man1/unlzma.1
+usr/bin/lzma_sdk