Changeset d5b9e70 in freewrt for tools/squashfs

Timestamp:

Jul 27, 2006, 12:19:37 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

fdd4f59

Parents:

a787d3e

Message:

update-patches for tools/

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@433 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

tools/squashfs

Files:

• Makefile (modified) (2 diffs)
• patches/100-lzma.patch (modified) (2 diffs)

tools/squashfs/Makefile

@@ -11 +11 @@
 include ../rules.mk
 
-$(WRKBUILD)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) 
+$(WRKBUILD)/squashfs-tools/mksquashfs-lzma: ${WRKBUILD}/.prepared
         mkdir -p $(STAGING_DIR)/bin
-        ${EXTRACT_CMD}
-        $(PATCH) $(WRKBUILD) patches/ \*.patch
-        touch $@
-
-$(WRKBUILD)/squashfs-tools/mksquashfs-lzma: $(WRKBUILD)/.unpacked
         $(MAKE) CC='$(HOSTCC)' CFLAGS='$(HOSTCFLAGS)' \
             -C $(WRKBUILD)/squashfs-tools \
@@ -27 +22 @@
 
 source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(WRKBUILD)/.unpacked
+prepare: ${WRKBUILD}/.prepared
 compile: $(WRKBUILD)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR)/bin/mksquashfs-lzma
 install: $(STAGING_DIR)/bin/mksquashfs-lzma

tools/squashfs/patches/100-lzma.patch

@@ -4 +4 @@
         * fix CFLAGS abuse
 
---- squashfs3.0/squashfs-tools/Makefile.orig    Sun Jun 18 19:37:35 2006
-+++ squashfs3.0/squashfs-tools/Makefile Sun Jun 18 19:38:08 2006
-@@ -1,6 +1,7 @@
+--- squashfs3.0.orig/squashfs-tools/Makefile    Wed Mar 15 21:35:57 2006
++++ squashfs3.0/squashfs-tools/Makefile Thu Jul 27 10:16:13 2006
+@@ -1,12 +1,16 @@
  INCLUDEDIR = .
 +#LZMAPATH = ../lzma/SRC/7zip/Compress/LZMA_Lib
@@ -15 +15 @@
  all: mksquashfs unsquashfs
  
-@@ -7,6 +8,9 @@ all: mksquashfs unsquashfs
  mksquashfs: mksquashfs.o read_fs.o sort.o
         $(CC) mksquashfs.o read_fs.o sort.o -lz -o $@