OpenWRT
/
openwrt
mirror of https://github.com/openwrt/openwrt.git
1
0
Fork 0
Code Issues Releases Wiki Activity

odhcpd: make the full variant displace odhcpd-ipv6only 

Both variants install the same files, so selecting both breaks image
assembly. Let odhcpd provide odhcpd-ipv6only and mark the latter
DEFAULT_VARIANT: the generated conflict demotes odhcpd-ipv6only when
odhcpd is selected, and under apk the versioned provide enforces a
single instance. Imagebuilder users pass -odhcpd-ipv6only alongside
odhcpd.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
pull/25140/head
Daniel Golle 2026-08-22 17:51:34 +01:00
parent 0d754ca55b
commit 1f7eb34c53
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/network/services/odhcpd/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=odhcpd
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git
@ -40,6 +40,7 @@ define Package/odhcpd
$(Package/odhcpd/default)
TITLE:=OpenWrt DHCPv4/DHCPv6/NDP/RA server
VARIANT:=full
PROVIDES:=odhcpd-ipv6only
endef
define Package/odhcpd/description
@ -54,6 +55,7 @@ define Package/odhcpd-ipv6only
$(Package/odhcpd/default)
TITLE:=OpenWrt DHCPv6/NDP/RA server (without DHCPv4)
VARIANT:=ipv6only
DEFAULT_VARIANT:=1
DEPENDS+=@IPV6
endef