kernal-vars: introduce new class
PATCH 1/19 kernal-vars: introduce new class
This class is introduced to fix an issue
when KERNEL_PACKAGE_NAME is changed.
A number of recipes rely on hard coded
kernel prefix set by KERNEL_PACKAGE_NAME
when including modules. This leads to build
time failures.
Such as
ERROR: Nothing RPROVIDES 'kernel-module-*'
--- meta/classes-recipe/kernel-vars.bbclass | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 meta/classes-recipe/kernel-vars.bbclass
meta/classes-recipe/kernel-vars.bbclass new file +7 -0
@@ -0,0 +1,7 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +KERNEL_PACKAGE_NAME ??= "kernel"
Signature · 1 line
2.43.0
PATCH 2/19 kernel: introduce kernel-vars class
The kernel-vars class allows the caller the opportunity change KERNEL_PACKAGE_NAME and use value globally.
The kernel-vars class is largely for yocto project recipes that are still using the default KERNEL_PACKAGE_NAME prefix.
--- meta/classes-recipe/kernel.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta/classes-recipe/kernel.bbclass +1 -2
@@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -inherit linux-kernel-base kernel-module-split features_check +inherit linux-kernel-base kernel-module-split kernel-vars features_check COMPATIBLE_HOST = ".*-linux"
@@ -12,7 +12,6 @@ COMPATIBLE_HOST = ".*-linux" REQUIRED_TUNE_FEATURES:riscv32 = "rv 32 i m a zicsr zifencei" REQUIRED_TUNE_FEATURES:riscv64 = "rv 64 i m a zicsr zifencei" -KERNEL_PACKAGE_NAME ??= "kernel" KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else d.getVar("KERNEL_PACKAGE_NAME") }" PROVIDES += "virtual/kernel"
Signature · 1 line
2.43.0
PATCH 3/19 packagegroup-self-hosted: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- .../packagegroups/packagegroup-self-hosted.bb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +7 -7
@@ -7,7 +7,7 @@ DESCRIPTION = "Packages required to run the build system" PACKAGE_ARCH = "${TUNE_PKGARCH}" -inherit packagegroup features_check +inherit packagegroup kernel-vars features_check # rdepends on libx11-dev REQUIRED_DISTRO_FEATURES = "x11"
@@ -51,12 +51,12 @@ PSEUDO = "pseudo" PSEUDO:libc-musl = "" RRECOMMENDS:packagegroup-self-hosted-host-tools = "\ - kernel-module-tun \ - kernel-module-iptable-raw \ - kernel-module-iptable-nat \ - kernel-module-iptable-mangle \ - kernel-module-iptable-filter \ - " + ${KERNEL_PACKAGE_NAME}-module-tun \ + ${KERNEL_PACKAGE_NAME}-module-iptable-raw \ + ${KERNEL_PACKAGE_NAME}-module-iptable-nat \ + ${KERNEL_PACKAGE_NAME}-module-iptable-mangle \ + ${KERNEL_PACKAGE_NAME}-module-iptable-filter \ + " RDEPENDS:packagegroup-self-hosted-sdk = "\ autoconf \
Signature · 1 line
2.43.0
PATCH 4/19 packegroup-core-boot: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/packagegroups/packagegroup-core-boot.bb +2 -2
@@ -7,7 +7,7 @@ DESCRIPTION = "The minimal set of packages required to boot the system" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit packagegroup +inherit packagegroup kernel-vars EFI_PROVIDER ??= "grub-efi"
@@ -22,7 +22,7 @@ RDEPENDS:${PN} = "\ ${VIRTUAL-RUNTIME_base-utils} \ ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ - ${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER} kernel", "", d)} \ + ${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER} ${KERNEL_PACKAGE_NAME}", "", d)} \ netbase \ ${VIRTUAL-RUNTIME_login_manager} \ ${VIRTUAL-RUNTIME_init_manager} \
Signature · 1 line
2.43.0
PATCH 5/19 packagegroup-base: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- .../packagegroups/packagegroup-base.bb | 158 +++++++++--------- 1 file changed, 79 insertions(+), 79 deletions(-)
meta/recipes-core/packagegroups/packagegroup-base.bb +79 -79
@@ -5,7 +5,7 @@ SUMMARY = "Merge machine and distro options to create a basic machine task/packa # PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit packagegroup +inherit packagegroup kernel-vars PACKAGES = ' \ packagegroup-base \
@@ -73,13 +73,13 @@ RDEPENDS:packagegroup-base = "\ " RRECOMMENDS:packagegroup-base = "\ - kernel-module-nls-utf8 \ - kernel-module-input \ - kernel-module-uinput \ - kernel-module-rtc-dev \ - kernel-module-rtc-proc \ - kernel-module-rtc-sysfs \ - kernel-module-unix" + ${KERNEL_PACKAGE_NAME}-module-nls-utf8 \ + ${KERNEL_PACKAGE_NAME}-module-input \ + ${KERNEL_PACKAGE_NAME}-module-uinput \ + ${KERNEL_PACKAGE_NAME}-module-rtc-dev \ + ${KERNEL_PACKAGE_NAME}-module-rtc-proc \ + ${KERNEL_PACKAGE_NAME}-module-rtc-sysfs \ + ${KERNEL_PACKAGE_NAME}-module-unix" RDEPENDS:packagegroup-base-extended = "\ packagegroup-base \
@@ -152,10 +152,10 @@ RRECOMMENDS:packagegroup-base-ext2 = "\ SUMMARY:packagegroup-base-vfat = "FAT filesystem support" RRECOMMENDS:packagegroup-base-vfat = "\ - kernel-module-msdos \ - kernel-module-vfat \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-cp437 \ + ${KERNEL_PACKAGE_NAME}-module-msdos \ + ${KERNEL_PACKAGE_NAME}-module-vfat \ + ${KERNEL_PACKAGE_NAME}-module-nls-iso8859-1 \ + ${KERNEL_PACKAGE_NAME}-module-nls-cp437 \ dosfstools" SUMMARY:packagegroup-base-alsa = "ALSA sound support"
@@ -165,8 +165,8 @@ RDEPENDS:packagegroup-base-alsa = "\ ${VIRTUAL-RUNTIME_alsa-state}" RRECOMMENDS:packagegroup-base-alsa = "\ - kernel-module-snd-mixer-oss \ - kernel-module-snd-pcm-oss" + ${KERNEL_PACKAGE_NAME}-module-snd-mixer-oss \ + ${KERNEL_PACKAGE_NAME}-module-snd-pcm-oss" SUMMARY:packagegroup-base-pcmcia = "PC card slot support" RDEPENDS:packagegroup-base-pcmcia = "\
@@ -174,15 +174,15 @@ RDEPENDS:packagegroup-base-pcmcia = "\ " RRECOMMENDS:packagegroup-base-pcmcia = "\ - kernel-module-pcmcia \ - kernel-module-airo-cs \ - kernel-module-pcnet-cs \ - kernel-module-serial-cs \ - kernel-module-ide-cs \ - kernel-module-ide-disk \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" + ${KERNEL_PACKAGE_NAME}-module-pcmcia \ + ${KERNEL_PACKAGE_NAME}-module-airo-cs \ + ${KERNEL_PACKAGE_NAME}-module-pcnet-cs \ + ${KERNEL_PACKAGE_NAME}-module-serial-cs \ + ${KERNEL_PACKAGE_NAME}-module-ide-cs \ + ${KERNEL_PACKAGE_NAME}-module-ide-disk \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', '${KERNEL_PACKAGE_NAME}-module-hostap-cs', '',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', '${KERNEL_PACKAGE_NAME}-module-orinoco-cs', '',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', '${KERNEL_PACKAGE_NAME}-module-spectrum-cs', '',d)}" SUMMARY:packagegroup-base-bluetooth = "Bluetooth support" RDEPENDS:packagegroup-base-bluetooth = "\
@@ -190,46 +190,46 @@ RDEPENDS:packagegroup-base-bluetooth = "\ " RRECOMMENDS:packagegroup-base-bluetooth = "\ - kernel-module-bluetooth \ - kernel-module-l2cap \ - kernel-module-rfcomm \ - kernel-module-hci-vhci \ - kernel-module-bnep \ - kernel-module-hidp \ - kernel-module-hci-uart \ - kernel-module-sco \ - ${@bb.utils.contains('MACHINE_FEATURES', 'usbhost', 'kernel-module-hci-usb', '',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ + ${KERNEL_PACKAGE_NAME}-module-bluetooth \ + ${KERNEL_PACKAGE_NAME}-module-l2cap \ + ${KERNEL_PACKAGE_NAME}-module-rfcomm \ + ${KERNEL_PACKAGE_NAME}-module-hci-vhci \ + ${KERNEL_PACKAGE_NAME}-module-bnep \ + ${KERNEL_PACKAGE_NAME}-module-hidp \ + ${KERNEL_PACKAGE_NAME}-module-hci-uart \ + ${KERNEL_PACKAGE_NAME}-module-sco \ + ${@bb.utils.contains('MACHINE_FEATURES', 'usbhost', '${KERNEL_PACKAGE_NAME}-module-hci-usb', '',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'pcmcia', '${KERNEL_PACKAGE_NAME}-module-bluetooth3c-cs', '',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'pcmcia', '${KERNEL_PACKAGE_NAME}-module-bluecard-cs', '',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'pcmcia', '${KERNEL_PACKAGE_NAME}-module-bluetoothuart-cs', '',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'pcmcia', '${KERNEL_PACKAGE_NAME}-module-dtl1-cs', '',d)} \ " SUMMARY:packagegroup-base-usbgadget = "USB gadget support" RRECOMMENDS:packagegroup-base-usbgadget = "\ - kernel-module-pxa27x_udc \ - kernel-module-gadgetfs \ - kernel-module-g-file-storage \ - kernel-module-g-serial \ - kernel-module-g-ether" + ${KERNEL_PACKAGE_NAME}-module-pxa27x_udc \ + ${KERNEL_PACKAGE_NAME}-module-gadgetfs \ + ${KERNEL_PACKAGE_NAME}-module-g-file-storage \ + ${KERNEL_PACKAGE_NAME}-module-g-serial \ + ${KERNEL_PACKAGE_NAME}-module-g-ether" SUMMARY:packagegroup-base-usbhost = "USB host support" RDEPENDS:packagegroup-base-usbhost = "\ usbutils " RRECOMMENDS:packagegroup-base-usbhost = "\ - kernel-module-uhci-hcd \ - kernel-module-ohci-hcd \ - kernel-module-ehci-hcd \ - kernel-module-usbcore \ - kernel-module-usbhid \ - kernel-module-usbnet \ - kernel-module-sd-mod \ - kernel-module-scsi-mod \ - kernel-module-usbmouse \ - kernel-module-mousedev \ - kernel-module-usbserial \ - kernel-module-usb-storage " + ${KERNEL_PACKAGE_NAME}-module-uhci-hcd \ + ${KERNEL_PACKAGE_NAME}-module-ohci-hcd \ + ${KERNEL_PACKAGE_NAME}-module-ehci-hcd \ + ${KERNEL_PACKAGE_NAME}-module-usbcore \ + ${KERNEL_PACKAGE_NAME}-module-usbhid \ + ${KERNEL_PACKAGE_NAME}-module-usbnet \ + ${KERNEL_PACKAGE_NAME}-module-sd-mod \ + ${KERNEL_PACKAGE_NAME}-module-scsi-mod \ + ${KERNEL_PACKAGE_NAME}-module-usbmouse \ + ${KERNEL_PACKAGE_NAME}-module-mousedev \ + ${KERNEL_PACKAGE_NAME}-module-usbserial \ + ${KERNEL_PACKAGE_NAME}-module-usb-storage " SUMMARY:packagegroup-base-ppp = "PPP dial-up protocol support" RDEPENDS:packagegroup-base-ppp = "\
@@ -237,18 +237,18 @@ RDEPENDS:packagegroup-base-ppp = "\ ppp-dialin" RRECOMMENDS:packagegroup-base-ppp = "\ - kernel-module-ppp-async \ - kernel-module-ppp-deflate \ - kernel-module-ppp-generic \ - kernel-module-ppp-mppe \ - kernel-module-slhc" + ${KERNEL_PACKAGE_NAME}-module-ppp-async \ + ${KERNEL_PACKAGE_NAME}-module-ppp-deflate \ + ${KERNEL_PACKAGE_NAME}-module-ppp-generic \ + ${KERNEL_PACKAGE_NAME}-module-ppp-mppe \ + ${KERNEL_PACKAGE_NAME}-module-slhc" SUMMARY:packagegroup-base-ipsec = "IPSEC support" RDEPENDS:packagegroup-base-ipsec = "\ " RRECOMMENDS:packagegroup-base-ipsec = "\ - kernel-module-ipsec" + ${KERNEL_PACKAGE_NAME}-module-ipsec" # # packagegroup-base-wifi contain everything needed to get WiFi working
@@ -264,42 +264,42 @@ RDEPENDS:packagegroup-base-wifi = "\ " RRECOMMENDS:packagegroup-base-wifi = "\ - ${@bb.utils.contains('MACHINE_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ - kernel-module-ieee80211-crypt \ - kernel-module-ieee80211-crypt-ccmp \ - kernel-module-ieee80211-crypt-tkip \ - kernel-module-ieee80211-crypt-wep \ - kernel-module-ecb \ - kernel-module-arc4 \ - kernel-module-crypto_algapi \ - kernel-module-cryptomgr \ - kernel-module-michael-mic \ - kernel-module-aes-generic \ - kernel-module-aes" + ${@bb.utils.contains('MACHINE_FEATURES', 'usbhost', '${KERNEL_PACKAGE_NAME}-module-zd1211rw', '',d)} \ + ${KERNEL_PACKAGE_NAME}-module-ieee80211-crypt \ + ${KERNEL_PACKAGE_NAME}-module-ieee80211-crypt-ccmp \ + ${KERNEL_PACKAGE_NAME}-module-ieee80211-crypt-tkip \ + ${KERNEL_PACKAGE_NAME}-module-ieee80211-crypt-wep \ + ${KERNEL_PACKAGE_NAME}-module-ecb \ + ${KERNEL_PACKAGE_NAME}-module-arc4 \ + ${KERNEL_PACKAGE_NAME}-module-crypto_algapi \ + ${KERNEL_PACKAGE_NAME}-module-cryptomgr \ + ${KERNEL_PACKAGE_NAME}-module-michael-mic \ + ${KERNEL_PACKAGE_NAME}-module-aes-generic \ + ${KERNEL_PACKAGE_NAME}-module-aes" SUMMARY:packagegroup-base-nfc = "Near Field Communication support" RDEPENDS:packagegroup-base-nfc = "\ neard" RRECOMMENDS:packagegroup-base-nfc = "\ - kernel-module-nfc" + ${KERNEL_PACKAGE_NAME}-module-nfc" SUMMARY:packagegroup-base-3g = "Cellular data support" RDEPENDS:packagegroup-base-3g = "\ ofono" RRECOMMENDS:packagegroup-base-3g = "\ - kernel-module-cdc-acm \ - kernel-module-cdc-wdm" + ${KERNEL_PACKAGE_NAME}-module-cdc-acm \ + ${KERNEL_PACKAGE_NAME}-module-cdc-wdm" SUMMARY:packagegroup-base-smbfs = "SMB network filesystem support" RRECOMMENDS:packagegroup-base-smbfs = "\ - kernel-module-cifs \ - kernel-module-smbfs" + ${KERNEL_PACKAGE_NAME}-module-cifs \ + ${KERNEL_PACKAGE_NAME}-module-smbfs" SUMMARY:packagegroup-base-cramfs = "cramfs filesystem support" RRECOMMENDS:packagegroup-base-cramfs = "\ - kernel-module-cramfs" + ${KERNEL_PACKAGE_NAME}-module-cramfs" # # packagegroup-base-nfs provides ONLY client support - server is in nfs-utils package
@@ -309,7 +309,7 @@ RDEPENDS:packagegroup-base-nfs = "\ rpcbind" RRECOMMENDS:packagegroup-base-nfs = "\ - kernel-module-nfs " + ${KERNEL_PACKAGE_NAME}-module-nfs " SUMMARY:packagegroup-base-zeroconf = "Zeroconf support" RDEPENDS:packagegroup-base-zeroconf = "\
@@ -323,7 +323,7 @@ RDEPENDS:packagegroup-base-ipv6 = "\ " RRECOMMENDS:packagegroup-base-ipv6 = "\ - kernel-module-ipv6 " + ${KERNEL_PACKAGE_NAME}-module-ipv6 " SUMMARY:packagegroup-base-serial = "Serial port support" RDEPENDS:packagegroup-base-serial = "\
Signature · 1 line
2.43.0
PATCH 6/19 ofono: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- meta/recipes-connectivity/ofono/ofono_2.19.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-connectivity/ofono/ofono_2.19.bb +2 -2
@@ -13,7 +13,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ " SRC_URI[sha256sum] = "d554525ad2db1ccd2fe3ed733e437d76997e7f443c085b87e6be1fded020bc8f" -inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data +inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data kernel-vars INITSCRIPT_NAME = "ofono" INITSCRIPT_PARAMS = "defaults 22"
@@ -44,4 +44,4 @@ RDEPENDS:${PN}-tests = "\ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-pygobject', '', d)} \ " -RRECOMMENDS:${PN} += "kernel-module-tun mobile-broadband-provider-info" +RRECOMMENDS:${PN} += "${KERNEL_PACKAGE_NAME}-module-tun mobile-broadband-provider-info"
Signature · 1 line
2.43.0
PATCH 7/19 iptables: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- .../iptables/iptables_1.8.13.bb | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-)
meta/recipes-extended/iptables/iptables_1.8.13.bb +12 -12
@@ -21,7 +21,7 @@ SYSTEMD_SERVICE:${PN} = "\ ${@bb.utils.contains('PACKAGECONFIG', 'ipv6', 'ip6tables.service', '', d)} \ " -inherit autotools pkgconfig systemd +inherit autotools pkgconfig systemd kernel-vars EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR}"
@@ -92,18 +92,18 @@ python populate_packages:prepend() { RDEPENDS:${PN} = "${PN}-module-xt-standard" RRECOMMENDS:${PN} = " \ ${PN}-modules \ - kernel-module-x-tables \ - kernel-module-ip-tables \ - kernel-module-iptable-filter \ - kernel-module-iptable-nat \ - kernel-module-nf-defrag-ipv4 \ - kernel-module-nf-conntrack \ - kernel-module-nf-conntrack-ipv4 \ - kernel-module-nf-nat \ - kernel-module-ipt-masquerade \ + ${KERNEL_PACKAGE_NAME}-module-x-tables \ + ${KERNEL_PACKAGE_NAME}-module-ip-tables \ + ${KERNEL_PACKAGE_NAME}-module-iptable-filter \ + ${KERNEL_PACKAGE_NAME}-module-iptable-nat \ + ${KERNEL_PACKAGE_NAME}-module-nf-defrag-ipv4 \ + ${KERNEL_PACKAGE_NAME}-module-nf-conntrack \ + ${KERNEL_PACKAGE_NAME}-module-nf-conntrack-ipv4 \ + ${KERNEL_PACKAGE_NAME}-module-nf-nat \ + ${KERNEL_PACKAGE_NAME}-module-ipt-masquerade \ ${@bb.utils.contains('PACKAGECONFIG', 'ipv6', '\ - kernel-module-ip6table-filter \ - kernel-module-ip6-tables \ + ${KERNEL_PACKAGE_NAME}-module-ip6table-filter \ + ${KERNEL_PACKAGE_NAME}-module-ip6-tables \ ', '', d)} \ "
Signature · 1 line
2.43.0
PATCH 8/19 watchdog: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- meta/recipes-extended/watchdog/watchdog_5.16.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-extended/watchdog/watchdog_5.16.bb +3 -3
@@ -24,7 +24,7 @@ SRC_URI[sha256sum] = "b8e7c070e1b72aee2663bdc13b5cc39f76c9232669cfbb1ac0adc7275a UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/watchdog/files/watchdog/" UPSTREAM_CHECK_REGEX = "/watchdog/(?P<pver>(\d+[\.\-_]*)+)/" -inherit autotools update-rc.d systemd pkgconfig +inherit autotools update-rc.d systemd pkgconfig kernel-vars EXTRA_OECONF += " --disable-nfs " CACHED_CONFIGUREVARS += "ac_cv_path_PATH_SENDMAIL=${sbindir}/sendmail"
@@ -65,8 +65,8 @@ FILES:${PN}-keepalive = " \ " RDEPENDS:${PN} += "${PN}-config" -RRECOMMENDS:${PN} += "kernel-module-softdog" +RRECOMMENDS:${PN} += "${KERNEL_PACKAGE_NAME}-module-softdog" RDEPENDS:${PN}-keepalive += "${PN}-config" RCONFLICTS:${PN}-keepalive += "${PN}" -RRECOMMENDS:${PN}-keepalive += "kernel-module-softdog" +RRECOMMENDS:${PN}-keepalive += "${KERNEL_PACKAGE_NAME}-module-softdog"
Signature · 1 line
2.43.0
PATCH 9/19 nfs-utils: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.1.bb +3 -3
@@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84" # util-linux for libblkid DEPENDS = "libcap libevent util-linux sqlite3 libtirpc libxml2 libnl" RDEPENDS:${PN} = "netbase ${PN}-client" -RRECOMMENDS:${PN} = "kernel-module-nfsd" +RRECOMMENDS:${PN} = "${KERNEL_PACKAGE_NAME}-module-nfsd" -inherit useradd +inherit useradd kernel-vars USERADD_PACKAGES = "${PN}-client" USERADD_PARAM:${PN}-client = "--system --home-dir /var/lib/nfs \
@@ -28,7 +28,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x SRC_URI[sha256sum] = "302846343bf509f8f884c23bdbd0fe853b7f7cbb6572060a9082279d13b21a2c" -# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will +# Only ${KERNEL_PACKAGE_NAME}-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. INITSCRIPT_PACKAGES = "${PN} ${PN}-client"
Signature · 1 line
2.43.0
PATCH 10/19 mdadm: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- meta/recipes-extended/mdadm/mdadm_4.6.bb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
meta/recipes-extended/mdadm/mdadm_4.6.bb +7 -7
@@ -15,7 +15,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;bra SRCREV = "8b414a0d4753693d67b9a5822994e5f0c91b0b0a" -inherit pkgconfig ptest systemd +inherit pkgconfig ptest systemd kernel-vars DEPENDS = "udev"
@@ -85,12 +85,12 @@ RDEPENDS:${PN}-ptest += " \ " RRECOMMENDS:${PN}-ptest += " \ coreutils \ - kernel-module-loop \ - kernel-module-linear \ - kernel-module-raid0 \ - kernel-module-raid1 \ - kernel-module-raid10 \ - kernel-module-raid456 \ + ${KERNEL_PACKAGE_NAME}-module-loop \ + ${KERNEL_PACKAGE_NAME}-module-linear \ + ${KERNEL_PACKAGE_NAME}-module-raid0 \ + ${KERNEL_PACKAGE_NAME}-module-raid1 \ + ${KERNEL_PACKAGE_NAME}-module-raid10 \ + ${KERNEL_PACKAGE_NAME}-module-raid456 \ " FILES:${PN} += "${systemd_unitdir}/*"
Signature · 1 line
2.43.0
PATCH 11/19 systemd: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- meta/recipes-core/systemd/systemd_259.5.bb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
meta/recipes-core/systemd/systemd_259.5.bb +9 -6
@@ -8,7 +8,7 @@ DEPENDS = "gperf-native libcap util-linux python3-jinja2-native" SECTION = "base/shell" -inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives systemd gettext bash-completion manpages features_check mime +inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives systemd gettext bash-completion manpages features_check mime kernel-vars # unmerged-usr support is deprecated upstream, taints the system and will be # removed in the near future. Fail the build if it is not enabled.
@@ -483,7 +483,7 @@ FILES:${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ ${nonarch_libdir}/systemd/systemd-binfmt \ ${systemd_system_unitdir}/proc-sys-fs-binfmt_misc.* \ ${systemd_system_unitdir}/systemd-binfmt.service" -RRECOMMENDS:${PN}-binfmt = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', 'kernel-module-binfmt-misc', '', d)}" +RRECOMMENDS:${PN}-binfmt = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${KERNEL_PACKAGE_NAME}-module-binfmt-misc', '', d)}" RDEPENDS:${PN}-vconsole-setup = "${@bb.utils.contains('PACKAGECONFIG', 'vconsole', 'kbd kbd-consolefonts kbd-keymaps', '', d)}"
@@ -561,9 +561,9 @@ RRECOMMENDS:${PN}-container += "\ ${PN}-journal-gatewayd \ ${PN}-journal-remote \ ${PN}-journal-upload \ - kernel-module-dm-mod \ - kernel-module-loop \ - kernel-module-tun \ + ${KERNEL_PACKAGE_NAME}-module-dm-mod \ + ${KERNEL_PACKAGE_NAME}-module-loop \ + ${KERNEL_PACKAGE_NAME}-module-tun \ tar \ "
@@ -744,7 +744,10 @@ RDEPENDS:${PN} += "volatile-binds" RRECOMMENDS:${PN} += "${PN}-extra-utils \ udev-hwdb \ e2fsprogs-e2fsck \ - kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 kernel-module-sch-fq-codel \ + ${KERNEL_PACKAGE_NAME}-module-autofs4 \ + ${KERNEL_PACKAGE_NAME}-module-unix \ + ${KERNEL_PACKAGE_NAME}-module-ipv6 \ + ${KERNEL_PACKAGE_NAME}-module-sch-fq-codel \ os-release \ systemd-conf \ ${@bb.utils.contains('PACKAGECONFIG', 'logind', 'pam-plugin-umask', '', d)} \
Signature · 1 line
2.43.0
PATCH 12/19 util-linux: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- meta/recipes-core/util-linux/util-linux_2.42.2.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
meta/recipes-core/util-linux/util-linux_2.42.2.bb +7 -2
@@ -52,7 +52,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=55e895a80bdd4ffc65e167a76d2e7569 file://libsmartcols/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ " -inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest gtk-doc +inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest gtk-doc kernel-vars DEPENDS = "libcap-ng ncurses virtual/crypt zlib util-linux-libuuid" PACKAGES =+ "${PN}-swaponoff"
@@ -207,7 +207,12 @@ RPROVIDES:${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev" RDEPENDS:${PN}-bash-completion += "${PN}-lsblk ${PN}-findmnt" RDEPENDS:${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs findutils grep iproute2 kmod procps sed socat xz diffutils" -RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-sd-mod kernel-module-loop kernel-module-algif-hash" +RRECOMMENDS:${PN}-ptest += "\ + ${KERNEL_PACKAGE_NAME}-module-scsi-debug \ + ${KERNEL_PACKAGE_NAME}-module-sd-mod \ + ${KERNEL_PACKAGE_NAME}-module-loop \ + ${KERNEL_PACKAGE_NAME}-module-algif-hash \ + " RDEPENDS:${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" ALLOW_EMPTY:${PN}-swaponoff = "1"
Signature · 1 line
2.43.0
PATCH 13/19 connman: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- meta/recipes-connectivity/connman/connman_2.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-connectivity/connman/connman_2.0.bb +2 -2
@@ -12,7 +12,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36" -inherit autotools pkgconfig systemd update-rc.d update-alternatives +inherit autotools pkgconfig systemd update-rc.d update-alternatives kernel-vars CVE_PRODUCT = "connman connection_manager"
@@ -71,7 +71,7 @@ PACKAGECONFIG[l2tp] = "--enable-l2tp --with-l2tp=${sbindir}/xl2tpd,--disable-l2t PACKAGECONFIG[pptp] = "--enable-pptp --with-pptp=${sbindir}/pptp,--disable-pptp,ppp,pptp-linux" # WISPr support for logging into hotspots, requires TLS PACKAGECONFIG[wispr] = "--enable-wispr,--disable-wispr,gnutls," -PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,libmnl libnftnl,,kernel-module-nf-tables kernel-module-nft-chain-nat-ipv4 kernel-module-nft-chain-route-ipv4 kernel-module-nft-masq-ipv4 kernel-module-nft-nat,iptables" +PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,libmnl libnftnl,,${KERNEL_PACKAGE_NAME}-module-nf-tables ${KERNEL_PACKAGE_NAME}-module-nft-chain-nat-ipv4 ${KERNEL_PACKAGE_NAME}-module-nft-chain-route-ipv4 ${KERNEL_PACKAGE_NAME}-module-nft-masq-ipv4 ${KERNEL_PACKAGE_NAME}-module-nft-nat,iptables" PACKAGECONFIG[iptables] = "--with-firewall=iptables,,iptables,,,nftables" PACKAGECONFIG[nfc] = "--enable-neard, --disable-neard, neard, neard" PACKAGECONFIG[client] = "--enable-client,--disable-client,readline"
Signature · 1 line
2.43.0
PATCH 14/19 hwlatdetect: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- meta/recipes-rt/rt-tests/hwlatdetect_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-rt/rt-tests/hwlatdetect_git.bb +2 -2
@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" require rt-tests.inc -inherit python3-dir +inherit python3-dir kernel-vars EXTRA_OEMAKE += "PYLIB=${libdir}/python${PYTHON_BASEVERSION}/dist-packages"
@@ -23,4 +23,4 @@ do_install() { FILES:${PN} += "${libdir}/python${PYTHON_BASEVERSION}/dist-packages/hwlatdetect.py" RDEPENDS:${PN} = "python3-core " -RRECOMMENDS:${PN} = "kernel-module-hwlat-detector" +RRECOMMENDS:${PN} = "${KERNEL_PACKAGE_NAME}-module-hwlat-detector"
Signature · 1 line
2.43.0
PATCH 15/19 v86d: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- meta/recipes-bsp/v86d/v86d_0.1.10.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-bsp/v86d/v86d_0.1.10.bb +3 -1
@@ -6,7 +6,9 @@ DESCRIPTION = "v86d provides a backend for kernel drivers that need to execute x LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://README;md5=94ac1971e4f2309dc322d598e7b1f7dd" -RRECOMMENDS:${PN} = "kernel-module-uvesafb" +inherit kernel-vars + +RRECOMMENDS:${PN} = "${KERNEL_PACKAGE_NAME}-module-uvesafb" SRC_URI = "http://snapshot.debian.org/archive/debian/20110427T035506Z/pool/main/v/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://Update-x86emu-from-X.org.patch \
Signature · 1 line
2.43.0
PATCH 16/19 efivar: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- meta/recipes-bsp/efivar/efivar_39.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-bsp/efivar/efivar_39.bb +2 -2
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/rhinstaller/efivar.git;branch=main;protocol=https \ " SRCREV = "c47820c37ac26286559ec004de07d48d05f3308c" -inherit pkgconfig +inherit pkgconfig kernel-vars export CCLD_FOR_BUILD = "${BUILD_CCLD}"
@@ -28,6 +28,6 @@ do_install() { BBCLASSEXTEND = "native" -RRECOMMENDS:${PN}:class-target = "kernel-module-efivarfs" +RRECOMMENDS:${PN}:class-target = "${KERNEL_PACKAGE_NAME}-module-efivarfs" CLEANBROKEN = "1"
Signature · 1 line
2.43.0
PATCH 17/19 parted: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- meta/recipes-extended/parted/parted_3.7.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/parted/parted_3.7.bb +2 -2
@@ -16,7 +16,7 @@ SRC_URI:append:riscv64 = " file://0001-t9042-dos-partition-limit.sh-unconditiona SRC_URI[sha256sum] = "008de57561a4f3c25a0648e66ed11e7b30be493889b64334a6d70f2c1951ef7b" -inherit autotools pkgconfig gettext texinfo ptest +inherit autotools pkgconfig gettext texinfo ptest kernel-vars PACKAGECONFIG ?= "readline" PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,libdevmapper lvm2"
@@ -52,7 +52,7 @@ do_install_ptest() { } RDEPENDS:${PN}-ptest = "bash coreutils perl util-linux-losetup util-linux-mkswap python3 make gawk e2fsprogs-mke2fs e2fsprogs-tune2fs python3-core dosfstools" -RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-loop kernel-module-vfat" +RRECOMMENDS:${PN}-ptest += "${KERNEL_PACKAGE_NAME}-module-scsi-debug ${KERNEL_PACKAGE_NAME}-module-loop ${KERNEL_PACKAGE_NAME}-module-vfat" RDEPENDS:${PN}-ptest:append:libc-glibc = "\ glibc-utils \ locale-base-en-us \
Signature · 1 line
2.43.0
PATCH 18/19 ltp: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- meta/recipes-extended/ltp/ltp_20260529.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/ltp/ltp_20260529.bb +2 -2
@@ -32,7 +32,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=ht file://0001-syscalls-semctl08-Skip-semctl08-when-__USE_TIME64_RE.patch \ " -inherit autotools-brokensep pkgconfig +inherit autotools-brokensep pkgconfig kernel-vars # Version 20220527 added KVM test infrastructure which currently fails to build with lld due to # SORT_NONE in linker script which isn't supported by gold:
@@ -121,7 +121,7 @@ RDEPENDS:${PN} = "\ tar \ " -RRECOMMENDS:${PN} += "kernel-module-loop" +RRECOMMENDS:${PN} += "${KERNEL_PACKAGE_NAME}-module-loop" FILES:${PN} += "${prefix}/* ${prefix}/runtest/* ${prefix}/scenario_groups/* ${prefix}/testcases/bin/* ${prefix}/testcases/bin/*/bin/* ${prefix}/testscripts/* ${prefix}/testcases/open_posix_testsuite/* ${prefix}/testcases/open_posix_testsuite/conformance/* ${prefix}/testcases/open_posix_testsuite/Documentation/* ${prefix}/testcases/open_posix_testsuite/functional/* ${prefix}/testcases/open_posix_testsuite/include/* ${prefix}/testcases/open_posix_testsuite/scripts/* ${prefix}/testcases/open_posix_testsuite/stress/* ${prefix}/testcases/open_posix_testsuite/tools/* ${prefix}/testcases/data/nm01/lib.a ${prefix}/lib/libmem.a"
Signature · 1 line
2.43.0
PATCH 19/19 libnl: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uninformative with builds ifKERNEL_PACKAGE_NAME variable were to change.
--- meta/recipes-support/libnl/libnl_3.12.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/libnl/libnl_3.12.0.bb +2 -2
@@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "fc51ca7196f1a3f5fdf6ffd3864b50f4f9c02333be28be4eeca057e103 GITHUB_BASE_URI = "https://github.com/thom311/${BPN}/releases" UPSTREAM_CHECK_REGEX = "releases/tag/libnl(?P<pver>.+)" -inherit autotools pkgconfig ptest github-releases +inherit autotools pkgconfig ptest github-releases kernel-vars FILES:${PN} = "${libdir}/libnl-3.so.* \ ${libdir}/libnl.so.* \
@@ -54,7 +54,7 @@ RREPLACES:${PN}-genl = "libnl-genl2" RCONFLICTS:${PN}-genl = "libnl-genl2" DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'libcheck', '', d)}" -RRECOMMENDS:${PN}-ptest += "kernel-module-dummy kernel-module-bonding" +RRECOMMENDS:${PN}-ptest += "${KERNEL_PACKAGE_NAME}-module-dummy ${KERNEL_PACKAGE_NAME}-module-bonding" RDEPENDS:${PN}-ptest += "iproute2-ip" do_compile_ptest() {
Signature · 1 line
2.43.0
Quoted 24 lines · Vincent Davis Jr via lists.openembedded.org
This class is introduced to fix an issue
whenKERNEL_PACKAGE_NAMEis changed.A number of recipes rely on hard coded
kernel prefix set byKERNEL_PACKAGE_NAME
when including modules. This leads to build
time failures.Such as
ERROR: Nothing RPROVIDES 'kernel-module-*'
Signed-off-by Vincent Davis Jr <[email protected]>---
meta/classes-recipe/kernel-vars.bbclass | 7 +++++++1 file changed, 7 insertions(+)create mode 100644 meta/classes-recipe/kernel-vars.bbclass
meta/classes-recipe/kernel-vars.bbclass new file +0
-0
meta/classes-recipe/kernel-vars.bbclass line 7
Quoted 7 lines
meta/classes-recipe/kernel-vars.bbclass new file +7
-0@@ -0,0 +1,7 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +KERNEL_PACKAGE_NAME ??= "kernel"
We are definitely not adding yet another kernel class, particularly for a single line. There has to be a better way to solve the problem...
Cheers,
Richard