From dc81db4febb829e6a86fa36f27ea393da5c6d8e6 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 14 Apr 2010 21:13:59 +0000 Subject: [PATCH 1/8] target/adm5120: fix image building after r20834 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20855 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/adm5120/image/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/linux/adm5120/image/Makefile b/target/linux/adm5120/image/Makefile index cb9af208a..f628456ab 100644 --- a/target/linux/adm5120/image/Makefile +++ b/target/linux/adm5120/image/Makefile @@ -11,6 +11,10 @@ LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR) JFFS2BLOCK := $(KDIR)/jffs2.block JFFS2MARK := $(KDIR)/jffs2.mark +define imgname +$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(patsubst jffs2-%,jffs2,$(1)) +endef + define Build/Clean $(LOADER_MAKE) clean endef From 327ab14655e4f62a03aa2306e644b2f48a4c8a4c Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 14 Apr 2010 22:21:15 +0000 Subject: [PATCH 2/8] fix timestamp checks for build system paths which have '.svn' in their directory name git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20856 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/depends.mk | 2 +- scripts/timestamp.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/depends.mk b/include/depends.mk index 4c31eb398..65e9b25d5 100644 --- a/include/depends.mk +++ b/include/depends.mk @@ -11,7 +11,7 @@ # 3: tempfile for file listings # 4: find options -DEP_FINDPARAMS := -x "*.svn*" -x ".*" -x "*.svn*" -x "*:*" -x "*\!*" -x "* *" -x "*\\\#*" -x "*/.*_check" +DEP_FINDPARAMS := -x "*/.svn*" -x ".*" -x "*:*" -x "*\!*" -x "* *" -x "*\\\#*" -x "*/.*_check" find_md5=find $(1) -type f $(patsubst -x,-and -not -path,$(DEP_FINDPARAMS) $(2)) | md5s diff --git a/scripts/timestamp.pl b/scripts/timestamp.pl index 3bf057151..e24d8149d 100755 --- a/scripts/timestamp.pl +++ b/scripts/timestamp.pl @@ -14,7 +14,7 @@ sub get_ts($$) { my $ts = 0; my $fn = ""; $path .= "/" if( -d $path); - open FIND, "find $path -type f -and -not -path \\*.svn\\* -and -not -path \\*CVS\\* $options 2>/dev/null |"; + open FIND, "find $path -type f -and -not -path \\*/.svn\\* -and -not -path \\*CVS\\* $options 2>/dev/null |"; while () { chomp; my $file = $_; From 02c2b70228ae39d9db030b517878323b9a504fae Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 14 Apr 2010 22:52:49 +0000 Subject: [PATCH 3/8] openssl: remove the makefile timestamp check, it breaks on some host systems git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20858 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/190-remove_timestamp_check.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 package/openssl/patches/190-remove_timestamp_check.patch diff --git a/package/openssl/patches/190-remove_timestamp_check.patch b/package/openssl/patches/190-remove_timestamp_check.patch new file mode 100644 index 000000000..6157b906a --- /dev/null +++ b/package/openssl/patches/190-remove_timestamp_check.patch @@ -0,0 +1,23 @@ +--- a/Makefile ++++ b/Makefile +@@ -181,7 +181,7 @@ WTARFILE= $(NAME)-win.tar + EXHEADER= e_os2.h + HEADER= e_os.h + +-all: Makefile build_all openssl.pc libssl.pc libcrypto.pc ++all: build_all openssl.pc libssl.pc libcrypto.pc + + # as we stick to -e, CLEARENV ensures that local variables in lower + # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn +@@ -476,11 +476,6 @@ openssl.pc: Makefile + echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ + echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc + +-Makefile: Makefile.org Configure config +- @echo "Makefile is older than Makefile.org, Configure or config." +- @echo "Reconfigure the source tree (via './config' or 'perl Configure'), please." +- @false +- + libclean: + rm -f *.map *.so *.so.* *.dll engines/*.so engines/*.dll *.a engines/*.a */lib */*/lib + From a81b5c3e9fd0e6ec41f8c1272bd6b3384c5db820 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 14 Apr 2010 22:56:05 +0000 Subject: [PATCH 4/8] openssl: fix timestamp patch - previous version patched the wrong file git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20859 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/openssl/patches/190-remove_timestamp_check.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/openssl/patches/190-remove_timestamp_check.patch b/package/openssl/patches/190-remove_timestamp_check.patch index 6157b906a..e19933156 100644 --- a/package/openssl/patches/190-remove_timestamp_check.patch +++ b/package/openssl/patches/190-remove_timestamp_check.patch @@ -1,6 +1,6 @@ ---- a/Makefile -+++ b/Makefile -@@ -181,7 +181,7 @@ WTARFILE= $(NAME)-win.tar +--- a/Makefile.org ++++ b/Makefile.org +@@ -179,7 +179,7 @@ WTARFILE= $(NAME)-win.tar EXHEADER= e_os2.h HEADER= e_os.h @@ -9,7 +9,7 @@ # as we stick to -e, CLEARENV ensures that local variables in lower # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn -@@ -476,11 +476,6 @@ openssl.pc: Makefile +@@ -474,11 +474,6 @@ openssl.pc: Makefile echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc From c46d2489d6b1f7a9f82149cd7a818d7c60122055 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 14 Apr 2010 23:26:48 +0000 Subject: [PATCH 5/8] package/ipset: update to 4.2 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20861 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/ipset/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 7a2e8a1e8..012505fe8 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ipset -PKG_VERSION:=4.1 +PKG_VERSION:=4.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://ipset.netfilter.org -PKG_MD5SUM:=d104007fdf5ea64fef774c22b1c0a97b +PKG_MD5SUM:=9060d549a18c1c0794fa47a71343d627 include $(INCLUDE_DIR)/package.mk From c5ac3c85663e2ff772acc02ab7e05763da6a2158 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 14 Apr 2010 23:27:36 +0000 Subject: [PATCH 6/8] package/iptables: update to 1.4.7 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20862 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 6 +++--- .../patches/008-netfilter_include_linux_type_h.patch | 10 ---------- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 package/iptables/patches/008-netfilter_include_linux_type_h.patch diff --git a/package/iptables/Makefile b/package/iptables/Makefile index bee898b50..e97cfbbca 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iptables -PKG_VERSION:=1.4.6 -PKG_RELEASE:=2 +PKG_VERSION:=1.4.7 +PKG_RELEASE:=1 -PKG_MD5SUM:=c67cf30e281a924def6426be0973df56 +PKG_MD5SUM:=645941dd1f9e0ec1f74c61918d70d52f PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \ ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ diff --git a/package/iptables/patches/008-netfilter_include_linux_type_h.patch b/package/iptables/patches/008-netfilter_include_linux_type_h.patch deleted file mode 100644 index 761f1c497..000000000 --- a/package/iptables/patches/008-netfilter_include_linux_type_h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/linux/netfilter.h -+++ b/include/linux/netfilter.h -@@ -1,6 +1,7 @@ - #ifndef __LINUX_NETFILTER_H - #define __LINUX_NETFILTER_H - -+#include - - /* Responses from hook functions. */ - #define NF_DROP 0 From 8848c0b71efa905cd50ef93b327a544e2e215ddf Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 15 Apr 2010 00:33:40 +0000 Subject: [PATCH 8/8] target/toolchain: match toolchain directory name changes in r19885 & r20215 (closes: #7148 & #7162) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20865 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/toolchain/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile index fa9405f6c..1e0dec2dd 100644 --- a/target/toolchain/Makefile +++ b/target/toolchain/Makefile @@ -16,7 +16,7 @@ override MAKEFLAGS= PKG_OS:=$(shell uname -s) PKG_CPU:=$(shell uname -m) -TOOLCHAIN_NAME:=OpenWrt-Toolchain-$(BOARD)-for-$(ARCH)-gcc-$(GCCV)_$(LIBC)-$(LIBCV) +TOOLCHAIN_NAME:=OpenWrt-Toolchain-$(BOARD)-for-$(ARCH)$(ARCH_SUFFIX)-gcc-$(GCCV)$(DIR_SUFFIX) TOOLCHAIN_BUILD_DIR:=$(BUILD_DIR)/$(TOOLCHAIN_NAME) EXCLUDE_DIRS:=*/ccache \ */stamp \ @@ -26,13 +26,13 @@ EXCLUDE_DIRS:=*/ccache \ all: compile -TOOLCHAIN_PREFIX:=$(TOOLCHAIN_BUILD_DIR)/toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV) +TOOLCHAIN_PREFIX:=$(TOOLCHAIN_BUILD_DIR)/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX) $(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2: clean mkdir -p $(TOOLCHAIN_BUILD_DIR) $(TAR) -cf - -C $(TOPDIR)/staging_dir/ \ $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \ - toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV) | \ + toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX) | \ $(TAR) -xf - -C $(TOOLCHAIN_BUILD_DIR) $(CP) $(TOPDIR)/LICENSE ./files/README.TOOLCHAIN \