diff options
| -rw-r--r-- | patches/squashfs4.1/0001-add-support-for-LDFLAGS-don-t-overwrite-CFLAGS.patch | 48 | ||||
| -rw-r--r-- | patches/squashfs4.1/0002-turn-off-XATTR-support-by-default.patch | 27 | ||||
| -rw-r--r-- | patches/squashfs4.1/series | 4 | ||||
| -rw-r--r-- | rules/squashfs-tools.make | 4 |
4 files changed, 2 insertions, 81 deletions
diff --git a/patches/squashfs4.1/0001-add-support-for-LDFLAGS-don-t-overwrite-CFLAGS.patch b/patches/squashfs4.1/0001-add-support-for-LDFLAGS-don-t-overwrite-CFLAGS.patch deleted file mode 100644 index 7aa0c3ffb..000000000 --- a/patches/squashfs4.1/0001-add-support-for-LDFLAGS-don-t-overwrite-CFLAGS.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Thu, 25 Nov 2010 09:53:47 +0100 -Subject: [PATCH] add support for LDFLAGS, don't overwrite CFLAGS - -When cross compiling the linker can not find libz, this patch -adds the LDFLAGS variable to pass the linkerflags. - -Based on earier work by Erwin Rol. - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - squashfs-tools/Makefile | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/squashfs-tools/Makefile b/squashfs-tools/Makefile -index 183578b..8d2fa35 100644 ---- a/squashfs-tools/Makefile -+++ b/squashfs-tools/Makefile -@@ -87,7 +87,7 @@ MKSQUASHFS_OBJS = mksquashfs.o read_fs.o sort.o swap.o pseudo.o compressor.o - UNSQUASHFS_OBJS = unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o \ - unsquash-4.o swap.o compressor.o - --CFLAGS = $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -+CFLAGS += $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" -O2 -Wall - - LIBS = -@@ -175,7 +175,7 @@ endif - all: mksquashfs unsquashfs - - mksquashfs: $(MKSQUASHFS_OBJS) -- $(CC) $(MKSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@ -+ $(CC) $(MKSQUASHFS_OBJS) -lpthread -lm $(LIBS) $(LDFLAGS) -o $@ - - mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h \ - squashfs_swap.h xattr.h -@@ -195,7 +195,7 @@ xattr.o: xattr.h - read_xattrs.o: xattr.h - - unsquashfs: $(UNSQUASHFS_OBJS) -- $(CC) $(UNSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@ -+ $(CC) $(UNSQUASHFS_OBJS) -lpthread -lm $(LIBS) $(LDFLAGS) -o $@ - - unsquashfs.o: unsquashfs.h unsquashfs.c squashfs_fs.h squashfs_swap.h \ - squashfs_compat.h global.h xattr.h --- -1.7.2.3 - diff --git a/patches/squashfs4.1/0002-turn-off-XATTR-support-by-default.patch b/patches/squashfs4.1/0002-turn-off-XATTR-support-by-default.patch deleted file mode 100644 index 4765394eb..000000000 --- a/patches/squashfs4.1/0002-turn-off-XATTR-support-by-default.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Thu, 25 Nov 2010 09:58:05 +0100 -Subject: [PATCH] turn off XATTR support by default - -it can be turned on by defining XATTR_SUPPORT=1 on the make command line. - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - squashfs-tools/Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/squashfs-tools/Makefile b/squashfs-tools/Makefile -index 8d2fa35..d409c17 100644 ---- a/squashfs-tools/Makefile -+++ b/squashfs-tools/Makefile -@@ -64,7 +64,7 @@ COMP_DEFAULT = gzip - # If your C library or build/target environment doesn't support XATTRs then - # comment out the next line to build Mksquashfs and Unsquashfs without XATTR - # support --XATTR_SUPPORT = 1 -+#XATTR_SUPPORT = 1 - - # Select whether you wish xattrs to be stored by Mksquashfs and extracted - # by Unsquashfs by default. If selected users can disable xattr support by --- -1.7.2.3 - diff --git a/patches/squashfs4.1/series b/patches/squashfs4.1/series deleted file mode 100644 index 7d392123b..000000000 --- a/patches/squashfs4.1/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -0001-add-support-for-LDFLAGS-don-t-overwrite-CFLAGS.patch -0002-turn-off-XATTR-support-by-default.patch -# ea0df38d3c2387d2946d87d1d3209162 - git-ptx-patches magic diff --git a/rules/squashfs-tools.make b/rules/squashfs-tools.make index b0345eeeb..0c7883b62 100644 --- a/rules/squashfs-tools.make +++ b/rules/squashfs-tools.make @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_SQUASHFS_TOOLS) += squashfs-tools # # Paths and names # -SQUASHFS_TOOLS_VERSION := $(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_V3X, 3.4, 4.1) +SQUASHFS_TOOLS_VERSION := $(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_V3X, 3.4, 4.2) ifdef PTXCONF_HOST_SQUASHFS_TOOLS_V3X SQUASHFS_TOOLS_MD5 := 2a4d2995ad5aa6840c95a95ffa6b1da6 else -SQUASHFS_TOOLS_MD5 := 8e1b2b96f5d5f3fe48fef226ae8cd341 +SQUASHFS_TOOLS_MD5 := 1b7a781fb4cf8938842279bd3e8ee852 endif SQUASHFS_TOOLS := squashfs$(SQUASHFS_TOOLS_VERSION) SQUASHFS_TOOLS_SUFFIX := tar.gz |