From: David Härdeman <david@hardeman.nu>
Date: Wed, 5 Nov 2025 09:05:36 +0000 (+0100)
Subject: odhcpd: update Makefile, remove homenet
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=002e22b069357cea86e949fd720f037158b778f1;p=openwrt%2Fstaging%2Fblocktrron.git

odhcpd: update Makefile, remove homenet

The support has been removed from odhcpd, so remove the Makefile options
related to homenet.

Signed-off-by: David Härdeman <david@hardeman.nu>
Link: https://github.com/openwrt/openwrt/pull/20673
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---

diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile
index 3f8b02314d..33d27686a6 100644
--- a/package/network/services/odhcpd/Makefile
+++ b/package/network/services/odhcpd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=odhcpd
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git
@@ -19,7 +19,6 @@ PKG_SOURCE_VERSION:=d44af6dd8f4e1dd0d858ae19419057ab4f319310
 PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
 PKG_LICENSE:=GPL-2.0
 
-PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_odhcpd_$(BUILD_VARIANT)_ext_cer_id
 PKG_ASLR_PIE_REGULAR:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -38,27 +37,14 @@ define Package/odhcpd/default/description
  requirements for IPv6 home routers.
 endef
 
-define Package/odhcpd/default/config
-menu "Configuration"
-	depends on PACKAGE_$(1)
-
-config PACKAGE_odhcpd_$(2)_ext_cer_id
-	int
-	default 0
-	prompt "CER-ID Extension ID (0 = disabled)"
-endmenu
-endef
-
 define Package/odhcpd
-  $(call Package/odhcpd/default)
+  $(Package/odhcpd/default)
   TITLE += and DHCPv4 server
   VARIANT:=full
 endef
 
-Package/odhcpd/config=$(call Package/odhcpd/default/config,odhcpd,full)
-
 define Package/odhcpd/description
- $(call Package/odhcpd/default/description)
+ $(Package/odhcpd/default/description)
 
  This is a variant providing server services for DHCPv4, RA, stateless and
  stateful DHCPv6,  prefix delegation and can be used to relay RA, DHCPv6 and
@@ -67,15 +53,13 @@ define Package/odhcpd/description
 endef
 
 define Package/odhcpd-ipv6only
-  $(call Package/odhcpd/default)
+  $(Package/odhcpd/default)
   VARIANT:=ipv6only
   DEPENDS+= @IPV6
 endef
 
-Package/odhcpd-ipv6only/config=$(call Package/odhcpd/default/config,odhcpd-ipv6only,ipv6only)
-
 define Package/odhcpd-ipv6only/description
- $(call Package/odhcpd/default/description)
+ $(Package/odhcpd/default/description)
 
  This is a variant providing server services for RA, stateless and stateful
  DHCPv6,  prefix delegation and can be used to relay RA, DHCPv6 and NDP between
@@ -88,10 +72,6 @@ ifeq ($(BUILD_VARIANT),full)
   CMAKE_OPTIONS += -DDHCPV4_SUPPORT=1
 endif
 
-ifneq ($(CONFIG_PACKAGE_odhcpd_$(BUILD_VARIANT)_ext_cer_id),0)
-  CMAKE_OPTIONS += -DEXT_CER_ID=$(CONFIG_PACKAGE_odhcpd_$(BUILD_VARIANT)_ext_cer_id)
-endif
-
 define Package/odhcpd/install
 	$(INSTALL_DIR) $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/odhcpd $(1)/usr/sbin/