hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2026-01-04 02:42:10 -05:00
Code Issues Projects Releases Wiki Activity

build: provide virtual self in kmods

Browse Source 
Add an implicit self-provide to kmods. apk can't handle self provides,
be it versioned or virtual, so opt for a prefix and a suffix instead.
Package name without a prefix/suffix is too generic and might conflict
with other packages, e.g. wireguard. This allows several variants to
provide the same virtual package without adding extra provides to the
default one, e.g. r8169 implicitly provides kmod-r8169-any and is marked
as default, so r8125 can explicitly provide @kmod-r8169-any as well.

Signed-off-by: George Sapkin <george@sapk.in>
Link: https://github.com/openwrt/openwrt/pull/21288
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
George Sapkin 2025-12-28 17:22:41 +02:00 committed by Robert Marko
parent 5ed650acbf
commit 9b37b7185c
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/kernel.mk
View File

@ -219,6 +219,15 @@ define KernelPackage
$(call KernelPackage/$(1))
$(call KernelPackage/$(1)/$(BOARD))
$(call KernelPackage/$(1)/$(BOARD)/$(SUBTARGET))
# Add an implicit self-provide. apk can't handle self provides, be it
# versioned or virtual, so opt for a prefix and a suffix instead. Package
# name without a prefix/suffix is too generic and might conflict with other
# packages, e.g. wireguard. This allows several variants to provide the same
# virtual package without adding extra provides to the default one, e.g.
# r8169 implicitly provides kmod-r8169-any and is marked as default, so
# r8125 can explicitly provide @kmod-r8169-any as well.
PROVIDES+=@kmod-$(1)-any
endef
ifdef KernelPackage/$(1)/conffiles
@ -306,4 +315,3 @@ kernel_patchver_ge=$(call kernel_version_cmp,-ge,$(KERNEL_PATCHVER),$(1))
kernel_patchver_eq=$(call kernel_version_cmp,-eq,$(KERNEL_PATCHVER),$(1))
kernel_patchver_le=$(call kernel_version_cmp,-le,$(KERNEL_PATCHVER),$(1))
kernel_patchver_lt=$(call kernel_version_cmp,-lt,$(KERNEL_PATCHVER),$(1))

5
include/package-pack.mk
View File

@ -134,10 +134,13 @@ endef
#
# - apk doesn't like it when packages specify a redundant provide pointing to
# self. Filter it out, but keep virtual self provides, in the form of
# @${package_name}-any.
# @(kmod-)?${package_name}-any.
#
# - Packages implicitly add a virtual @${package_name}-any provide in Package.
#
# - kmods implicitly add a virtual @kmod-${package_name}-any provide in
# KernelPackage.
#
# 1: package name
# 2: package version
# 3: list of provides