From e17f103c4d6fddc713c63934e6e5b058b8add046 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Sun, 5 Jun 2016 02:11:34 +0200 Subject: [PATCH 1/2] use @IPV6 instead of +kmod-ipv6 kmod-ipv6 is obsolete. The symbol IPV6 is a global config symbol, don't select it because it will override the user decision of IPV6 as all other package in base do it. A select (+) will also create a recursive dependency error. Signed-off-by: Alexander Couzens --- alfred/Makefile | 2 +- nat46/Makefile | 2 +- ndppd/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alfred/Makefile b/alfred/Makefile index 2e117b3..5701c0a 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 +kmod-ipv6 +librt \ + DEPENDS:= +libc @IPV6 +librt \ +ALFRED_NEEDS_lua:lua \ +ALFRED_NEEDS_libgps:libgps endef diff --git a/nat46/Makefile b/nat46/Makefile index 65b92c2..9f08b07 100644 --- a/nat46/Makefile +++ b/nat46/Makefile @@ -37,7 +37,7 @@ define Package/464xlat endef define KernelPackage/nat46 - DEPENDS:=+kmod-ipv6 + DEPENDS:=@IPV6 TITLE:=Stateless NAT46 translation kernel module SECTION:=kernel SUBMENU:=Network Support diff --git a/ndppd/Makefile b/ndppd/Makefile index ebc764c..b19edeb 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 - DEPENDS:=+kmod-ipv6 $(CXX_DEPENDS) + DEPENDS:=@IPV6 $(CXX_DEPENDS) endef define Package/ndppd/description From 9b610a90c61cb2a5ec73bc95e5a46cd4b4375aef Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Sun, 5 Jun 2016 02:13:13 +0200 Subject: [PATCH 2/2] replace DEPENDS=+@IPV6 with DEPENDS=@IPV6 The symbol IPV6 is a global config symbol, don't select it because it will override the user decision of IPV6 as all other package in base do it. A select (+) will also create a recursive dependency error. Signed-off-by: Alexander Couzens --- ahcpd/Makefile | 2 +- babeld/Makefile | 2 +- hnetd/Makefile | 2 +- minimalist-pcproxy/Makefile | 2 +- pimbd/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ahcpd/Makefile b/ahcpd/Makefile index 96b8475..043c609 100644 --- a/ahcpd/Makefile +++ b/ahcpd/Makefile @@ -25,7 +25,7 @@ define Package/ahcpd TITLE:=Ad-Hoc Configuration Protocol daemon URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/ MAINTAINER:=Gabriel Kerneis - DEPENDS:=+@IPV6 +ip +librt + DEPENDS:=@IPV6 +ip +librt endef define Package/ahcpd/description diff --git a/babeld/Makefile b/babeld/Makefile index 88a7886..69fb1e9 100644 --- a/babeld/Makefile +++ b/babeld/Makefile @@ -25,7 +25,7 @@ define Package/babeld TITLE:=A loop-free distance-vector routing protocol URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/babel/ MAINTAINER:=Gabriel Kerneis - DEPENDS:=+@IPV6 + DEPENDS:=@IPV6 endef define Package/babeld/description diff --git a/hnetd/Makefile b/hnetd/Makefile index ebba0e7..7fc8b9b 100644 --- a/hnetd/Makefile +++ b/hnetd/Makefile @@ -38,7 +38,7 @@ define Package/hnetd/Default TITLE:=HNCP Homenet daemon - $(2) URL:=https://github.com/sbyx/hnetd DEPENDS:=+odhcpd +odhcp6c +netifd $(3) - DEPENDS+=+@IPV6 + DEPENDS+=@IPV6 VARIANT:=$1 endef diff --git a/minimalist-pcproxy/Makefile b/minimalist-pcproxy/Makefile index d0c2f06..36faa8d 100644 --- a/minimalist-pcproxy/Makefile +++ b/minimalist-pcproxy/Makefile @@ -27,7 +27,7 @@ define Package/minimalist-pcproxy CATEGORY:=Network TITLE:=Lightweight PCP proxy URL:=https://github.com/fingon/minimalist-pcproxy - DEPENDS:=+libubox +@IPV6 + DEPENDS:=+libubox @IPV6 endef define Package/minimalist-pcproxy/description diff --git a/pimbd/Makefile b/pimbd/Makefile index 55aec74..9f97107 100644 --- a/pimbd/Makefile +++ b/pimbd/Makefile @@ -24,7 +24,7 @@ define Package/pimbd CATEGORY:=Network TITLE:=PIM BIDIR daemon URL:=https://github.com/Oryon/pimbd.git - DEPENDS+=+@IPV6 + DEPENDS+=@IPV6 DEPENDS+=netifd endef