netifd: fix deletion of ip tunnels (FS#4058)

[openwrt/staging/jow.git] / package / network / config / netifd / Makefile

diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
index 253b3428978d8d1994dee6bf2141c0b6cbc559b9..e4399b24737bb5465f8d01acf1eb60661b8eabf7 100644 (file)
--- a/package/network/config/netifd/Makefile
+++ b/package/network/config/netifd/Makefile
@@ -4,17 +4,15 @@ PKG_NAME:=netifd
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=$(LEDE_GIT)/project/netifd.git
-PKG_SOURCE_DATE:=2017-12-15
-PKG_SOURCE_VERSION:=4268193c90bdd1532ee0555dd109a43eb8524b04
-PKG_MIRROR_HASH:=4f577ed5838ed9e33cc8c263198bc2b1d4f222e8259a2bbae367d67b10705a9e
+PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
+PKG_SOURCE_DATE:=2021-10-30
+PKG_SOURCE_VERSION:=8f82742ca4f47f459284f3a07323d04da72ea5f6
+PKG_MIRROR_HASH:=5e519bb1aec9bb30782213f32f19f12e874c909e42826618dd4332ded816d2fe
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=
 
-PKG_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
@@ -25,9 +23,17 @@ define Package/netifd
   TITLE:=OpenWrt Network Interface Configuration Daemon
 endef
 
+define Package/netifd/conffiles
+/etc/udhcpc.user
+/etc/udhcpc.user.d/
+endef
+
 TARGET_CFLAGS += \
        -I$(STAGING_DIR)/usr/include/libnl-tiny \
-       -I$(STAGING_DIR)/usr/include
+       -I$(STAGING_DIR)/usr/include \
+       -flto
+
+TARGET_LDFLAGS += -flto -fuse-linker-plugin
 
 CMAKE_OPTIONS += \
        -DLIBNL_LIBS=-lnl-tiny \
@@ -37,6 +43,7 @@ define Package/netifd/install
        $(INSTALL_DIR) $(1)/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/netifd $(1)/sbin/
        $(CP) ./files/* $(1)/
+       $(INSTALL_DIR) $(1)/etc/udhcpc.user.d/
        $(CP) $(PKG_BUILD_DIR)/scripts/* $(1)/lib/netifd/
 endef