summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Stenberg2015-12-11 22:25:10 +0000
committerMarkus Stenberg2015-12-11 22:25:10 +0000
commit5cd413d16a802f0257cf92d0b5772d9b60863a3a (patch)
tree733f5e5c799ff5e44afc6e8d29d5af286c295afa
parentbcaa87776f2eb2eb54675b2dca152d23625089ad (diff)
downloadrouting-5cd413d16a802f0257cf92d0b5772d9b60863a3a.tar.gz
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.)
-rw-r--r--alfred/Makefile2
-rw-r--r--cjdns/Makefile2
-rw-r--r--nat46/Makefile4
-rw-r--r--ndppd/Makefile2
4 files changed, 5 insertions, 5 deletions
diff --git a/alfred/Makefile b/alfred/Makefile
index da4085e..8f49b5a 100644
--- 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 824f378..9acc3cc 100644
--- 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 dbe6e67..65b92c2 100644
--- 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 0d0a44a..ebc764c 100644
--- 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