From 98259c3c9e12b8ad882c79507f5de094e13f1f18 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 27 Feb 2016 19:38:41 +0200 Subject: [PATCH] gnunet: package REST interface, break-up experiments new packages: gnunet-rest, gnunet-rps, gnunet-social also improve package descriptions and maintain order Signed-off-by: Daniel Golle --- net/gnunet/Makefile | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile index 313f1d3d5f..45e99361d9 100644 --- a/net/gnunet/Makefile +++ b/net/gnunet/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnunet PKG_SOURCE_VERSION:=36918 PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION) -PKG_RELEASE:=1 +PKG_RELEASE:=2 # ToDo: # - break-out {peer,name,data}store for each backend @@ -198,12 +198,9 @@ PLUGIN_transport-http_server:=transport_http_server transport_https_server PLUGIN_transport-wlan:=transport_wlan LIBEXEC_transport-wlan:=helper-transport-wlan -DEPENDS_experiments:=+libglpk +gnunet-sqlite -BIN_experiments:=multicast rps -LIB_experiments:=consensus env multicast psyc psycstore psycutil rps secretsharing social -PLUGIN_experiments:=ats_mlp ats_ril psycstore_sqlite -LIBEXEC_experiments:=service-consensus service-dht-whanau service-dht-xvine service-evil-consensus service-multicast service-psyc service-psycstore service-rps service-secretsharing service-social -CONF_experiments:=consensus multicast psyc psycstore rps secretsharing social +DEPENDS_experiments:=+libglpk +PLUGIN_experiments:=ats_mlp ats_ril +LIBEXEC_experiments:=service-dht-whanau service-dht-xvine # BIN_dv:=dv LIB_dv:=dv @@ -244,6 +241,24 @@ DEPENDS_pgsql:=+gnunet-gns +gnunet-datastore +libpq LIB_pgsql:=postgres pq PLUGIN_pgsql:=datacache_postgres datastore_postgres namecache_postgres namestore_postgres +DEPENDS_rest:=+gnunet-gns +jansson +LIB_rest:=rest +PLUGIN_rest:=rest_gns rest_identity rest_namestore +LIBEXEC_rest:=rest-server +CONF_rest:=rest + +BIN_rps:=rps +LIB_rps:=rps +LIBEXEC_rps:=service-rps +CONF_rps:=rps + +DEPENDS_social:=+gnunet-sqlite +BIN_social:=multicast +LIB_social:=consensus multicast psyc psycstore psycutil secretsharing social +PLUGIN_social:=psycstore_sqlite +LIBEXEC_social:=service-consensus service-evil-consensus service-multicast service-psyc service-psycstore service-secretsharing service-social +CONF_social:=consensus multicast psyc psycstore secretsharing social + DEPENDS_sqlite:=+gnunet-gns +gnunet-datastore +libsqlite3 PLUGIN_sqlite:=datacache_sqlite datastore_sqlite namecache_sqlite namestore_sqlite peerstore_sqlite @@ -262,18 +277,21 @@ CONF_vpn:=exit pt vpn $(eval $(call BuildPackage,gnunet)) $(eval $(call BuildComponent,conversation,conversation component,)) -$(eval $(call BuildComponent,experiments,experimental components,)) +$(eval $(call BuildComponent,datastore,data storage components,)) $(eval $(call BuildComponent,dv,distance-vector routing component,)) +$(eval $(call BuildComponent,experiments,experimental components,)) +$(eval $(call BuildComponent,flat,flat storage backends,)) $(eval $(call BuildComponent,fs,file-sharing components,)) $(eval $(call BuildComponent,gns,name resolution components,y)) -$(eval $(call BuildComponent,datastore,storage components,)) +$(eval $(call BuildComponent,mysql,mySQL datastore backend,)) +$(eval $(call BuildComponent,pgsql,PostgreSQL storage backends,)) +$(eval $(call BuildComponent,rest,REST interface,)) +$(eval $(call BuildComponent,rps,RPS routing component,)) +$(eval $(call BuildComponent,social,social components,)) +$(eval $(call BuildComponent,sqlite,libsqlite3 storage backends,y)) $(eval $(call BuildComponent,transport-bluetooth,bluetooth transport,)) $(eval $(call BuildComponent,transport-http_client,HTTP/HTTPS client transport,y)) $(eval $(call BuildComponent,transport-http_server,HTTP/HTTPS server transport,)) $(eval $(call BuildComponent,transport-wlan,WLAN transport,)) $(eval $(call BuildComponent,utils,administration utililties,)) $(eval $(call BuildComponent,vpn,vpn components,y)) -$(eval $(call BuildComponent,flat,flat storage backends,)) -$(eval $(call BuildComponent,mysql,mySQL datastore backend,)) -$(eval $(call BuildComponent,pgsql,PostgreSQL backends,)) -$(eval $(call BuildComponent,sqlite,libsqlite3 backends,y))