From 8775ccf2107e4483ad5efeb68b6c7c1a8545fb0e Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 4 Dec 2012 16:19:09 +0000 Subject: include/image.mk: call Image/Build/{cpiogz,targz} All Image/mkfs/... macros call the Image/Build except for Image/mkfs/targz and Image/mkfs/cpiogz This patch adds the Image/Build call for Image/mkfs/targz and Image/mkfs/cpiogz. Signed-off-by: Maarten Bezemer Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34473 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/image.mk b/include/image.mk index 503115ddb..7758c9a90 100644 --- a/include/image.mk +++ b/include/image.mk @@ -109,6 +109,7 @@ endif ifneq ($(CONFIG_TARGET_ROOTFS_CPIOGZ),) define Image/mkfs/cpiogz ( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9 >$(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz ) + $(call Image/Build,cpiogz) endef endif @@ -116,6 +117,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_TARGZ),) define Image/mkfs/targz # Preserve permissions (-p) when building as non-root user $(TAR) -czpf $(BIN_DIR)/$(IMG_PREFIX)-rootfs.tar.gz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ . + $(call Image/Build,targz) endef endif -- cgit v1.2.3 From 3bcbd529785e95b5d820380262c414c371162d01 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 4 Dec 2012 22:59:05 +0000 Subject: Revert "include/image.mk: call Image/Build/{cpiogz,targz}" This breaks on platforms building their own targz/cpioz images. Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34498 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/image.mk b/include/image.mk index 7758c9a90..503115ddb 100644 --- a/include/image.mk +++ b/include/image.mk @@ -109,7 +109,6 @@ endif ifneq ($(CONFIG_TARGET_ROOTFS_CPIOGZ),) define Image/mkfs/cpiogz ( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9 >$(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz ) - $(call Image/Build,cpiogz) endef endif @@ -117,7 +116,6 @@ ifneq ($(CONFIG_TARGET_ROOTFS_TARGZ),) define Image/mkfs/targz # Preserve permissions (-p) when building as non-root user $(TAR) -czpf $(BIN_DIR)/$(IMG_PREFIX)-rootfs.tar.gz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ . - $(call Image/Build,targz) endef endif -- cgit v1.2.3 From 2cf500bf76c85b9984a6c0b20171390bd4638c53 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 8 Dec 2012 15:01:33 +0000 Subject: kernel: update linux 3.6 to 3.6.9 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34578 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 349c2f5db..664c98dce 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -5,8 +5,8 @@ LINUX_RELEASE?=1 ifeq ($(LINUX_VERSION),3.3.8) LINUX_KERNEL_MD5SUM:=f1058f64eed085deb44f10cee8541d50 endif -ifeq ($(LINUX_VERSION),3.6.8) - LINUX_KERNEL_MD5SUM:=e3405cc8f9e4f18c516e55a8eb625803 +ifeq ($(LINUX_VERSION),3.6.9) + LINUX_KERNEL_MD5SUM:=f77bac0a8f499f221d13a69317145610 endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From 6553643c12188cb7dfb4fa119f8c18d1f50db27b Mon Sep 17 00:00:00 2001 From: jow Date: Tue, 11 Dec 2012 09:53:50 +0000 Subject: netfilter.mk: fix packaging of xt_LOG.ko, it moved between 3.3.8 and 3.6.x git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34625 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/netfilter.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/netfilter.mk b/include/netfilter.mk index ef38d50ad..76dea6f67 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -37,7 +37,11 @@ $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_MAC, $(P_XT)xt_mac)) $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_MULTIPORT, $(P_XT)xt_multiport)) $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_COMMENT, $(P_XT)xt_comment)) -$(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_LOG, $(P_V4)ipt_LOG)) +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.4.0)),1) + $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_LOG, $(P_XT)xt_LOG)) +else + $(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_LOG, $(P_V4)ipt_LOG)) +endif $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_TCPMSS, $(P_XT)xt_TCPMSS)) $(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_REJECT, $(P_V4)ipt_REJECT)) -- cgit v1.2.3 From d91c02e001d54cf7ccf420d2006f34a86e5cb629 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 11 Dec 2012 11:31:17 +0000 Subject: kernel: update to 3.7 final Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34626 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 664c98dce..75d4f9674 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,6 +8,9 @@ endif ifeq ($(LINUX_VERSION),3.6.9) LINUX_KERNEL_MD5SUM:=f77bac0a8f499f221d13a69317145610 endif +ifeq ($(LINUX_VERSION),3.7) + LINUX_KERNEL_MD5SUM:=21223369d682bcf44bcdfe1521095983 +endif # disable the md5sum check for unknown kernel versions LINUX_KERNEL_MD5SUM?=x -- cgit v1.2.3 From 8c399739caea5e7390f845f76043bb3a54619ba6 Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 11 Dec 2012 20:14:39 +0000 Subject: kernel: update linux 3.6 to 3.6.10 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34639 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 75d4f9674..fe2203a9a 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -5,8 +5,8 @@ LINUX_RELEASE?=1 ifeq ($(LINUX_VERSION),3.3.8) LINUX_KERNEL_MD5SUM:=f1058f64eed085deb44f10cee8541d50 endif -ifeq ($(LINUX_VERSION),3.6.9) - LINUX_KERNEL_MD5SUM:=f77bac0a8f499f221d13a69317145610 +ifeq ($(LINUX_VERSION),3.6.10) + LINUX_KERNEL_MD5SUM:=a8c2dcd268d3ca2b81908990abd5d382 endif ifeq ($(LINUX_VERSION),3.7) LINUX_KERNEL_MD5SUM:=21223369d682bcf44bcdfe1521095983 -- cgit v1.2.3 From 1971309ae55935b78724e3835123fc4869e3895a Mon Sep 17 00:00:00 2001 From: jow Date: Sat, 15 Dec 2012 00:05:35 +0000 Subject: netfilter.mk: extend nf_add macro to take a version dependency expression - nf_add now takes an optional 4th argument which specifies a kernel version dependency, e.g. "lt 3.7.0" - remove CompareKernelPatchVer conditionals around nf_add invocations, use version depends instead - fixes xt_LOG.ko packaging with Linux 3.6.0 and later git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34681 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/netfilter.mk | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) (limited to 'include') diff --git a/include/netfilter.mk b/include/netfilter.mk index 76dea6f67..e1666280d 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -15,9 +15,15 @@ P_XT:=netfilter/ P_EBT:=bridge/netfilter/ endif +# 1: variable +# 2: kconfig symbols +# 3: file list +# 4: version dependency define nf_add - $(1)-$$($(2)) += $(3) - KCONFIG_$(1) += $(2) + $(if $(4),ifeq ($$(strip $$(call CompareKernelPatchVer,$$(KERNEL_PATCHVER),$(firstword $(4)),$(lastword $(4)))),1)) + $(1)-$$($(2)) += $(3) + $(if $(4),endif) + KCONFIG_$(1) = $(filter-out $(2),$(KCONFIG_$(1))) $(2) endef @@ -37,11 +43,8 @@ $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_MAC, $(P_XT)xt_mac)) $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_MULTIPORT, $(P_XT)xt_multiport)) $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_COMMENT, $(P_XT)xt_comment)) -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.4.0)),1) - $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_LOG, $(P_XT)xt_LOG)) -else - $(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_LOG, $(P_V4)ipt_LOG)) -endif +$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_LOG, $(P_XT)xt_LOG, ge 3.4.0)) +$(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_LOG, $(P_V4)ipt_LOG, lt 3.4.0)) $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_TCPMSS, $(P_XT)xt_TCPMSS)) $(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_REJECT, $(P_V4)ipt_REJECT)) @@ -156,11 +159,8 @@ $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_REJECT, $(P_V6)ip6t_REJECT)) # nat # kernel only -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1) - $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT, $(P_XT)nf_nat $(P_V4)iptable_nat),)) -else - $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT, $(P_V4)nf_nat $(P_V4)iptable_nat),)) -endif +$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT, $(P_XT)nf_nat $(P_V4)iptable_nat, ge 3.7.0),)) +$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT, $(P_V4)nf_nat $(P_V4)iptable_nat, lt 3.7.0),)) # userland only $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_NAT,CONFIG_NF_NAT, ipt_SNAT ipt_DNAT))) @@ -179,13 +179,10 @@ $(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_REDIRECT, $(P_V4)ipt_REDI $(eval $(call nf_add,IPT_NATHELPER,CONFIG_IP_NF_NAT_FTP, $(P_V4)ip_nat_ftp)) $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_CONNTRACK_FTP, $(P_XT)nf_conntrack_ftp)) $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_CONNTRACK_IRC, $(P_XT)nf_conntrack_irc)) -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1) - $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_FTP, $(P_XT)nf_nat_ftp)) - $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_IRC, $(P_XT)nf_nat_irc)) -else - $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_FTP, $(P_V4)nf_nat_ftp)) - $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_IRC, $(P_V4)nf_nat_irc)) -endif +$(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_FTP, $(P_XT)nf_nat_ftp, ge 3.7.0)) +$(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_IRC, $(P_XT)nf_nat_irc, ge 3.7.0)) +$(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_FTP, $(P_V4)nf_nat_ftp, lt 3.7.0)) +$(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_IRC, $(P_V4)nf_nat_irc, lt 3.7.0)) # nathelper-extra -- cgit v1.2.3 From 07cb78c5fd5b090573d742d995a0c874ed21ae35 Mon Sep 17 00:00:00 2001 From: blogic Date: Sat, 15 Dec 2012 01:59:14 +0000 Subject: [include] adds wrapper for uapi directory git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34683 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/kernel.mk b/include/kernel.mk index 589db024d..eabf9484f 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -35,6 +35,7 @@ else endif KERNEL_BUILD_DIR ?= $(BUILD_DIR)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET)) LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) + LINUX_UAPI_DIR=$(firstword $(wildcard $(LINUX_DIR)/include/uapi $(LINUX_DIR)/include)) LINUX_VERMAGIC:=$(strip $(shell cat $(LINUX_DIR)/.vermagic 2>/dev/null)) LINUX_VERMAGIC:=$(if $(LINUX_VERMAGIC),$(LINUX_VERMAGIC),unknown) -- cgit v1.2.3 From 1cefde9bd62ba3f00fecb5e99707a5e789aa8281 Mon Sep 17 00:00:00 2001 From: blogic Date: Sat, 15 Dec 2012 02:00:50 +0000 Subject: [lantiq] fix tapi dependency git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34696 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/ltqtapi.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/ltqtapi.mk b/include/ltqtapi.mk index 7699d30d1..f4d06add7 100644 --- a/include/ltqtapi.mk +++ b/include/ltqtapi.mk @@ -1,12 +1,12 @@ -LTQ_TAPI_BUILD_DEPENDS:=TARGET_lantiq_danube:kmod-ltq-tapi \ - TARGET_lantiq_danube:kmod-ltq-vmmc \ +LTQ_TAPI_BUILD_DEPENDS:=TARGET_lantiq_xway:kmod-ltq-tapi \ + TARGET_lantiq_xway:kmod-ltq-vmmc \ TARGET_lantiq_falcon:kmod-ltq-tapi \ TARGET_lantiq_falcon:kmod-ltq-vmmc -LTQ_TAPI_TARGET:=@(TARGET_lantiq_falcon||TARGET_lantiq_danube) +LTQ_TAPI_TARGET:=@(TARGET_lantiq_falcon||TARGET_lantiq_xway) LTQ_TAPI_DEPENDS:=$(LTQ_TAPI_TARGET) \ - +TARGET_lantiq_danube:kmod-ltq-tapi \ - +TARGET_lantiq_danube:kmod-ltq-vmmc \ + +TARGET_lantiq_xway:kmod-ltq-tapi \ + +TARGET_lantiq_xway:kmod-ltq-vmmc \ +TARGET_lantiq_falcon:kmod-ltq-tapi \ +TARGET_lantiq_falcon:kmod-ltq-vmmc -- cgit v1.2.3 From 63ec409d275bee94a23347a0787b346349aeda9c Mon Sep 17 00:00:00 2001 From: blogic Date: Sun, 16 Dec 2012 11:04:27 +0000 Subject: [include] fixes uapi helper define git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34715 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel.mk b/include/kernel.mk index eabf9484f..618523776 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -35,8 +35,9 @@ else endif KERNEL_BUILD_DIR ?= $(BUILD_DIR)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET)) LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) - LINUX_UAPI_DIR=$(firstword $(wildcard $(LINUX_DIR)/include/uapi $(LINUX_DIR)/include)) - + ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1) + LINUX_UAPI_DIR=uapi/ + endif LINUX_VERMAGIC:=$(strip $(shell cat $(LINUX_DIR)/.vermagic 2>/dev/null)) LINUX_VERMAGIC:=$(if $(LINUX_VERMAGIC),$(LINUX_VERMAGIC),unknown) -- cgit v1.2.3 From 56bc2d9958b929d934910e2c752b1a78cb46dd4c Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 18 Dec 2012 14:41:16 +0000 Subject: kernel: update linux 3.6 to 3.6.11 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34748 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index fe2203a9a..103950a4b 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -5,8 +5,8 @@ LINUX_RELEASE?=1 ifeq ($(LINUX_VERSION),3.3.8) LINUX_KERNEL_MD5SUM:=f1058f64eed085deb44f10cee8541d50 endif -ifeq ($(LINUX_VERSION),3.6.10) - LINUX_KERNEL_MD5SUM:=a8c2dcd268d3ca2b81908990abd5d382 +ifeq ($(LINUX_VERSION),3.6.11) + LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54 endif ifeq ($(LINUX_VERSION),3.7) LINUX_KERNEL_MD5SUM:=21223369d682bcf44bcdfe1521095983 -- cgit v1.2.3 From 6d81a07a81c67d37b3c00ec23f71673747250418 Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 18 Dec 2012 14:50:42 +0000 Subject: netfilter: fix module list for 3.7 kernel Signed-off-by: David Woodhouse Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34750 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/netfilter.mk | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/netfilter.mk b/include/netfilter.mk index e1666280d..20bfffece 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -170,8 +170,10 @@ $(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_MASQUERADE, $(P_V4)ipt_MASQUERA # nat-extra -$(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_NETMAP, $(P_V4)ipt_NETMAP)) -$(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_REDIRECT, $(P_V4)ipt_REDIRECT)) +$(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_NETMAP, $(P_XT)xt_NETMAP, ge 3.7.0)) +$(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_NETMAP, $(P_V4)ipt_NETMAP, lt 3.7.0)) +$(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_REDIRECT, $(P_XT)xt_REDIRECT, ge 3.7.0)) +$(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_REDIRECT, $(P_V4)ipt_REDIRECT, lt 3.7.0)) # nathelper @@ -189,7 +191,8 @@ $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_IRC, $(P_V4)nf_nat_irc, lt 3.7. $(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_BROADCAST, $(P_XT)nf_conntrack_broadcast)) $(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_AMANDA, $(P_XT)nf_conntrack_amanda)) -$(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_NAT_AMANDA, $(P_V4)nf_nat_amanda)) +$(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_NAT_AMANDA, $(P_XT)nf_nat_amanda, ge 3.7.0)) +$(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_NAT_AMANDA, $(P_V4)nf_nat_amanda, lt 3.7.0)) $(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_CT_PROTO_GRE, $(P_XT)nf_conntrack_proto_gre)) $(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_NAT_PROTO_GRE, $(P_V4)nf_nat_proto_gre)) $(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_H323, $(P_XT)nf_conntrack_h323)) @@ -197,16 +200,18 @@ $(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_NAT_H323, $(P_V4)nf_nat_h323) $(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_PPTP, $(P_XT)nf_conntrack_pptp)) $(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_NAT_PPTP, $(P_V4)nf_nat_pptp)) $(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_SIP, $(P_XT)nf_conntrack_sip)) -$(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_NAT_SIP, $(P_V4)nf_nat_sip)) +$(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_NAT_SIP, $(P_XT)nf_nat_sip, ge 3.7.0)) +$(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_NAT_SIP, $(P_V4)nf_nat_sip, lt 3.7.0)) $(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_SNMP, $(P_XT)nf_conntrack_snmp)) $(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_NAT_SNMP_BASIC, $(P_V4)nf_nat_snmp_basic)) $(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_TFTP, $(P_XT)nf_conntrack_tftp)) -$(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_NAT_TFTP, $(P_V4)nf_nat_tftp)) +$(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_NAT_TFTP, $(P_XT)nf_nat_tftp, ge 3.7.0)) +$(eval $(call nf_add,IPT_NATHELPER_EXTRA,CONFIG_NF_NAT_TFTP, $(P_V4)nf_nat_tftp, lt 3.7.0)) # queue -$(eval $(call nf_add,IPT_QUEUE,CONFIG_IP_NF_QUEUE, $(P_V4)ip_queue)) +$(eval $(call nf_add,IPT_QUEUE,CONFIG_IP_NF_QUEUE, $(P_V4)ip_queue, lt 3.5.0)) # ulog -- cgit v1.2.3 From 0414913c3591db2160c0a40e31d13e263ecfb2f2 Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 18 Dec 2012 15:13:31 +0000 Subject: kernel: update linux 3.7 to 3.7.1 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34760 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 103950a4b..811a6ce60 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,8 +8,8 @@ endif ifeq ($(LINUX_VERSION),3.6.11) LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54 endif -ifeq ($(LINUX_VERSION),3.7) - LINUX_KERNEL_MD5SUM:=21223369d682bcf44bcdfe1521095983 +ifeq ($(LINUX_VERSION),3.7.1) + LINUX_KERNEL_MD5SUM:=b3f99fb945b270b503b2a0996b8b29e7 endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From 976f30f6bfabe004496d00c519cd2244aa5b5b73 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 20 Dec 2012 15:29:37 +0000 Subject: kernel: fix module packages postinst by pointing to the new functions.sh location git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34804 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/kernel.mk b/include/kernel.mk index 618523776..8df70ba5f 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -104,7 +104,7 @@ define ModuleAutoLoad mkdir -p $(2)/CONTROL; \ echo "#!/bin/sh" > $(2)/CONTROL/postinst; \ echo "[ -z \"\$$$$$$$$IPKG_INSTROOT\" ] || exit 0" >> $(2)/CONTROL/postinst; \ - echo ". /etc/functions.sh" >> $(2)/CONTROL/postinst; \ + echo ". /lib/functions.sh" >> $(2)/CONTROL/postinst; \ echo "load_modules $$$$$$$$modules" >> $(2)/CONTROL/postinst; \ chmod 0755 $(2)/CONTROL/postinst; \ fi -- cgit v1.2.3 From 26bf467fae87a149e9647880755099a80ed6a411 Mon Sep 17 00:00:00 2001 From: blogic Date: Sat, 22 Dec 2012 10:17:29 +0000 Subject: [netfilter] fix ipv4 nat on 3.7 by adding missing iptables modules git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34841 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/netfilter.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/netfilter.mk b/include/netfilter.mk index 20bfffece..12c5f9fff 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -159,7 +159,7 @@ $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_REJECT, $(P_V6)ip6t_REJECT)) # nat # kernel only -$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT, $(P_XT)nf_nat $(P_V4)iptable_nat, ge 3.7.0),)) +$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT, $(P_XT)nf_nat $(P_V4)nf_nat_ipv4 $(P_XT)xt_nat $(P_V4)iptable_nat, ge 3.7.0),)) $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT, $(P_V4)nf_nat $(P_V4)iptable_nat, lt 3.7.0),)) # userland only -- cgit v1.2.3 From b989033b73b7eda2cf2a10163339eed073427991 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Dec 2012 18:56:16 +0000 Subject: build: remove the default useless MAINTAINER value git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34868 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package-defaults.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 45a92cf6e..a0f859c6e 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -13,8 +13,6 @@ else PKG_FIXUP_DEPENDS = $(2) endif -PKG_MAINTAINER ?= OpenWrt Developers Team - define Package/Default CONFIGFILE:= SECTION:=opt -- cgit v1.2.3 From 51230131704e49170937f92756521d0f902a9143 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Dec 2012 19:56:21 +0000 Subject: build: reduce the size of package metadata a bit to keep package list files smaller git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34871 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package-defaults.mk | 1 - include/package-ipkg.mk | 19 +++++++++---------- include/package.mk | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/package-defaults.mk b/include/package-defaults.mk index a0f859c6e..0505a43c4 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -42,7 +42,6 @@ define Package/Default else PKGARCH:=$(BOARD) endif - PRIORITY:=optional DEFAULT:= MENU:= SUBMENU:= diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 5de51ebb5..b4b83fea5 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -146,18 +146,17 @@ ifeq ($(DUMP),) for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ done; \ - echo "Depends: $$$$DEPENDS"; \ - echo "Provides: $(PROVIDES)"; \ + [ -z "$$$$DEPENDS" ] || echo "Depends: $$$$DEPENDS"; \ + $(if $(PROVIDES), echo "Provides: $(PROVIDES)"; ) \ echo "Source: $(SOURCE)"; \ - echo "SourceFile: $(PKG_SOURCE)"; \ - echo "SourceURL: $(PKG_SOURCE_URL)"; \ - echo "License: $(PKG_LICENSE)"; \ - echo "LicenseFiles: $(PKG_LICENSE_FILES)"; \ + $(if $(PKG_SOURCE), echo "SourceFile: $(PKG_SOURCE)"; ) \ + $(if $(PKG_SOURCE_URL), echo "SourceURL: $(PKG_SOURCE_URL)"; ) \ + $(if $(PKG_LICENSE), echo "License: $(PKG_LICENSE)"; ) \ + $(if $(PKG_LICENSE_FILES), echo "LicenseFiles: $(PKG_LICENSE_FILES)"; ) \ echo "Section: $(SECTION)"; \ - echo "Status: unknown $(if $(filter hold,$(PKG_FLAGS)),hold,ok) not-installed"; \ - echo "Essential: $(if $(filter essential,$(PKG_FLAGS)),yes,no)"; \ - echo "Priority: $(PRIORITY)"; \ - echo "Maintainer: $(MAINTAINER)"; \ + $(if $(filter hold,$(PKG_FLAGS)),echo "Status: unknown hold not-installed"; ) \ + $(if $(filter essential,$(PKG_FLAGS)), echo "Essential: yes"; ) \ + $(if $(MAINTAINER),echo "Maintainer: $(MAINTAINER)"; ) \ echo "Architecture: $(PKGARCH)"; \ echo "Installed-Size: 0"; \ echo -n "Description: "; $(SH_FUNC) getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \ diff --git a/include/package.mk b/include/package.mk index c1fe088ec..99d2dd270 100644 --- a/include/package.mk +++ b/include/package.mk @@ -215,7 +215,7 @@ define Package/$(1)/description endef endif - $(foreach FIELD, TITLE CATEGORY PRIORITY SECTION VERSION, + $(foreach FIELD, TITLE CATEGORY SECTION VERSION, ifeq ($($(FIELD)),) $$(error Package/$(1) is missing the $(FIELD) field) endif -- cgit v1.2.3 From d53eec088e43eca8161c16adb56dde954141e2d5 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 28 Dec 2012 19:17:19 +0000 Subject: mips: use -mno-branch-likely for kernel and userspace, saves ~11k kernel size after lzma and ~12k squashfs size in the default configuration git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34909 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/target.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/target.mk b/include/target.mk index 61cdf0640..4f31aaf17 100644 --- a/include/target.mk +++ b/include/target.mk @@ -193,7 +193,7 @@ ifeq ($(DUMP),1) DEFAULT_CFLAGS_i386=-O2 -pipe -march=i486 -fno-caller-saves DEFAULT_CFLAGS_x86_64=-O2 -pipe -march=athlon64 -fno-caller-saves DEFAULT_CFLAGS_m68k=-Os -pipe -mcfv4e -fno-caller-saves - DEFAULT_CFLAGS_mips=-Os -pipe -mips32 -mtune=mips32 -fno-caller-saves + DEFAULT_CFLAGS_mips=-Os -pipe -mips32 -mtune=mips32 -fno-caller-saves -mno-branch-likely DEFAULT_CFLAGS_mipsel=$(DEFAULT_CFLAGS_mips) DEFAULT_CFLAGS_mips64=-Os -pipe -mips64 -mtune=mips64 -mabi=64 -fno-caller-saves DEFAULT_CFLAGS_mips64el=$(DEFAULT_CFLAGS_mips64) -- cgit v1.2.3 From 1565cab1a6768fb773972fea9836e58821d0d64a Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 29 Dec 2012 11:12:31 +0000 Subject: cmake.mk: add support for overriding the source dir, and define the cmake prefix path to avoid picking up host libraries for target builds (patch by Henning Rogge) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34914 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/cmake.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/cmake.mk b/include/cmake.mk index 4c4af502c..64a0654f9 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -4,6 +4,8 @@ ifneq ($(findstring c,$(OPENWRT_VERBOSE)),) MAKE_FLAGS+=VERBOSE=1 endif +CMAKE_SOURCE_DIR:=. + ifeq ($(CONFIG_CCACHE),) ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC) @@ -53,8 +55,9 @@ define Build/Configure/Default -DCMAKE_STRIP=: \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDL_LIBRARY=$(STAGING_DIR) \ + -DCMAKE_PREFIX_PATH=$(STAGING_DIR) \ $(CMAKE_OPTIONS) \ - . \ + $(CMAKE_SOURCE_DIR) \ ) endef -- cgit v1.2.3 From 468176836823f1869f5c00c16d15e532c784f6f0 Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 10 Jan 2013 17:20:29 +0000 Subject: netfilter: xt_NOTRACK is incorporated in xt_CT as of 3.8-rc3 Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35087 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/netfilter.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/netfilter.mk b/include/netfilter.mk index 12c5f9fff..86f35e5fd 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -58,7 +58,7 @@ $(eval $(if $(NF_KMOD),$(call nf_add,IPT_CONNTRACK,CONFIG_NF_CONNTRACK_IPV4, $(P $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_STATE, $(P_XT)xt_state)) $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_RAW, $(P_V4)iptable_raw)) -$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_TARGET_NOTRACK, $(P_XT)xt_NOTRACK)) +$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_TARGET_NOTRACK, $(P_XT)xt_NOTRACK, lt 3.8.0)) $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_TARGET_CT, $(P_XT)xt_CT)) $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_CONNTRACK, $(P_XT)xt_conntrack)) -- cgit v1.2.3 From b28541e70ccacbd5cac039b1b88d8de7c8ab22e7 Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 11 Jan 2013 16:44:26 +0000 Subject: image.mk: use XZ bcj architecture filter if available xz supports using an architecture specific BCJ filter, use that one to save us a couple kB while producing squashfs filesystems (mimics the Linux kernel). Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35097 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/image.mk b/include/image.mk index 503115ddb..7c45b3946 100644 --- a/include/image.mk +++ b/include/image.mk @@ -50,7 +50,10 @@ ifeq ($(CONFIG_SQUASHFS_LZMA),y) SQUASHFSCOMP := lzma $(LZMA_XZ_OPTIONS) endif ifeq ($(CONFIG_SQUASHFS_XZ),y) - SQUASHFSCOMP := xz $(LZMA_XZ_OPTIONS) + ifneq ($(filter arm x86 powerpc sparc,$(LINUX_KARCH)),) + BCJ_FILTER:=-Xbcj $(LINUX_KARCH) + endif + SQUASHFSCOMP := xz $(LZMA_XZ_OPTIONS) $(BCJ_FILTER) endif JFFS2_BLOCKSIZE ?= 64k 128k -- cgit v1.2.3 From 13869cb6d3c2e967fa78ed38aa17fc7fa823b848 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 12 Jan 2013 11:43:08 +0000 Subject: kernel: update linux 3.7 to 3.7.2 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35100 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 811a6ce60..e20a3e754 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,8 +8,8 @@ endif ifeq ($(LINUX_VERSION),3.6.11) LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54 endif -ifeq ($(LINUX_VERSION),3.7.1) - LINUX_KERNEL_MD5SUM:=b3f99fb945b270b503b2a0996b8b29e7 +ifeq ($(LINUX_VERSION),3.7.2) + LINUX_KERNEL_MD5SUM:=a6bad0280df3bfec8f91c9aa375826a5 endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From dc131c0a6e13e2d670ed3c9112a88b0cf3f9b7d9 Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 14 Jan 2013 16:12:56 +0000 Subject: netfilter.mk: add addrtype match to iptables-mod-extra (kmod-ipt-extra) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35155 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/netfilter.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/include/netfilter.mk b/include/netfilter.mk index 86f35e5fd..1d89e6d53 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -76,8 +76,7 @@ $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_TA # extra -# kernel only - +$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE, $(if $(NF_KMOD),$(P_XT)xt_addrtype,$(P_XT)ipt_addrtype))) $(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_OWNER, $(P_XT)xt_owner)) $(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_PHYSDEV, $(P_XT)xt_physdev)) $(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_PKTTYPE, $(P_XT)xt_pkttype)) -- cgit v1.2.3 From 644eb24db3b7b2c8d9a4348eb35141ac0ab47bce Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 15 Jan 2013 19:55:45 +0000 Subject: kernel: add missing CONFIG_KALLSYMS_UNCOMPRESSED symbol Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35180 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-defaults.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index ab73c1ae1..9a4dd90ed 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -96,6 +96,7 @@ define Kernel/Configure/Default awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target + echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> $(LINUX_DIR)/.config.target echo "# CONFIG_KPROBES is not set" >> $(LINUX_DIR)/.config.target $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config -- cgit v1.2.3 From 4f5ccb4de32ae75233b97c8b599f965479c22066 Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 18 Jan 2013 11:44:42 +0000 Subject: kernel: update linux 3.7 to 3.7.3 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35216 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index e20a3e754..932f186f2 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,8 +8,8 @@ endif ifeq ($(LINUX_VERSION),3.6.11) LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54 endif -ifeq ($(LINUX_VERSION),3.7.2) - LINUX_KERNEL_MD5SUM:=a6bad0280df3bfec8f91c9aa375826a5 +ifeq ($(LINUX_VERSION),3.7.3) + LINUX_KERNEL_MD5SUM:=6b35fb08d229d4c6d246f27c7d475790 endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From e21bd57719923eb5c96b54f9a487f41a0ef8a384 Mon Sep 17 00:00:00 2001 From: juhosg Date: Thu, 24 Jan 2013 17:08:37 +0000 Subject: kernel: update linux 3.7 to 3.7.4 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35318 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 932f186f2..f3d8aeda6 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,8 +8,8 @@ endif ifeq ($(LINUX_VERSION),3.6.11) LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54 endif -ifeq ($(LINUX_VERSION),3.7.3) - LINUX_KERNEL_MD5SUM:=6b35fb08d229d4c6d246f27c7d475790 +ifeq ($(LINUX_VERSION),3.7.4) + LINUX_KERNEL_MD5SUM:=b34c31c954bebdfb568244dd3897e7c6 endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From 0a3970a70de5376f9a7ddef0c0b68acf9eb8caab Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 26 Jan 2013 16:26:04 +0000 Subject: kernel: fix module export stripping git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35319 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 2ae80e54e..0b7b54fdd 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -81,11 +81,11 @@ define BuildKernel ( \ echo '#define SYMTAB_KEEP \'; \ cat $(KERNEL_BUILD_DIR)/sym_include.txt | \ - awk '{print "*(__ksymtab." $$$$1 ") \\" }'; \ + awk '{print "*(___ksymtab+" $$$$1 ") \\" }'; \ echo; \ echo '#define SYMTAB_KEEP_GPL \'; \ cat $(KERNEL_BUILD_DIR)/sym_include.txt | \ - awk '{print "*(__ksymtab_gpl." $$$$1 ") \\" }'; \ + awk '{print "*(___ksymtab_gpl+" $$$$1 ") \\" }'; \ echo; \ echo '#define SYMTAB_KEEP_STR \'; \ cat $(KERNEL_BUILD_DIR)/sym_include.txt | \ @@ -93,11 +93,11 @@ define BuildKernel echo; \ echo '#define SYMTAB_DISCARD \'; \ cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \ - awk '{print "*(__ksymtab." $$$$1 ") \\" }'; \ + awk '{print "*(___ksymtab+" $$$$1 ") \\" }'; \ echo; \ echo '#define SYMTAB_DISCARD_GPL \'; \ cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \ - awk '{print "*(__ksymtab_gpl." $$$$1 ") \\" }'; \ + awk '{print "*(___ksymtab_gpl+" $$$$1 ") \\" }'; \ echo; \ echo '#define SYMTAB_DISCARD_STR \'; \ cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \ -- cgit v1.2.3 From edf06589cc0ad9474b6c17aa84af90a932eaca13 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 26 Jan 2013 16:26:13 +0000 Subject: kernel: use -ffunction-sections, -fdata-sections and --gc-sections on mips in combination with kernel symbol export stripping this significantly reduces the kernel image size git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35320 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 0b7b54fdd..095940c57 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -81,15 +81,11 @@ define BuildKernel ( \ echo '#define SYMTAB_KEEP \'; \ cat $(KERNEL_BUILD_DIR)/sym_include.txt | \ - awk '{print "*(___ksymtab+" $$$$1 ") \\" }'; \ + awk '{print "KEEP(*(___ksymtab+" $$$$1 ")) \\" }'; \ echo; \ echo '#define SYMTAB_KEEP_GPL \'; \ cat $(KERNEL_BUILD_DIR)/sym_include.txt | \ - awk '{print "*(___ksymtab_gpl+" $$$$1 ") \\" }'; \ - echo; \ - echo '#define SYMTAB_KEEP_STR \'; \ - cat $(KERNEL_BUILD_DIR)/sym_include.txt | \ - awk '{print "*(__ksymtab_strings." $$$$1 ") \\" }'; \ + awk '{print "KEEP(*(___ksymtab_gpl+" $$$$1 ")) \\" }'; \ echo; \ echo '#define SYMTAB_DISCARD \'; \ cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \ @@ -99,10 +95,6 @@ define BuildKernel cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \ awk '{print "*(___ksymtab_gpl+" $$$$1 ") \\" }'; \ echo; \ - echo '#define SYMTAB_DISCARD_STR \'; \ - cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \ - awk '{print "*(__ksymtab_strings." $$$$1 ") \\" }'; \ - echo; \ ) > $$@ $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_KCONFIG_LIST) $(TOPDIR)/.config -- cgit v1.2.3 From df69eeadfcc6b2d8deb103d0864f0eab9399f919 Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 29 Jan 2013 18:29:45 +0000 Subject: kernel: update linux 3.7 to 3.7.5 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35390 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index f3d8aeda6..d5feae3a0 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,8 +8,8 @@ endif ifeq ($(LINUX_VERSION),3.6.11) LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54 endif -ifeq ($(LINUX_VERSION),3.7.4) - LINUX_KERNEL_MD5SUM:=b34c31c954bebdfb568244dd3897e7c6 +ifeq ($(LINUX_VERSION),3.7.5) + LINUX_KERNEL_MD5SUM:=ae355001775bc841132fe0fea2f354d4 endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From cfb126aa14cc1361eb103bcf22bc433199de521f Mon Sep 17 00:00:00 2001 From: luka Date: Sun, 3 Feb 2013 21:00:24 +0000 Subject: include/image.mk: export ubifs image from mkfs.ubifs git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35473 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/image.mk b/include/image.mk index 7c45b3946..302228816 100644 --- a/include/image.mk +++ b/include/image.mk @@ -101,6 +101,7 @@ else define Image/mkfs/ubifs $(CP) ./ubinize.cfg $(KDIR) $(STAGING_DIR_HOST)/bin/mkfs.ubifs $(UBIFS_OPTS) -o $(KDIR)/root.ubifs -d $(TARGET_DIR) + $(call Image/Build,ubifs) (cd $(KDIR); \ $(STAGING_DIR_HOST)/bin/ubinize $(UBINIZE_OPTS) -o $(KDIR)/root.ubi ubinize.cfg) $(call Image/Build,ubi) -- cgit v1.2.3 From 6cb187108c4d22ad1a89417288d15375b2639225 Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 4 Feb 2013 10:02:52 +0000 Subject: package/kernel: xt_NOTRACK has been removed in 3.7-rc1 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35475 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/netfilter.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/netfilter.mk b/include/netfilter.mk index 1d89e6d53..d2b8a5f1d 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -58,7 +58,7 @@ $(eval $(if $(NF_KMOD),$(call nf_add,IPT_CONNTRACK,CONFIG_NF_CONNTRACK_IPV4, $(P $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_STATE, $(P_XT)xt_state)) $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_RAW, $(P_V4)iptable_raw)) -$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_TARGET_NOTRACK, $(P_XT)xt_NOTRACK, lt 3.8.0)) +$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_TARGET_NOTRACK, $(P_XT)xt_NOTRACK, lt 3.7.0)) $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_TARGET_CT, $(P_XT)xt_CT)) $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_CONNTRACK, $(P_XT)xt_conntrack)) -- cgit v1.2.3 From 5809015997536c4067c824095f94485e84a3174c Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 4 Feb 2013 10:02:56 +0000 Subject: kernel: update linux 3.7 to 3.7.6 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35476 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index d5feae3a0..5d402f029 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,8 +8,8 @@ endif ifeq ($(LINUX_VERSION),3.6.11) LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54 endif -ifeq ($(LINUX_VERSION),3.7.5) - LINUX_KERNEL_MD5SUM:=ae355001775bc841132fe0fea2f354d4 +ifeq ($(LINUX_VERSION),3.7.6) + LINUX_KERNEL_MD5SUM:=4c4d80619c713f83015fc6b1c6280891 endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From 17188c31c449cc098f815cd20ebf8ebd6a5fc6b6 Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 12 Feb 2013 09:51:11 +0000 Subject: kernel: update linux 3.7 to 3.7.7 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35571 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 5d402f029..58e911ae4 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,8 +8,8 @@ endif ifeq ($(LINUX_VERSION),3.6.11) LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54 endif -ifeq ($(LINUX_VERSION),3.7.6) - LINUX_KERNEL_MD5SUM:=4c4d80619c713f83015fc6b1c6280891 +ifeq ($(LINUX_VERSION),3.7.7) + LINUX_KERNEL_MD5SUM:=bd37c2e05cb82331eb00da81773b2d85 endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From ab70aef2efe5846992aaa5f3b829318377b13e8e Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 15 Feb 2013 07:36:15 +0000 Subject: kernel: update linux 3.7 to 3.7.8 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35604 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 58e911ae4..062bfb495 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,8 +8,8 @@ endif ifeq ($(LINUX_VERSION),3.6.11) LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54 endif -ifeq ($(LINUX_VERSION),3.7.7) - LINUX_KERNEL_MD5SUM:=bd37c2e05cb82331eb00da81773b2d85 +ifeq ($(LINUX_VERSION),3.7.8) + LINUX_KERNEL_MD5SUM:=4bc40d18bf90f25d5463cfb9442876af endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From 3512501681291da3faefc2b056b78f07001b7904 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sun, 17 Feb 2013 21:32:42 +0000 Subject: kernel: update linux 3.7 to 3.7.9 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35644 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 062bfb495..4460fbd64 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,8 +8,8 @@ endif ifeq ($(LINUX_VERSION),3.6.11) LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54 endif -ifeq ($(LINUX_VERSION),3.7.8) - LINUX_KERNEL_MD5SUM:=4bc40d18bf90f25d5463cfb9442876af +ifeq ($(LINUX_VERSION),3.7.9) + LINUX_KERNEL_MD5SUM:=c19426374acfccfa7391fc90640240cb endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From 8b6ada275e0edeec48fa6f0da3287bda78fb4014 Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 19 Feb 2013 09:17:38 +0000 Subject: kernel: update linux 3.8-rcX to 3.8 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35672 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 4460fbd64..f817bbb3e 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -11,6 +11,9 @@ endif ifeq ($(LINUX_VERSION),3.7.9) LINUX_KERNEL_MD5SUM:=c19426374acfccfa7391fc90640240cb endif +ifeq ($(LINUX_VERSION),3.8) + LINUX_KERNEL_MD5SUM:=1c738edfc54e7c65faeb90c436104e2f +endif # disable the md5sum check for unknown kernel versions LINUX_KERNEL_MD5SUM?=x -- cgit v1.2.3 From e826bdc8f7165ca7b7433566466d1fedd1588d81 Mon Sep 17 00:00:00 2001 From: jogo Date: Thu, 21 Feb 2013 11:45:16 +0000 Subject: include/kernel.mk: print warnings/errors to stderr Makes warnings/errors visible when building with V=w/V=1. Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35713 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/kernel.mk b/include/kernel.mk index 8df70ba5f..b637de591 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -163,11 +163,11 @@ $(call KernelPackage/$(1)/config) if grep -q "$$$$$$$${mod##$(LINUX_DIR)/}" "$(LINUX_DIR)/modules.builtin"; then \ echo "NOTICE: module '$$$$$$$$mod' is built-in."; \ else \ - echo "ERROR: module '$$$$$$$$mod' is missing."; \ + echo "ERROR: module '$$$$$$$$mod' is missing." >&2; \ exit 1; \ fi; \ else \ - echo "WARNING: module '$$$$$$$$mod' missing and modules.builtin not available, assuming built-in."; \ + echo "WARNING: module '$$$$$$$$mod' missing and modules.builtin not available, assuming built-in." >&2; \ fi; \ done; $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD)) @@ -178,7 +178,7 @@ $(call KernelPackage/$(1)/config) else compile: kmod-$(1)-unavailable kmod-$(1)-unavailable: - @echo "WARNING: kmod-$(1) is not available in the kernel config" + @echo "WARNING: kmod-$(1) is not available in the kernel config" >&2 ) endif $$(eval $$(call BuildPackage,kmod-$(1))) -- cgit v1.2.3 From 32b8758f9e16c9d67a9fcc210b80442b3cae2a54 Mon Sep 17 00:00:00 2001 From: jogo Date: Thu, 21 Feb 2013 11:45:18 +0000 Subject: include/package-bin: print warnings/errors to stderr Makes warnings/errors visible when building with V=w/V=1. Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35714 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package-bin.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/package-bin.mk b/include/package-bin.mk index 96c1aeffc..dcb3a8acb 100644 --- a/include/package-bin.mk +++ b/include/package-bin.mk @@ -14,7 +14,7 @@ ifeq ($(DUMP),) else compile: $(1)-disabled $(1)-disabled: - @echo "WARNING: skipping $(1) -- package not selected" + @echo "WARNING: skipping $(1) -- package not selected" >&2 endif endif endif -- cgit v1.2.3 From 2d1d6343dcb4bddec710f07272f5c4d74733600c Mon Sep 17 00:00:00 2001 From: jogo Date: Thu, 21 Feb 2013 11:45:20 +0000 Subject: include/package-ipkg.mk: print warnings/errors to stderr Makes warnings/errors visible when building with V=w/V=1. Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35715 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package-ipkg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index b4b83fea5..20361de9e 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -95,7 +95,7 @@ ifeq ($(DUMP),) else compile: $(1)-disabled $(1)-disabled: - @echo "WARNING: skipping $(1) -- package not selected" + @echo "WARNING: skipping $(1) -- package not selected" >&2 endif endif endif -- cgit v1.2.3 From 3fdebe8a6cfea34639e4ea3001e54325904f4d3a Mon Sep 17 00:00:00 2001 From: jogo Date: Thu, 21 Feb 2013 11:45:22 +0000 Subject: include/toplevel.mk: print warnings/errors to stderr Makes warnings/errors visible when building with V=w/V=1. Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35716 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/toplevel.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/toplevel.mk b/include/toplevel.mk index 19ed8cb1d..0918298b1 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -148,7 +148,7 @@ prereq:: prepare-tmpinfo .config cp .config tmp/.config; \ ./scripts/config/conf -D tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \ if ./scripts/kconfig.pl '>' .config tmp/.config | grep -q CONFIG; then \ - echo "WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!"; \ + echo "WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!" >&2; \ fi \ ) @+$(ULIMIT_FIX) $(SUBMAKE) -r $@ -- cgit v1.2.3 From c16ccb5ff5f56760ed59145c4cc23f7753cf8cfb Mon Sep 17 00:00:00 2001 From: juhosg Date: Sun, 3 Mar 2013 13:57:40 +0000 Subject: kernel: update linux 3.7 to 3.7.10 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35860 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index f817bbb3e..71669d0bc 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,8 +8,8 @@ endif ifeq ($(LINUX_VERSION),3.6.11) LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54 endif -ifeq ($(LINUX_VERSION),3.7.9) - LINUX_KERNEL_MD5SUM:=c19426374acfccfa7391fc90640240cb +ifeq ($(LINUX_VERSION),3.7.10) + LINUX_KERNEL_MD5SUM:=09624c3702107076efcac5e1cd8a18ec endif ifeq ($(LINUX_VERSION),3.8) LINUX_KERNEL_MD5SUM:=1c738edfc54e7c65faeb90c436104e2f -- cgit v1.2.3 From f9b600b97e741277e57468315ab11fe632e70099 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sun, 3 Mar 2013 13:58:52 +0000 Subject: kernel: update linux 3.8 to 3.8.1 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35862 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 71669d0bc..0c58ad841 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -11,8 +11,8 @@ endif ifeq ($(LINUX_VERSION),3.7.10) LINUX_KERNEL_MD5SUM:=09624c3702107076efcac5e1cd8a18ec endif -ifeq ($(LINUX_VERSION),3.8) - LINUX_KERNEL_MD5SUM:=1c738edfc54e7c65faeb90c436104e2f +ifeq ($(LINUX_VERSION),3.8.1) + LINUX_KERNEL_MD5SUM:=093b172f907d5455a6746418ad18f5bc endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From 37e84c429e5affc9bdadbbecaa337fcbeaf4ad7e Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 4 Mar 2013 08:43:55 +0000 Subject: kernel: update linux 3.8 to 3.8.2 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35868 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 0c58ad841..73ed2f2c4 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -11,8 +11,8 @@ endif ifeq ($(LINUX_VERSION),3.7.10) LINUX_KERNEL_MD5SUM:=09624c3702107076efcac5e1cd8a18ec endif -ifeq ($(LINUX_VERSION),3.8.1) - LINUX_KERNEL_MD5SUM:=093b172f907d5455a6746418ad18f5bc +ifeq ($(LINUX_VERSION),3.8.2) + LINUX_KERNEL_MD5SUM:=0587d693653dc5e67e3d280278100d1d endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From 14e76acf76d3b152b9c443a6014c147058aad01b Mon Sep 17 00:00:00 2001 From: jow Date: Tue, 5 Mar 2013 13:41:56 +0000 Subject: include: make firewall3 the default git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35888 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/target.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/target.mk b/include/target.mk index 4f31aaf17..6d905ade2 100644 --- a/include/target.mk +++ b/include/target.mk @@ -14,7 +14,7 @@ DEVICE_TYPE?=router # Default packages - the really basic set DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg hotplug2 netifd # For router targets -DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall +DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall3 DEFAULT_PACKAGES.bootloader:= ifneq ($(DUMP),) -- cgit v1.2.3 From a73e896733696cb0271ba7fe94dd0bcb477a4a39 Mon Sep 17 00:00:00 2001 From: cyrus Date: Thu, 7 Mar 2013 08:48:41 +0000 Subject: iptables: Add missing IPv6 builtin modules git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35898 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/netfilter.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/netfilter.mk b/include/netfilter.mk index d2b8a5f1d..b75492463 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -144,6 +144,8 @@ $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MANGLE, $(P_V6)ip6ta $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_QUEUE, $(P_V6)ip6_queue),)) $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_RAW, $(P_V6)ip6table_raw),)) +$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CORE,CONFIG_IP6_NF_IPTABLES, ip6t_icmp6))) + $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MATCH_AH, $(P_V6)ip6t_ah)) $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MATCH_EUI64, $(P_V6)ip6t_eui64)) $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MATCH_FRAG, $(P_V6)ip6t_frag)) @@ -283,7 +285,7 @@ IPT_BUILTIN += $(IPT_FILTER-y) IPT_BUILTIN += $(IPT_IPOPT-y) IPT_BUILTIN += $(IPT_IPRANGE-y) IPT_BUILTIN += $(IPT_IPSEC-y) -IPT_BUILTIN += $(IPT_IPV6-y) +IPT_BUILTIN += $(IPT_IPV6-y) $(IPT_IPV6-m) IPT_BUILTIN += $(IPT_NAT-y) IPT_BUILTIN += $(IPT_NAT_EXTRA-y) IPT_BUILTIN += $(IPT_NATHELPER-y) -- cgit v1.2.3 From 61af2bc164740938e398eeb320927db0ce7934e5 Mon Sep 17 00:00:00 2001 From: cyrus Date: Thu, 7 Mar 2013 09:30:52 +0000 Subject: netfilter: Fix typo in last commit git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35899 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/netfilter.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/netfilter.mk b/include/netfilter.mk index b75492463..15f1198ab 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -144,7 +144,7 @@ $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MANGLE, $(P_V6)ip6ta $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_QUEUE, $(P_V6)ip6_queue),)) $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_RAW, $(P_V6)ip6table_raw),)) -$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CORE,CONFIG_IP6_NF_IPTABLES, ip6t_icmp6))) +$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_IPTABLES, ip6t_icmp6))) $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MATCH_AH, $(P_V6)ip6t_ah)) $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MATCH_EUI64, $(P_V6)ip6t_eui64)) -- cgit v1.2.3 From 985d666e366bb9ef159439265f77a2ad04e08f0f Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 7 Mar 2013 17:32:29 +0000 Subject: build: BSD compile fixes following patch allows to build images for Qemu ARM on OpenBSD 5.2 amd64 and FreeBSD 9.1 amd64. Mostly small pieces of code changes to get things right on the specific platform. Updated the README to describe better, which tools on the host are required. Added some kind of prepare scripts to install needed tools on BSD via packages. Signed-off-by: Waldemar Brodkorb git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35900 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host-build.mk | 2 +- include/host.mk | 3 +++ include/prereq-build.mk | 8 +++----- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/host-build.mk b/include/host-build.mk index 320e74ee4..126671a0b 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -71,7 +71,7 @@ HOST_CONFIGURE_ARGS = \ HOST_MAKE_FLAGS = -HOST_CONFIGURE_CMD = ./configure +HOST_CONFIGURE_CMD = $(BASH) ./configure ifneq ($(HOST_OS),Darwin) ifeq ($(CONFIG_BUILD_STATIC_TOOLS),y) diff --git a/include/host.mk b/include/host.mk index 9b8a32b67..b44c1bf1a 100644 --- a/include/host.mk +++ b/include/host.mk @@ -62,6 +62,9 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk PATCH=`which gpatch 2>/dev/null`; \ [ -n "$$PATCH" -a -x "$$PATCH" ] || PATCH=`which patch 2>/dev/null`; \ echo "PATCH:=$$PATCH" >> $@; \ + PYTHON=`which python2.7 2>/dev/null`; \ + [ -n "$$PYTHON" -a -x "$$PYTHON" ] || PYTHON=`which python 2>/dev/null`; \ + echo "PYTHON:=$$PYTHON" >> $@; \ ) endif diff --git a/include/prereq-build.mk b/include/prereq-build.mk index c7d59f120..59ea7ef9a 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -39,6 +39,8 @@ $(eval $(call Require,case-sensitive-fs, \ )) define Require/getopt + gnugetopt --help 2>&1 | grep long >/dev/null || \ + /usr/local/bin/getopt --help 2>&1 | grep long >/dev/null || \ getopt --help 2>&1 | grep long >/dev/null endef $(eval $(call Require,getopt, \ @@ -134,15 +136,11 @@ $(eval $(call RequireCommand,bzip2, \ Please install bzip2. \ )) -$(eval $(call RequireCommand,patch, \ - Please install patch. \ -)) - $(eval $(call RequireCommand,perl, \ Please install perl. \ )) -$(eval $(call RequireCommand,python, \ +$(eval $(call RequireCommand,$(PYTHON), \ Please install python. \ )) -- cgit v1.2.3 From 37b63c5f7237ba331ec8a77bc6befe0a493936f6 Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 15 Mar 2013 14:39:51 +0000 Subject: kernel: update linux 3.8 to 3.8.3 Also refresh the related generic/platform patches. Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36039 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 73ed2f2c4..f5021beaa 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -11,8 +11,8 @@ endif ifeq ($(LINUX_VERSION),3.7.10) LINUX_KERNEL_MD5SUM:=09624c3702107076efcac5e1cd8a18ec endif -ifeq ($(LINUX_VERSION),3.8.2) - LINUX_KERNEL_MD5SUM:=0587d693653dc5e67e3d280278100d1d +ifeq ($(LINUX_VERSION),3.8.3) + LINUX_KERNEL_MD5SUM:=eb59b1fc7343db96e20c85a9cf2baa9f endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From b2fb1adf63474178ff5658a61c66c0b1401e7992 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 17 Mar 2013 21:12:02 +0000 Subject: build: make the color of the 'configuration out of sync' warning red to make it harder for users to overlook git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36082 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/toplevel.mk | 5 +++-- include/verbose.mk | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/toplevel.mk b/include/toplevel.mk index 0918298b1..5e8e6dd1b 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -9,6 +9,8 @@ RELEASE:=Barrier Breaker PREP_MK= OPENWRT_BUILD= QUIET=0 +export IS_TTY=$(shell tty -s && echo 1 || echo 0) + include $(TOPDIR)/include/verbose.mk ifeq ($(SDK),1) @@ -22,7 +24,6 @@ OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION))) export RELEASE export REVISION export OPENWRTVERSION -export IS_TTY=$(shell tty -s && echo 1 || echo 0) export LD_LIBRARY_PATH:=$(subst ::,:,$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib) export DYLD_LIBRARY_PATH:=$(subst ::,:,$(if $(DYLD_LIBRARY_PATH),$(DYLD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib) export GIT_CONFIG_PARAMETERS='core.autocrlf=false' @@ -148,7 +149,7 @@ prereq:: prepare-tmpinfo .config cp .config tmp/.config; \ ./scripts/config/conf -D tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \ if ./scripts/kconfig.pl '>' .config tmp/.config | grep -q CONFIG; then \ - echo "WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!" >&2; \ + printf "$(_R)WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!$(_N)\n" >&2; \ fi \ ) @+$(ULIMIT_FIX) $(SUBMAKE) -r $@ diff --git a/include/verbose.mk b/include/verbose.mk index 2e8ace442..d34f55fc4 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -27,6 +27,7 @@ endif ifeq ($(IS_TTY),1) ifneq ($(strip $(NO_COLOR)),1) _Y:=\\033[33m + _R:=\\033[31m _N:=\\033[m endif endif @@ -36,6 +37,10 @@ ifeq ($(findstring s,$(OPENWRT_VERBOSE)),) printf "$(_Y)%s$(_N)\n" "$(1)" >&8 endef + define ERROR_MESSAGE + printf "$(_R)%s$(_N)\n" "$(1)" >&8 + endef + ifeq ($(QUIET),1) ifneq ($(CURDIR),$(TOPDIR)) _DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR}) @@ -58,4 +63,5 @@ else define MESSAGE printf "%s\n" "$(1)" endef + ERROR_MESSAGE=$(MESSAGE) endif -- cgit v1.2.3 From f3ecabebdb5e8ae1ba209ef30cf867dc7ed8ae74 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 6 Apr 2013 11:40:44 +0000 Subject: kernel: update linux 3.8 to 3.8.6 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36215 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index f5021beaa..2fdcee096 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -11,8 +11,8 @@ endif ifeq ($(LINUX_VERSION),3.7.10) LINUX_KERNEL_MD5SUM:=09624c3702107076efcac5e1cd8a18ec endif -ifeq ($(LINUX_VERSION),3.8.3) - LINUX_KERNEL_MD5SUM:=eb59b1fc7343db96e20c85a9cf2baa9f +ifeq ($(LINUX_VERSION),3.8.6) + LINUX_KERNEL_MD5SUM:=80aa1c706e1bc69cc7a1b2c07db90cf9 endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From 916908663e8fd5e22f71155845ef072309138e4b Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 6 Apr 2013 13:11:44 +0000 Subject: kernel: fix md5sum for 3.8.6 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36225 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 2fdcee096..9bd2c330b 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -12,7 +12,7 @@ ifeq ($(LINUX_VERSION),3.7.10) LINUX_KERNEL_MD5SUM:=09624c3702107076efcac5e1cd8a18ec endif ifeq ($(LINUX_VERSION),3.8.6) - LINUX_KERNEL_MD5SUM:=80aa1c706e1bc69cc7a1b2c07db90cf9 + LINUX_KERNEL_MD5SUM:=0934e6b31931c1832e48a28bd35ef27f endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From 2ada7d7db55cf4bf0eb7b306a2d3563426dc685d Mon Sep 17 00:00:00 2001 From: cyrus Date: Tue, 9 Apr 2013 08:02:55 +0000 Subject: Enable native IPv6 support by default git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36277 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/target.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/target.mk b/include/target.mk index 6d905ade2..107558218 100644 --- a/include/target.mk +++ b/include/target.mk @@ -14,7 +14,7 @@ DEVICE_TYPE?=router # Default packages - the really basic set DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg hotplug2 netifd # For router targets -DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall3 +DEFAULT_PACKAGES.router:=dnsmasq iptables ip6tables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall3 6relayd odhcp6c DEFAULT_PACKAGES.bootloader:= ifneq ($(DUMP),) -- cgit v1.2.3 From ea93b4fb89e3aac292c71547d46fef36c20c6ac9 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sun, 14 Apr 2013 09:25:53 +0000 Subject: kernel: update linux 3.8 to 3.8.7 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36332 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 9bd2c330b..b565df3e4 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -11,8 +11,8 @@ endif ifeq ($(LINUX_VERSION),3.7.10) LINUX_KERNEL_MD5SUM:=09624c3702107076efcac5e1cd8a18ec endif -ifeq ($(LINUX_VERSION),3.8.6) - LINUX_KERNEL_MD5SUM:=0934e6b31931c1832e48a28bd35ef27f +ifeq ($(LINUX_VERSION),3.8.7) + LINUX_KERNEL_MD5SUM:=37ce9b5cc33551b45fea59c1c4c9da13 endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From f6a0204436d51e2227a1b9c8f0463936a9c03f0a Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 18 Apr 2013 12:05:16 +0000 Subject: build: add new menuconfig code based on linux 3.9 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36361 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/toplevel.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/toplevel.mk b/include/toplevel.mk index 5e8e6dd1b..708228600 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -89,10 +89,15 @@ config-clean: FORCE defconfig: scripts/config/conf prepare-tmpinfo FORCE touch .config - $< -D .config Config.in + $< --defconfig .config Config.in + +confdefault-y=allyes +confdefault-m=allmod +confdefault-n=allno +confdefault:=$(confdefault-$(CONFDEFAULT)) oldconfig: scripts/config/conf prepare-tmpinfo FORCE - $< -$(if $(CONFDEFAULT),$(CONFDEFAULT),o) Config.in + $< --$(if $(confdefault),$(confdefault),old)config Config.in menuconfig: scripts/config/mconf prepare-tmpinfo FORCE if [ \! -e .config -a -e $(HOME)/.openwrt/defconfig ]; then \ @@ -147,7 +152,7 @@ prereq:: prepare-tmpinfo .config @+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq @( \ cp .config tmp/.config; \ - ./scripts/config/conf -D tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \ + ./scripts/config/conf --defconfig tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \ if ./scripts/kconfig.pl '>' .config tmp/.config | grep -q CONFIG; then \ printf "$(_R)WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!$(_N)\n" >&2; \ fi \ -- cgit v1.2.3 From 84826541e5147759255cb4ecac3d47d4963a40bd Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 18 Apr 2013 13:51:16 +0000 Subject: build: fix make defconfig git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36362 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/toplevel.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/toplevel.mk b/include/toplevel.mk index 708228600..b8608eeae 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -89,7 +89,7 @@ config-clean: FORCE defconfig: scripts/config/conf prepare-tmpinfo FORCE touch .config - $< --defconfig .config Config.in + $< --defconfig=.config Config.in confdefault-y=allyes confdefault-m=allmod -- cgit v1.2.3 From c1f980f9b354fcca28d2d380067bd18cb4a31383 Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 19 Apr 2013 08:07:34 +0000 Subject: kernel: update linux 3.8 to 3.8.8 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36363 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b565df3e4..2eb73cedc 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -11,8 +11,8 @@ endif ifeq ($(LINUX_VERSION),3.7.10) LINUX_KERNEL_MD5SUM:=09624c3702107076efcac5e1cd8a18ec endif -ifeq ($(LINUX_VERSION),3.8.7) - LINUX_KERNEL_MD5SUM:=37ce9b5cc33551b45fea59c1c4c9da13 +ifeq ($(LINUX_VERSION),3.8.8) + LINUX_KERNEL_MD5SUM:=3b4feff68460881a5dde1307fe1ce87f endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From b98c8e8bf9ceb27c3bb3c965157397c061542c88 Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 26 Apr 2013 16:55:42 +0000 Subject: kernel: update linux 3.8 to 3.8.9 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36453 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 2eb73cedc..9bcbd0b55 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -11,8 +11,8 @@ endif ifeq ($(LINUX_VERSION),3.7.10) LINUX_KERNEL_MD5SUM:=09624c3702107076efcac5e1cd8a18ec endif -ifeq ($(LINUX_VERSION),3.8.8) - LINUX_KERNEL_MD5SUM:=3b4feff68460881a5dde1307fe1ce87f +ifeq ($(LINUX_VERSION),3.8.9) + LINUX_KERNEL_MD5SUM:=b5286ad3d8a729e9ae48b26211e05aec endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From d204a2b48381f4a0033a424def244d0bec0bb6b1 Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 30 Apr 2013 10:43:59 +0000 Subject: kernel: update linux 3.8 to 3.8.10 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36493 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 9bcbd0b55..b9a6776ae 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -11,8 +11,8 @@ endif ifeq ($(LINUX_VERSION),3.7.10) LINUX_KERNEL_MD5SUM:=09624c3702107076efcac5e1cd8a18ec endif -ifeq ($(LINUX_VERSION),3.8.9) - LINUX_KERNEL_MD5SUM:=b5286ad3d8a729e9ae48b26211e05aec +ifeq ($(LINUX_VERSION),3.8.10) + LINUX_KERNEL_MD5SUM:=3d5fb6d9add9cce7725bbe9b139c8d6e endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From 3860eadcbb950d5ea4a3a8fcedb19b9a52dd4c1d Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 30 Apr 2013 11:29:38 +0000 Subject: kernel: add md5sum for 3.9 final Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36499 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b9a6776ae..250544608 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -14,6 +14,9 @@ endif ifeq ($(LINUX_VERSION),3.8.10) LINUX_KERNEL_MD5SUM:=3d5fb6d9add9cce7725bbe9b139c8d6e endif +ifeq ($(LINUX_VERSION),3.9) + LINUX_KERNEL_MD5SUM:=4348c9b6b2eb3144d601e87c19d5d909 +endif # disable the md5sum check for unknown kernel versions LINUX_KERNEL_MD5SUM?=x -- cgit v1.2.3 From 9d0c593751bc9b8633660cb56d9f86b06b7f5734 Mon Sep 17 00:00:00 2001 From: juhosg Date: Wed, 1 May 2013 22:15:18 +0000 Subject: kernel: update linux 3.8 to 3.8.11 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36507 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 250544608..9575fbe8c 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -11,8 +11,8 @@ endif ifeq ($(LINUX_VERSION),3.7.10) LINUX_KERNEL_MD5SUM:=09624c3702107076efcac5e1cd8a18ec endif -ifeq ($(LINUX_VERSION),3.8.10) - LINUX_KERNEL_MD5SUM:=3d5fb6d9add9cce7725bbe9b139c8d6e +ifeq ($(LINUX_VERSION),3.8.11) + LINUX_KERNEL_MD5SUM:=3c4f4fc96bf702d1e9dfbf4d4b4cde9d endif ifeq ($(LINUX_VERSION),3.9) LINUX_KERNEL_MD5SUM:=4348c9b6b2eb3144d601e87c19d5d909 -- cgit v1.2.3 From 17cd2646741830957934880654bb6857ea9057f5 Mon Sep 17 00:00:00 2001 From: juhosg Date: Wed, 8 May 2013 08:53:53 +0000 Subject: kernel: update linux 3.8 to 3.8.12 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36576 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 9575fbe8c..028be1491 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -11,8 +11,8 @@ endif ifeq ($(LINUX_VERSION),3.7.10) LINUX_KERNEL_MD5SUM:=09624c3702107076efcac5e1cd8a18ec endif -ifeq ($(LINUX_VERSION),3.8.11) - LINUX_KERNEL_MD5SUM:=3c4f4fc96bf702d1e9dfbf4d4b4cde9d +ifeq ($(LINUX_VERSION),3.8.12) + LINUX_KERNEL_MD5SUM:=a4be720ca9e61445562565856bb5154d endif ifeq ($(LINUX_VERSION),3.9) LINUX_KERNEL_MD5SUM:=4348c9b6b2eb3144d601e87c19d5d909 -- cgit v1.2.3 From df7f7bf4b392bb6599f272f753abf4f8167fc3a1 Mon Sep 17 00:00:00 2001 From: juhosg Date: Wed, 8 May 2013 08:53:55 +0000 Subject: kernel: update linux 3.9 to 3.9.1 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36577 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 028be1491..9733be0f3 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -14,8 +14,8 @@ endif ifeq ($(LINUX_VERSION),3.8.12) LINUX_KERNEL_MD5SUM:=a4be720ca9e61445562565856bb5154d endif -ifeq ($(LINUX_VERSION),3.9) - LINUX_KERNEL_MD5SUM:=4348c9b6b2eb3144d601e87c19d5d909 +ifeq ($(LINUX_VERSION),3.9.1) + LINUX_KERNEL_MD5SUM:=913bbf85c65f3e587a5000763374b4aa endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From 9211713bc2e586f55d19f7b491fa2034833f0f05 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 9 May 2013 20:50:49 +0000 Subject: toolchain: eliminate the INSTALL_LIBSTDCPP config symbol and make c++ support mandatory - fixes recursive config symbol dependency issues Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36594 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/uclibc++.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/uclibc++.mk b/include/uclibc++.mk index 89298e3f3..a1a61f26d 100644 --- a/include/uclibc++.mk +++ b/include/uclibc++.mk @@ -5,7 +5,7 @@ ifndef DUMP endif PKG_PREPARED_DEPENDS += CONFIG_USE_UCLIBCXX -CXX_DEPENDS = @INSTALL_LIBSTDCPP +USE_UCLIBCXX:uclibcxx +USE_LIBSTDCXX:libstdcpp +CXX_DEPENDS = +USE_UCLIBCXX:uclibcxx +USE_LIBSTDCXX:libstdcpp ifneq ($(CONFIG_USE_UCLIBCXX),) ifneq ($(CONFIG_CCACHE),) -- cgit v1.2.3 From a89e0df213de469b6a6fb97312dba500c5acaec6 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 13 May 2013 15:04:58 +0000 Subject: build: add config symbols for different ARM arch levels Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36620 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/target.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/target.mk b/include/target.mk index 107558218..6774076f9 100644 --- a/include/target.mk +++ b/include/target.mk @@ -186,6 +186,7 @@ ifeq ($(DUMP),1) ifneq ($(CONFIG_RTC_CLASS),) FEATURES += rtc endif + FEATURES += $(foreach v,v4 v5 v6 v7,$(if $(findstring -march=arm$(v),$(CFLAGS)),arm_$(v))) # remove duplicates FEATURES:=$(sort $(FEATURES)) -- cgit v1.2.3 From 2b7cc9340a9ee7d66e352990abbf64ef1192b488 Mon Sep 17 00:00:00 2001 From: jogo Date: Sun, 19 May 2013 18:31:51 +0000 Subject: kernel: update 3.9 to 3.9.2 Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36658 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 9733be0f3..b9e63cba1 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -14,8 +14,8 @@ endif ifeq ($(LINUX_VERSION),3.8.12) LINUX_KERNEL_MD5SUM:=a4be720ca9e61445562565856bb5154d endif -ifeq ($(LINUX_VERSION),3.9.1) - LINUX_KERNEL_MD5SUM:=913bbf85c65f3e587a5000763374b4aa +ifeq ($(LINUX_VERSION),3.9.2) + LINUX_KERNEL_MD5SUM:=e406cc1bb5618a4ea88470f4d3d3d6e1 endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From 68518e2d5f06865d48139460695523475f51c18c Mon Sep 17 00:00:00 2001 From: jogo Date: Mon, 20 May 2013 16:57:00 +0000 Subject: kernel: update 3.9 to 3.9.3 Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36676 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b9e63cba1..e883a78aa 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -14,8 +14,8 @@ endif ifeq ($(LINUX_VERSION),3.8.12) LINUX_KERNEL_MD5SUM:=a4be720ca9e61445562565856bb5154d endif -ifeq ($(LINUX_VERSION),3.9.2) - LINUX_KERNEL_MD5SUM:=e406cc1bb5618a4ea88470f4d3d3d6e1 +ifeq ($(LINUX_VERSION),3.9.3) + LINUX_KERNEL_MD5SUM:=266e58f4e2f68f48b906ae109aba4dea endif # disable the md5sum check for unknown kernel versions -- cgit v1.2.3 From 212b5e0e85576b41bde869da1203504d3fc6ec74 Mon Sep 17 00:00:00 2001 From: jow Date: Tue, 21 May 2013 12:58:15 +0000 Subject: netfilter: move time, mark, set matches and MARK, REDIRECT, SET targets into base iptables package - drop iptables-mod-ipset git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36683 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/netfilter.mk | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/netfilter.mk b/include/netfilter.mk index 15f1198ab..74c279bfb 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -36,7 +36,7 @@ $(eval $(if $(NF_KMOD),$(call nf_add,IPT_CORE,CONFIG_IP_NF_FILTER, $(P_V4)iptabl $(eval $(if $(NF_KMOD),$(call nf_add,IPT_CORE,CONFIG_IP_NF_MANGLE, $(P_V4)iptable_mangle),)) # userland only -$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CORE,CONFIG_IP_NF_IPTABLES, xt_standard ipt_icmp xt_tcp xt_udp xt_comment))) +$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CORE,CONFIG_IP_NF_IPTABLES, xt_standard ipt_icmp xt_tcp xt_udp xt_comment xt_set xt_SET))) $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_LIMIT, $(P_XT)xt_limit)) $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_MAC, $(P_XT)xt_mac)) @@ -47,6 +47,14 @@ $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_LOG, $(P_XT)xt_LOG, ge $(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_LOG, $(P_V4)ipt_LOG, lt 3.4.0)) $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_TCPMSS, $(P_XT)xt_TCPMSS)) $(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_REJECT, $(P_V4)ipt_REJECT)) +$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_TIME, $(P_XT)xt_time)) +$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_MARK, $(P_XT)xt_mark)) + +# kernel has xt_MARK.ko merged into xt_mark.ko, userspace is still separate +# kernel: xt_mark.ko +$(eval $(if $(NF_KMOD),$(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_MARK, $(P_XT)xt_mark))) +# userland: xt_MARK.so +$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_MARK, $(P_XT)xt_MARK))) # conntrack @@ -97,21 +105,13 @@ $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, $(P_XT)xt_dscp)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, $(P_XT)xt_DSCP)) $(eval $(call nf_add,IPT_HASHLIMIT,CONFIG_NETFILTER_XT_MATCH_HASHLIMIT, $(P_XT)xt_hashlimit)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_LENGTH, $(P_XT)xt_length)) -$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_MARK, $(P_XT)xt_mark)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_STATISTIC, $(P_XT)xt_statistic)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_TCPMSS, $(P_XT)xt_tcpmss)) -$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_TIME, $(P_XT)xt_time)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_CLASSIFY, $(P_XT)xt_CLASSIFY)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_DSCP, $(P_V4)ipt_dscp)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_ECN, $(P_V4)ipt_ECN)) -# kernel has xt_MARK.ko merged into xt_mark.ko, userspace is still separate -# kernel: xt_mark.ko -$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_MARK, $(P_XT)xt_mark))) -# userland: xt_MARK.so -$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_MARK, $(P_XT)xt_MARK))) - $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_ECN, $(P_XT)xt_ecn)) # userland only @@ -167,14 +167,14 @@ $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT, $(P_V4)nf_nat $(P_V4 $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_NAT,CONFIG_NF_NAT, ipt_SNAT ipt_DNAT))) $(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_MASQUERADE, $(P_V4)ipt_MASQUERADE)) +$(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_REDIRECT, $(P_XT)xt_REDIRECT, ge 3.7.0)) +$(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_REDIRECT, $(P_V4)ipt_REDIRECT, lt 3.7.0)) # nat-extra $(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_NETMAP, $(P_XT)xt_NETMAP, ge 3.7.0)) $(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_NETMAP, $(P_V4)ipt_NETMAP, lt 3.7.0)) -$(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_REDIRECT, $(P_XT)xt_REDIRECT, ge 3.7.0)) -$(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_REDIRECT, $(P_V4)ipt_REDIRECT, lt 3.7.0)) # nathelper -- cgit v1.2.3 From b6f31939e939ac54b915bd6202083d38c4c57b75 Mon Sep 17 00:00:00 2001 From: Roman Yeryomin Date: Thu, 13 Sep 2012 00:26:51 +0300 Subject: lexra platform support for build system Signed-off-by: Roman Yeryomin --- include/kernel-defaults.mk | 6 ++++++ include/kernel.mk | 2 +- include/target.mk | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 9a4dd90ed..043b56865 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -94,6 +94,12 @@ define Kernel/Configure/Default $(LINUX_CONF_CMD) > $(LINUX_DIR)/.config.target # copy CONFIG_KERNEL_* settings over to .config.target awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target +ifeq ($(CONFIG_TARGET_realtek),y) + echo "CONFIG_RTL_FLASH_SIZE=${CONFIG_REALTEK_FLASH_SIZE}" >> $(LINUX_DIR)/.config.target + echo "CONFIG_RTL_LINUX_IMAGE_OFFSET=0x${CONFIG_REALTEK_KERNEL_OFFSET}" >> $(LINUX_DIR)/.config.target + echo "CONFIG_RTL_ROOT_IMAGE_OFFSET=0x${CONFIG_REALTEK_ROOTFS_OFFSET}" >> $(LINUX_DIR)/.config.target + echo "CONFIG_RTL_KERNEL_LOAD_ADDRESS=${CONFIG_REALTEK_KERNEL_LOAD_ADDRESS}" >> $(LINUX_DIR)/.config.target +endif echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> $(LINUX_DIR)/.config.target diff --git a/include/kernel.mk b/include/kernel.mk index b637de591..fc0d3d349 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -66,7 +66,7 @@ ifneq (,$(findstring uml,$(BOARD))) LINUX_KARCH=um else ifeq (,$(LINUX_KARCH)) - LINUX_KARCH=$(strip $(subst i386,x86,$(subst armeb,arm,$(subst mipsel,mips,$(subst mips64,mips,$(subst mips64el,mips,$(subst sh2,sh,$(subst sh3,sh,$(subst sh4,sh,$(ARCH)))))))))) + LINUX_KARCH=$(strip $(subst lexra,rlx,$(subst i386,x86,$(subst armeb,arm,$(subst mipsel,mips,$(subst mips64,mips,$(subst mips64el,mips,$(subst sh2,sh,$(subst sh3,sh,$(subst sh4,sh,$(ARCH))))))))))) endif endif diff --git a/include/target.mk b/include/target.mk index 6774076f9..9b2e2401a 100644 --- a/include/target.mk +++ b/include/target.mk @@ -107,7 +107,12 @@ ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),) include $(INCLUDE_DIR)/kernel-version.mk endif + GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic +ifeq ($(CONFIG_TARGET_realtek),y) +# stop any generic kernel patches being applied +GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/not-generic +endif GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(if $(wildcard $(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)") -- cgit v1.2.3