diff options
| -rw-r--r-- | package/cfgfs/Makefile | 2 | ||||
| -rw-r--r-- | package/cfgfs/src/wraps.c | 6 | ||||
| -rw-r--r-- | toolchain/kernel-headers/patches/3.9.9/headersinst-xargs.patch | 22 |
3 files changed, 23 insertions, 7 deletions
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 3f0a72b04..ddec3c779 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cfgfs PKG_VERSION:= 1.0.9 -PKG_RELEASE:= 4 +PKG_RELEASE:= 5 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base PKG_URL:= http://openadk.org/ diff --git a/package/cfgfs/src/wraps.c b/package/cfgfs/src/wraps.c index 650474791..7923b76be 100644 --- a/package/cfgfs/src/wraps.c +++ b/package/cfgfs/src/wraps.c @@ -77,12 +77,6 @@ fwcf_pack(char *odata, size_t i, int algo, size_t *dstsz) /* 12 bytes header, padding to 4-byte boundary, 4 bytes trailer */ k = ((j + 19) / 4) * 4; -#if DEF_FLASHPART > 0xFFFFFF -# error DEF_FLASHPART too large -#endif - if (k > DEF_FLASHPART) - errx(1, "%lu bytes too large for flash partition of %lu KiB", - (u_long)k, DEF_FLASHPART / 1024UL); /* padded to size of flash block */ #if (DEF_FLASHBLOCK & 3) # error DEF_FLASHBLOCK must be dword-aligned diff --git a/toolchain/kernel-headers/patches/3.9.9/headersinst-xargs.patch b/toolchain/kernel-headers/patches/3.9.9/headersinst-xargs.patch new file mode 100644 index 000000000..62222b21b --- /dev/null +++ b/toolchain/kernel-headers/patches/3.9.9/headersinst-xargs.patch @@ -0,0 +1,22 @@ +diff -Nur linux-3.9.9.orig/scripts/Makefile.headersinst linux-3.9.9/scripts/Makefile.headersinst +--- linux-3.9.9.orig/scripts/Makefile.headersinst 2013-07-03 19:56:36.000000000 +0200 ++++ linux-3.9.9/scripts/Makefile.headersinst 2013-07-18 15:46:50.000000000 +0200 +@@ -72,7 +72,7 @@ + quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ + file$(if $(word 2, $(all-files)),s)) + cmd_install = \ +- $(PERL) $< $(installdir) $(SRCARCH) $(input-files); \ ++ xargs $(PERL) $< $(installdir) $(SRCARCH) < $(INSTALL_HDR_PATH)/.input-files; \ + for F in $(wrapper-files); do \ + echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ + done; \ +@@ -101,7 +101,9 @@ + $(install-file): scripts/headers_install.pl $(input-files) FORCE + $(if $(unwanted),$(call cmd,remove),) + $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@))) ++ @echo $(input-files) > $(INSTALL_HDR_PATH)/.input-files + $(call if_changed,install) ++ @rm $(INSTALL_HDR_PATH)/.input-files + + else + __headerscheck: $(subdirs) $(check-file) |