unetd: fix PKG_MIRROR_HASH

[openwrt/staging/nbd.git] / package / network / services / unetd / Makefile

diff --git a/package/network/services/unetd/Makefile b/package/network/services/unetd/Makefile
index 3a61ed43bb5a573eb635351d5df35541837f104d..680b8b7b3ca3e840256658e5000ded757bbda3d1 100644 (file)
--- a/package/network/services/unetd/Makefile
+++ b/package/network/services/unetd/Makefile
@@ -10,17 +10,19 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=unetd
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/unetd.git
-PKG_SOURCE_DATE:=2022-08-25
-PKG_SOURCE_VERSION:=d8220b098010041232374761fee258a8deff0865
-PKG_MIRROR_HASH:=6efced0eb451f6ac5d7facec3f45ce7f6928fae4481650ffcebf3b6434478550
+PKG_SOURCE_DATE:=2024-03-31
+PKG_SOURCE_VERSION:=806457664ab6e952a7f4febb82e891f596fe577c
+PKG_MIRROR_HASH:=a62bef497078c7b825f11fc8358c1a43f5db3e6d4b97812044f7653d60747d5b
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
-PKG_BUILD_DEPENDS:=bpf-headers
+PKG_BUILD_DEPENDS:=HAS_BPF_TOOLCHAIN:bpf-headers
 
 PKG_BUILD_PARALLEL:=1
 
+PKG_CONFIG_DEPENDS += CONFIG_UNETD_VXLAN_SUPPORT
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 include $(INCLUDE_DIR)/bpf.mk
@@ -30,13 +32,29 @@ define Package/unetd
   SECTION:=net
   CATEGORY:=Network
   TITLE:=WireGuard based VPN connection manager for OpenWrt
-  DEPENDS:=+libubox +libubus +libblobmsg-json +libnl-tiny +kmod-wireguard +libbpf $(BPF_DEPENDS)
+  DEPENDS:=+libubox +libubus +libblobmsg-json +libnl-tiny +kmod-wireguard +UNETD_VXLAN_SUPPORT:libbpf
+endef
+
+define Package/unetd/config
+       config UNETD_VXLAN_SUPPORT
+               bool "VXLAN support"
+               depends on PACKAGE_unetd
+               depends on HAS_BPF_TOOLCHAIN
+               default y
+
+endef
+
+define Package/unet-dht
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=unetd
+  TITLE:=unetd DHT discovery support
 endef
 
 define Package/unet-cli
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=unetd +ucode +ucode-mod-fs
+  DEPENDS:=+unetd +ucode +ucode-mod-fs
   TITLE:=unetd administration command line utility
 endef
 
@@ -45,12 +63,15 @@ TARGET_CFLAGS += \
        -I$(STAGING_DIR)/usr/include
 
 CMAKE_OPTIONS += \
-       -DLIBNL_LIBS=-lnl-tiny
+       -DLIBNL_LIBS=-lnl-tiny \
+       -DVXLAN_SUPPORT=$(if $(CONFIG_UNETD_VXLAN_SUPPORT),ON,OFF)
 
-define Build/Compile
+ifdef CONFIG_UNETD_VXLAN_SUPPORT
+  define Build/Compile
        $(call CompileBPF,$(PKG_BUILD_DIR)/mss-bpf.c)
        $(call Build/Compile/Default,)
-endef
+  endef
+endif
 
 define Package/unetd/conffiles
 /etc/unetd
@@ -69,15 +90,24 @@ define Package/unetd/install
                $(PKG_INSTALL_DIR)/usr/sbin/unetd \
                $(PKG_INSTALL_DIR)/usr/sbin/unet-tool \
                $(1)/usr/sbin/
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/mss-bpf.o $(1)/lib/bpf/mss.o
+       $(if $(CONFIG_UNETD_VXLAN_SUPPORT),$(INSTALL_DATA) $(PKG_BUILD_DIR)/mss-bpf.o $(1)/lib/bpf/mss.o)
        $(INSTALL_BIN) ./files/unetd.init $(1)/etc/init.d/unetd
        $(INSTALL_BIN) ./files/unetd.sh $(1)/lib/netifd/proto
 endef
 
+define Package/unet-dht/install
+       $(INSTALL_DIR) \
+               $(1)/etc/init.d \
+               $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/unet-dht $(1)/usr/sbin
+       $(INSTALL_BIN) ./files/unet-dht.init $(1)/etc/init.d/unet-dht
+endef
+
 define Package/unet-cli/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/unet-cli $(1)/usr/sbin
 endef
 
 $(eval $(call BuildPackage,unetd))
+$(eval $(call BuildPackage,unet-dht))
 $(eval $(call BuildPackage,unet-cli))