On Sat, 2012-12-15 at 11:56 +0100, John Crispin wrote: > i pushed the lantiq 3.7 kernel support last night.
A bunch of things break with the 3.7 kernel. This addresses a few of
them, but there's more. In particular, a lot of NAT stuff is no longer
specific to Legacy IP — we have IPV6 NAT support now :(
And even with the header fixed so it *attempts* to build, ipset doesn't
actually build any more either.
I also removed 604-netfilter_cisco_794x_iphone.patch because it's
broken.
diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index d824295..2fed357 100644
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -335,6 +335,9 @@ $(eval $(call KernelPackage,crypto-sha1))
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1)
camellia_mod_suffix=_generic
endif
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1)
+cast56_mod_suffix=_generic
+endif
define KernelPackage/crypto-misc
TITLE:=Other CryptoAPI modules
@@ -359,8 +362,8 @@ define KernelPackage/crypto-misc
FILES:= \
$(LINUX_DIR)/crypto/anubis.ko \
$(LINUX_DIR)/crypto/camellia$(camellia_mod_suffix).ko \
- $(LINUX_DIR)/crypto/cast5.ko \
- $(LINUX_DIR)/crypto/cast6.ko \
+ $(LINUX_DIR)/crypto/cast5$(cast56_mod_suffix).ko \
+ $(LINUX_DIR)/crypto/cast6$(cast56_mod_suffix).ko \
$(LINUX_DIR)/crypto/fcrypt.ko \
$(LINUX_DIR)/crypto/khazad.ko \
$(LINUX_DIR)/crypto/sha256_generic.ko \
diff --git a/package/network/utils/ipset/Makefile
b/package/network/utils/ipset/Makefile
index 273ef9d..a044f62 100644
--- a/package/network/utils/ipset/Makefile
+++ b/package/network/utils/ipset/Makefile
@@ -57,6 +57,14 @@ IPSET_MODULES:= \
ipset/ip_set_list_set \
xt_set \
+
+define Build/Patch
+ $(call Build/Patch/Default)
+ if [ -r $(LINUX_DIR)/include/uapi/linux/netfilter/nfnetlink.h ]; then \
+ sed s:linux/netfilter:uapi/linux/netfilter: -i
$(PKG_BUILD_DIR)/configure.ac $(PKG_BUILD_DIR)/configure ; \
+ fi
+endef
+
define Build/Compile
$(call Build/Compile/Default)
$(call Build/Compile/Default,modules)
diff --git a/target/linux/generic/config-3.7 b/target/linux/generic/config-3.7
index b572515..62d6794 100644
--- a/target/linux/generic/config-3.7
+++ b/target/linux/generic/config-3.7
@@ -188,6 +188,7 @@ CONFIG_BASE_SMALL=0
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_DS2760 is not set
# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
--
dwmw2
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
