From: Daniel Golle <redacted>
Date: Thu, 4 Jun 2015 23:27:52 +0000 (+0200)
Subject: gnunet: don't override default to 'n'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7582a91760148e32a453ebfa6b3f57c76addef45;p=openwrt-packages.git

gnunet: don't override default to 'n'

Overriding DEFAULT to 'n' prevents packages being build unless
explicitely selected even if ALL is set.
Instead, set 'DEFAULT:=y if PACKAGE_gnunet' for the default
packages and otherweise don't touch DEFAULT.

Signed-off-by: Daniel Golle <redacted>
---

diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index 455f792b2..7605a5acf 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -84,7 +84,7 @@ define BuildComponent
     $$(call Package/gnunet/Default)
     TITLE+= $(2)
     DEPENDS:=gnunet $(DEPENDS_$(1))
-    DEFAULT:=$(3)
+    $(if $(3),DEFAULT:=y if PACKAGE_gnunet)
   endef
 
   define Package/gnunet-$(1)/install
@@ -222,11 +222,11 @@ LIBEXEC_vpn:=daemon-exit daemon-pt helper-exit  helper-vpn service-vpn
 CONF_vpn:=exit pt vpn
 
 $(eval $(call BuildPackage,gnunet))
-$(eval $(call BuildComponent,conversation,conversation component,n))
-$(eval $(call BuildComponent,experiments,experimental components,n))
-$(eval $(call BuildComponent,fs,file-sharing components,n))
-$(eval $(call BuildComponent,gns,name resolving components,y))
-$(eval $(call BuildComponent,storage,storage components,n))
-$(eval $(call BuildComponent,transport-bluetooth,bluetooth transport,n))
-$(eval $(call BuildComponent,utils,administration utililties,n))
+$(eval $(call BuildComponent,conversation,conversation component,))
+$(eval $(call BuildComponent,experiments,experimental components,))
+$(eval $(call BuildComponent,fs,file-sharing components,))
+$(eval $(call BuildComponent,gns,name resolution components,y))
+$(eval $(call BuildComponent,storage,storage components,))
+$(eval $(call BuildComponent,transport-bluetooth,bluetooth transport,))
+$(eval $(call BuildComponent,utils,administration utililties,))
 $(eval $(call BuildComponent,vpn,vpn components,y))