Revert "kmod-ipv6 => @IPV6."

This reverts commit bcaa87776f2eb2eb54675b2dca152d23625089ad.

Caused circular dependencies; reverted for now. (kmod-ipv6 explicit
dependencies _should_ be eliminated though, but this is clearly not
the way.)

diff --git a/alfred/Makefile b/alfred/Makefile
index da4085e259d781295721257104bba1bfe0339f97..8f49b5af5eb4a03e36f1dcbdc0f8b0cdb70a71b4 100644 (file)
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -28,7 +28,7 @@ define Package/alfred
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A.L.F.R.E.D. - Almighty Lightweight Fact Remote Exchange Daemon
-  DEPENDS:= +libc +@IPV6 +librt \
+  DEPENDS:= +libc +kmod-ipv6 +librt \
          +ALFRED_NEEDS_lua:lua \
          +ALFRED_NEEDS_libgps:libgps
 endef

diff --git a/cjdns/Makefile b/cjdns/Makefile
index 824f378e7e6e192600d435d8d53035da50b01ba0..9acc3cccd6119423d1115d5a7358c44c6db8a266 100644 (file)
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -38,7 +38,7 @@ define Package/cjdns
        TITLE:=Encrypted near-zero-conf mesh routing protocol
        URL:=https://github.com/hyperboria/cjdns
        MAINTAINER:=Lars Gierth <larsg@systemli.org>
-       DEPENDS:=+kmod-tun +@IPV6 +libnl-tiny +libpthread +librt \
+       DEPENDS:=+kmod-tun +kmod-ipv6 +libnl-tiny +libpthread +librt \
                +libuci-lua +lua-bencode +dkjson +luasocket +lua-sha2
 endef
 

diff --git a/nat46/Makefile b/nat46/Makefile
index dbe6e6792e11ecbf07c0cbf8de3e0c33fe0ea684..65b92c2dd08101611fe20b8db944c58f0159790a 100644 (file)
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -37,11 +37,11 @@ define Package/464xlat
 endef
 
 define KernelPackage/nat46
-  DEPENDS:=+@IPV6
+  DEPENDS:=+kmod-ipv6
   TITLE:=Stateless NAT46 translation kernel module
   SECTION:=kernel
   SUBMENU:=Network Support
-  FILES:=$(PKG_BUILD_DIR)/nat46/modules/nat46.ko
+  FILES:=$(PKG_BUILD_DIR)/nat46/modules/nat46.ko 
   AUTOLOAD:=$(call AutoLoad,33,nat46)
 endef
 

diff --git a/ndppd/Makefile b/ndppd/Makefile
index 0d0a44a4165c7ba454ab77849c4b71255fe34e12..ebc764c2fad8b5e7c611d79290836b4a489362ba 100644 (file)
--- a/ndppd/Makefile
+++ b/ndppd/Makefile
@@ -32,7 +32,7 @@ define Package/ndppd
   TITLE:=NDP Proxy Daemon
   URL:=http://www.priv.nu/projects/ndppd/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-  DEPENDS:=+@IPV6 $(CXX_DEPENDS)
+  DEPENDS:=+kmod-ipv6 $(CXX_DEPENDS)
 endef
 
 define Package/ndppd/description