X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=nat46%2FMakefile;h=3af871843452f833e1b6404818e1e214ed4cbf8c;hb=51d732e30cb720c8745eec465892b6d5feaaffaf;hp=5bebd9b0fe3a3450784a1c1811f9135f8c6df1ee;hpb=67e007138a28e9d5e06bc854e40efcaeda3c5ce3;p=feed%2Frouting.git

diff --git a/nat46/Makefile b/nat46/Makefile
index 5bebd9b..3af8718 100644
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,14 +9,15 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=nat46
-PKG_VERSION:=2
+PKG_VERSION:=9
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_MIRROR_HASH:=43b7004bfa2c830d6025386bc2128015db0012277fd015f4ee44b9ee3b772a12
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5589212cb35527929fd66218721ab54040c6b788
+PKG_SOURCE_VERSION:=683fbd2b765506332a1af141545652bf58f03166
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=GPL-2.0
 
@@ -29,8 +30,15 @@ define Package/map-t
   TITLE:=MAP-T configuration support
 endef
 
+define Package/464xlat
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+kmod-nat46
+  TITLE:=464xlat CLAT support
+endef
+
 define KernelPackage/nat46
-  DEPENDS:=+kmod-ipv6
+  DEPENDS:=@IPV6
   TITLE:=Stateless NAT46 translation kernel module
   SECTION:=kernel
   SUBMENU:=Network Support
@@ -40,7 +48,16 @@ endef
 
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
 define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) -Wall" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
 	$(MAKE) $(KERNEL_MAKEOPTS) SUBDIRS="$(PKG_BUILD_DIR)/nat46/modules" \
 		MODFLAGS="-DMODULE -mlong-calls" \
 		EXTRA_CFLAGS="-DNAT46_VERSION=\\\"$(PKG_SOURCE_VERSION)\\\"" \
@@ -51,5 +68,13 @@ define Package/map-t/install
 	true
 endef
 
+define Package/464xlat/install
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/464xlat.sh $(1)/lib/netifd/proto/464xlat.sh
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/464xlatcfg $(1)/sbin
+endef
+
 $(eval $(call KernelPackage,nat46))
 $(eval $(call BuildPackage,map-t))
+$(eval $(call BuildPackage,464xlat))