Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #14656 from stintel/miniupnpd

Browse source 
miniupnpd: introduce IGDv1 variant
This commit is contained in:
Rosen Penev 2021-04-16 18:24:36 -07:00 committed by GitHub
commit 37f4d88cf2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
net/miniupnpd/Makefile
View file

@ -26,7 +26,7 @@ PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/version.mk
define Package/miniupnpd define Package/miniupnpd/Default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+iptables +libip4tc +IPV6:libip6tc +IPV6:ip6tables +libuuid +libcap-ng DEPENDS:=+iptables +libip4tc +IPV6:libip6tc +IPV6:ip6tables +libuuid +libcap-ng
@ -35,10 +35,26 @@ define Package/miniupnpd
URL:=https://miniupnp.tuxfamily.org/ URL:=https://miniupnp.tuxfamily.org/
endef endef
define Package/miniupnpd
$(call Package/miniupnpd/Default)
TITLE+= (IGDv2)
CONFLICTS:=miniupnpd-igdv1
VARIANT:=igdv2
endef
define Package/miniupnpd-igdv1
$(call Package/miniupnpd/Default)
TITLE+= (IGDv1)
PROVIDES:=miniupnpd
VARIANT:=igdv1
endef
define Package/miniupnpd/conffiles define Package/miniupnpd/conffiles
/etc/config/upnpd /etc/config/upnpd
endef endef
Package/miniupnpd-igdv1/conffiles = $(Package/miniupnpd/conffiles)
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)
echo "$(VERSION_NUMBER)" | tr '() ' '_' >$(PKG_BUILD_DIR)/os.openwrt echo "$(VERSION_NUMBER)" | tr '() ' '_' >$(PKG_BUILD_DIR)/os.openwrt
@ -46,12 +62,15 @@ endef
CONFIGURE_ARGS = \ CONFIGURE_ARGS = \
$(if $(CONFIG_IPV6),--ipv6) \ $(if $(CONFIG_IPV6),--ipv6) \
--igd2 \
--leasefile \ --leasefile \
--portinuse \ --portinuse \
--firewall=iptables \ --firewall=iptables \
--disable-fork --disable-fork
ifeq ($(BUILD_VARIANT),igdv2)
CONFIGURE_ARGS += --igd2
endif
TARGET_CFLAGS += $(FPIC) -flto TARGET_CFLAGS += $(FPIC) -flto
TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
@ -71,4 +90,7 @@ define Package/miniupnpd/install
$(INSTALL_DATA) ./files/firewall.include $(1)/usr/share/miniupnpd/firewall.include $(INSTALL_DATA) ./files/firewall.include $(1)/usr/share/miniupnpd/firewall.include
endef endef
Package/miniupnpd-igdv1/install = $(Package/miniupnpd/install)
$(eval $(call BuildPackage,miniupnpd)) $(eval $(call BuildPackage,miniupnpd))
$(eval $(call BuildPackage,miniupnpd-igdv1))