bitbake: globally define KERNEL_PACKAGE_NAME
PATCH v2 1/26 bitbake: globally define KERNEL_PACKAGE_NAME
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-*'
Commit globally defines variable so that recipes aren't reliant on hardcoded 'kernel' prefix.
--- meta/conf/bitbake.conf | 3 +++ 1 file changed, 3 insertions(+)
meta/conf/bitbake.conf +3 -0
@@ -493,6 +493,9 @@ KERNEL_SRC_PATH = "/usr/src/kernel" STAGING_KERNEL_DIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-source" STAGING_KERNEL_BUILDDIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-build-artifacts" +# Globally define base string for kernel packages +KERNEL_PACKAGE_NAME ??= "kernel" + ################################################################## # Specific image creation and rootfs population info. ##################################################################
Signature · 1 line
2.43.0
PATCH v2 2/26 kernel: remove KERNEL_PACKAGE_NAME
It's set globally in bitbake.conf.
No longer required in kernel.bbclass.
--- meta/classes-recipe/kernel.bbclass | 1 - 1 file changed, 1 deletion(-)
meta/classes-recipe/kernel.bbclass +0 -1
@@ -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 v2 3/26 machine: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/conf/machine/include/loongarch/qemuloongarch.inc | 2 +- meta/conf/machine/include/riscv/qemuriscv.inc | 2 +- meta/conf/machine/qemuppc64.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
meta/conf/machine/include/loongarch/qemuloongarch.inc +1 -1
@@ -15,7 +15,7 @@ IMAGE_FSTYPES += "ext4 wic.qcow2" WKS_FILE ?= "qemuloongarch.wks" -MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" +MACHINE_EXTRA_RRECOMMENDS += "${KERNEL_PACKAGE_NAME}-modules" #EXTRA_IMAGEDEPENDS += "opensbi"
meta/conf/machine/include/riscv/qemuriscv.inc +1 -1
@@ -15,7 +15,7 @@ IMAGE_FSTYPES += "ext4.zst wic.qcow2" WKS_FILE ?= "qemuriscv.wks" -MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" +MACHINE_EXTRA_RRECOMMENDS += "${KERNEL_PACKAGE_NAME}-modules" EXTRA_IMAGEDEPENDS += "opensbi" RISCV_SBI_PLAT ?= "generic"
meta/conf/machine/qemuppc64.conf +1 -1
@@ -20,4 +20,4 @@ QB_KERNEL_CMDLINE_APPEND = "console=hvc0 nohugevmalloc" #QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" QB_OPT_APPEND = "-usb -device usb-tablet" -MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" +MACHINE_EXTRA_RRECOMMENDS += "${KERNEL_PACKAGE_NAME}-modules"
Signature · 1 line
2.43.0
PATCH v2 4/26 kernel: remove setting of KERNEL_PACKAGE_NAME
In reply to Vincent Davis JrMust always be globally defined to maintain
uniformity with builds if KERNEL_PACKAGE_NAME
variable were to change.
--- meta/classes-recipe/kernel.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta/classes-recipe/kernel.bbclass +4 -1
@@ -107,7 +107,10 @@ python __anonymous () { d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', ' '.join(sorted(typeformake))) - kname = d.getVar('KERNEL_PACKAGE_NAME') or "kernel" + kname = d.getVar('KERNEL_PACKAGE_NAME') + if not kname: + bb.error("KERNEL_PACKAGE_NAME is somehow not defined.") + imagedest = d.getVar('KERNEL_IMAGEDEST') for type in types.split():
Signature · 1 line
2.43.0
PATCH v2 5/26 core-image-kernel: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/recipes-extended/images/core-image-kernel-dev.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/images/core-image-kernel-dev.bb +1 -1
@@ -6,7 +6,7 @@ require recipes-core/images/core-image-minimal.bb KERNEL_DEV_UTILS ?= "dropbear connman" KERNEL_DEV_TOOLS ?= "packagegroup-core-tools-profile packagegroup-core-buildessential kernel-devsrc" -KERNEL_DEV_MODULE ?= "kernel-modules" +KERNEL_DEV_MODULE ?= "${KERNEL_PACKAGE_NAME}-modules" CORE_IMAGE_EXTRA_INSTALL += "${KERNEL_DEV_MODULE} \ ${KERNEL_DEV_UTILS} \
Signature · 1 line
2.43.0
PATCH v2 6/26 packagegroup-self-hosted: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity 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 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 v2 7/26 packegroup-core-boot: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/packagegroups/packagegroup-core-boot.bb +1 -1
@@ -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 v2 8/26 packagegroup-base: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- .../packagegroups/packagegroup-base.bb | 156 +++++++++--------- 1 file changed, 78 insertions(+), 78 deletions(-)
meta/recipes-core/packagegroups/packagegroup-base.bb +78 -78
@@ -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 v2 9/26 ofono: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/recipes-connectivity/ofono/ofono_2.19.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/ofono/ofono_2.19.bb +1 -1
@@ -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 v2 10/26 iptables: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- .../iptables/iptables_1.8.13.bb | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-)
meta/recipes-extended/iptables/iptables_1.8.13.bb +11 -11
@@ -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 v2 11/26 watchdog: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/recipes-extended/watchdog/watchdog_5.16.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/watchdog/watchdog_5.16.bb +2 -2
@@ -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 v2 12/26 nfs-utils: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.1.bb +2 -2
@@ -10,7 +10,7 @@ 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
@@ -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 v2 13/26 mdadm: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/recipes-extended/mdadm/mdadm_4.6.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
meta/recipes-extended/mdadm/mdadm_4.6.bb +6 -6
@@ -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 v2 14/26 systemd: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/recipes-core/systemd/systemd_259.5.bb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
meta/recipes-core/systemd/systemd_259.5.bb +8 -5
@@ -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 v2 15/26 util-linux: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/recipes-core/util-linux/util-linux_2.42.2.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-core/util-linux/util-linux_2.42.2.bb +6 -1
@@ -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 v2 16/26 connman: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/recipes-connectivity/connman/connman_2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/connman/connman_2.0.bb +1 -1
@@ -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 v2 17/26 hwlatdetect: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/recipes-rt/rt-tests/hwlatdetect_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-rt/rt-tests/hwlatdetect_git.bb +1 -1
@@ -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 v2 18/26 v86d: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/recipes-bsp/v86d/v86d_0.1.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-bsp/v86d/v86d_0.1.10.bb +1 -1
@@ -6,7 +6,7 @@ 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" +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 v2 19/26 efivar: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/recipes-bsp/efivar/efivar_39.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-bsp/efivar/efivar_39.bb +1 -1
@@ -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 v2 20/26 parted: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/recipes-extended/parted/parted_3.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/parted/parted_3.7.bb +1 -1
@@ -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 v2 21/26 ltp: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/recipes-extended/ltp/ltp_20260529.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/ltp/ltp_20260529.bb +1 -1
@@ -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 v2 22/26 libnl: rename kernel prefix
In reply to Vincent Davis JrUtilize preset variable KERNEL_PACKAGE_NAME
to ensure uniformity with builds ifKERNEL_PACKAGE_NAME variable were to
change.
--- meta/recipes-support/libnl/libnl_3.12.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/libnl/libnl_3.12.0.bb +1 -1
@@ -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
PATCH v2 23/26 linux-kernel-base: locate virtual/kernel WORKDIR
In reply to Vincent Davis JrIf KERNEL_PACKAGE_NAME is not set to default string "kernel" there's currently no way to determine the WORKDIR of virtual/kernel.
Commit adds a way to determine virtual/kernel WORKDIR. So, perf and make-mod-scripts builds.
--- meta/classes-recipe/linux-kernel-base.bbclass | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+)
meta/classes-recipe/linux-kernel-base.bbclass +30 -0
@@ -54,6 +54,36 @@ def linux_module_packages(s, d): suffix = "" return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) +def set_kernel_staging_vars(d): + from pathlib import Path + + kpn = d.getVar("KERNEL_PACKAGE_NAME") + + # FROM: kernel.bbclass + # The default kernel recipe builds in a shared location defined by + # bitbake/distro confs: STAGING_KERNEL_DIR and STAGING_KERNEL_BUILDDIR. + # Set these variables to directories under ${WORKDIR} in alternate + # kernel recipes (I.e. where KERNEL_PACKAGE_NAME != kernel) so that they + # may build in parallel with the default kernel without clobbering. + # + # Due to this STAGING_KERNEL_DIR is changed from default defined in + # bitbake.conf. Currently there is no way to globally set a variable + # in a kernel recipe and no way to get the WORKDIR of the kernel + # recipe from within this recipe. So, folder path is determined + # using other pre-existing information. + if kpn != "kernel": + workdir = d.getVar("WORKDIR") + "/../../" + d.getVar("PREFERRED_PROVIDER_virtual/kernel") + src_path = Path(workdir) + # Helps acquire package version. + # Caller should only be using 1 version at given time. + for x in src_path.iterdir(): + if x.is_dir(): + staging_kernel_dir = os.path.join(workdir, "%s/kernel-source" % (x)) + staging_kernel_builddir = os.path.join(workdir, "%s/kernel-build-artifacts" % (x)) + d.setVar("STAGING_KERNEL_DIR", staging_kernel_dir) + d.setVar("STAGING_KERNEL_BUILDDIR", staging_kernel_builddir) + break + export KBUILD_BUILD_VERSION = "1" export KBUILD_BUILD_USER ?= "oe-user" export KBUILD_BUILD_HOST ?= "oe-host"
Signature · 1 line
2.43.0
PATCH v2 24/26 perf: preset STAGING_KERNEL_DIR
In reply to Vincent Davis JrSTAGING_KERNEL_DIR changes if KERNEL_PACKAGE_NAME is not set to default string "kernel". Add workaround to find virtual/kernel WORKDIR.
--- meta/recipes-kernel/perf/perf.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-kernel/perf/perf.bb +4 -1
@@ -204,8 +204,11 @@ do_install() { do_configure[prefuncs] += "copy_perf_source_from_kernel" python copy_perf_source_from_kernel() { - sources = (d.getVar("PERF_SRC") or "").split() + set_kernel_staging_vars(d) + src_dir = d.getVar("STAGING_KERNEL_DIR") + sources = (d.getVar("PERF_SRC") or "").split() + dest_dir = d.getVar("S") bb.utils.mkdirhier(dest_dir) bb.utils.prunedir(dest_dir)
Signature · 1 line
2.43.0
PATCH v2 25/26 perf: disable discarded-qualifiers checks
In reply to Vincent Davis Jr--- meta/recipes-kernel/perf/perf.bb | 9 +++++++++ 1 file changed, 9 insertions(+)
meta/recipes-kernel/perf/perf.bb +9 -0
@@ -98,6 +98,15 @@ TARGET_CC_ARCH += "${SELECTED_OPTIMIZATION} ${DEBUG_PREFIX_MAP}" #| cc1: all warnings being treated as errors TARGET_CC_ARCH:append:toolchain-clang:arm = " -fno-error=maybe-uninitialized" +#| libbpf.c: In function 'kallsyms_cb': +#| libbpf.c:8120:13: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] +#| 8120 | res = strstr(sym_name, ".llvm."); +#| | ^ +#| libbpf.c: In function 'resolve_full_path': +#| libbpf.c:11920:35: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] +#| 11920 | next_path = strchr(s, ':'); +TARGET_CC_ARCH:append = " -Wno-error=discarded-qualifiers" + EXTRA_OEMAKE = '\ V=1 \ VF=1 \
Signature · 1 line
2.43.0
PATCH v2 26/26 make-mod-scripts: preset STAGING_KERNEL_DIR
In reply to Vincent Davis JrSTAGING_KERNEL_DIR changes if KERNEL_PACKAGE_NAME is not set to default string "kernel". Add workaround to find virtual/kernel WORKDIR.
--- meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb | 5 +++++ 1 file changed, 5 insertions(+)
meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb +5 -0
@@ -10,6 +10,11 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" S = "${UNPACKDIR}" +python set_kernel_vars() { + set_kernel_staging_vars(d) +} + +do_configure[prefuncs] += "set_kernel_vars" do_configure[depends] += "virtual/kernel:do_shared_workdir openssl-native:do_populate_sysroot" do_compile[depends] += "virtual/kernel:do_compile_kernelmodules"
Signature · 1 line
2.43.0
May we drop this series just thought of a much better way to solve
https://lists.openembedded.org/g/openembedded-core/message/240748