Revert "Added a patch for "sqlzma" + squashfs-3.4."

This reverts commit 35987163a7724a79631e8d44b8768b2ede73d4fe.

diff --git a/lfs/squashfs b/lfs/squashfs
index 3f2eeb59f90edf7dad3970e2573dffdb75897f27..7f7a2fd5a24ce5f17f14a32f2b15f2601f2d418e 100644 (file)
--- a/lfs/squashfs
+++ b/lfs/squashfs
@@ -37,9 +37,7 @@ TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) \
-       lzma457.tar.bz2 \
-       sqlzma-$(VER)-1.patch
+objects = $(DL_FILE)
 
 install : $(TARGET)
 
@@ -55,17 +53,7 @@ $(objects) :
 $(TARGET) : 
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       -mkdir -p $(DIR_APP)/lzma
-       cd $(DIR_APP) && tar xfj $(DIR_DL)/lzma457.tar.bz2 -C lzma
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/sqlzma-$(VER)-1.patch
-
-       cd $(DIR_APP)/lzma* && make Sqlzma=$$(pwd)/../squashfs-tools -C C/Compress/Lzma -f sqlzma.mk
-       cd $(DIR_APP)/lzma* && make Sqlzma=$$(pwd)/../squashfs-tools -C CPP/7zip/Compress/LZMA_Alone -f sqlzma.mk
-
-       cd $(DIR_APP)/squashfs-tools && make $(PARALLELISMFLAGS) \
-               Sqlzma=$$(pwd) \
-               LzmaAlone=$$(pwd)/../lzma/CPP/7zip/Compress/LZMA_Alone \
-               LzmaC=$$(pwd)/../lzma/C/Compress/Lzma
+       cd $(DIR_APP)/squashfs-tools && make $(PARALLELISMFLAGS)
        cd $(DIR_APP)/squashfs-tools && install -m 755 mksquashfs /usr/sbin
        cd $(DIR_APP)/squashfs-tools && install -m 755 unsquashfs /usr/sbin
        @rm -rf $(DIR_APP)