diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | Config.in | 2 | ||||
| -rw-r--r-- | package/dosfstools/dosfstools.mk | 3 | ||||
| -rw-r--r-- | package/e2fsprogs/e2fsprogs.mk | 2 | ||||
| -rw-r--r-- | target/squashfs/squashfs-3.4-build-system-fix.patch | 28 |
5 files changed, 34 insertions, 5 deletions
@@ -1,3 +1,7 @@ +2010.05, Not yet released + + Updated/fixed packages: dosfstools, e2fsprogs, squashfs + 2010.02, Release February 26th, 2010: Fixes all over the tree. @@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG config BR2_VERSION string - default "2010.02" + default "2010.05-git" source "target/Config.in.arch" source "target/device/Config.in" diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk index b826ab183..a7f59f0cb 100644 --- a/package/dosfstools/dosfstools.mk +++ b/package/dosfstools/dosfstools.mk @@ -32,8 +32,7 @@ $(DOSFSTOOLS_DIR)/.built : $(DOSFSTOOLS_DIR)/.unpacked $(STRIPCMD) $(DOSFSTOOLS_DIR)/$(DOSFSLABEL_BINARY) touch $@ -$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): # $(DOSFSTOOLS_DIR)/.built - echo foo +$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): $(DOSFSTOOLS_DIR)/.built cp -a $(DOSFSTOOLS_DIR)/$(MKDOSFS_BINARY) $@ touch -c $@ diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 0f8119bf6..5aa3261f9 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -67,8 +67,6 @@ E2FSPROGS_TXTTARGETS_ = \ $(E2FSPROGS_HOOK_POST_INSTALL): $(call MESSAGE,"Post installing") - # strip binaries - $(STRIPCMD) $(STRIP_STRIP_ALL) $(addprefix $(TARGET_DIR)/, $(E2FSPROGS_BINTARGETS_y)) # remove unneeded rm -f $(addprefix $(TARGET_DIR)/, $(E2FSPROGS_BINTARGETS_)) rm -f $(addprefix $(TARGET_DIR)/, $(E2FSPROGS_TXTTARGETS_)) diff --git a/target/squashfs/squashfs-3.4-build-system-fix.patch b/target/squashfs/squashfs-3.4-build-system-fix.patch new file mode 100644 index 000000000..5b86b008a --- /dev/null +++ b/target/squashfs/squashfs-3.4-build-system-fix.patch @@ -0,0 +1,28 @@ +[PATCH]: squashfs-tools: Handle user supplied CFLAGS/LDFLAGS + +Properly handle make CFLAGS=.. LDFLAGS=.. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + squashfs-tools/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: squashfs3.4/squashfs-tools/Makefile +=================================================================== +--- squashfs3.4.orig/squashfs-tools/Makefile ++++ squashfs3.4/squashfs-tools/Makefile +@@ -2,12 +2,12 @@ INSTALL_DIR = /usr/local/bin + + INCLUDEDIR = . + +-CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 ++override CFLAGS += -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 + + all: mksquashfs unsquashfs + + mksquashfs: mksquashfs.o read_fs.o sort.o +- $(CC) mksquashfs.o read_fs.o sort.o -lz -lpthread -lm -o $@ ++ $(CC) $(LDFLAGS) mksquashfs.o read_fs.o sort.o -lz -lpthread -lm -o $@ + + mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h + |