From c71f927a9afbc7154377ea0a3a0e72e1ea0af4e3 Mon Sep 17 00:00:00 2001 From: Jason Andryuk Date: Wed, 9 Dec 2020 15:32:17 -0500 Subject: [PATCH] Restore allarch after addition of MULTILIB commit b840fe8eff90 added multilib to the openxt-main distro, but an unnoticed side effect was that allarch no longer worked. allarch.bbclass doesn't set PACKAGE_ARCH to "all" when MULTILIB_VARIANTS is set, so the rest of allarch.bbclass doesn't take effect. Work around this by manually setting PACKAGE_ARCH="all" and then inheriting allarch. There could be a problem if any of these packages depended on further arch specific packages, but none of ours do. Wrap it into the small multilib-allarch.bbclass to centralize the change. Signed-off-by: Jason Andryuk --- classes/multilib-allarch.bbclass | 6 ++++++ .../networkmanager-certs/networkmanager-certs.bb | 2 +- recipes-core/initrdscripts/initramfs-stubdomain_1.0.bb | 2 +- recipes-core/udev/udev-extraconf-dom0_1.0.bb | 2 +- recipes-devtools/bats-suite/bats-suite_git.bb | 2 +- recipes-devtools/bats/bats_git.bb | 2 +- recipes-extended/rsyslog/rsyslog-conf-dom0.bb | 2 +- recipes-kernel/linux-firmware/linux-firmware_git.bb | 2 +- recipes-openxt/argo/argo-module-headers_git.bb | 2 +- recipes-openxt/idl/xenclient-idl_git.bb | 2 +- .../xen-legacy-block-scripts_1.0.bb | 2 +- recipes-openxt/xen-tap-scripts/xen-tap-scripts_1.0.bb | 2 +- recipes-openxt/xen-vif-scripts/xen-vif-scripts-dom0_1.0.bb | 2 +- recipes-openxt/xen-vif-scripts/xen-vif-scripts-ndvm_1.0.bb | 2 +- .../xenclient-installer/xenclient-installer_git.bb | 2 +- .../xenclient-repo-certs/xenclient-repo-certs_1.0.bb | 2 +- .../xenclient-uivm-xsessionconfig_0.0.2.bb | 2 +- recipes-security/selinux/selinux-load_1.0.bb | 2 +- recipes-support/lvm2/lvm2-conf-initramfs_1.0.bb | 2 +- 19 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 classes/multilib-allarch.bbclass diff --git a/classes/multilib-allarch.bbclass b/classes/multilib-allarch.bbclass new file mode 100644 index 0000000000..43b6d3c8a7 --- /dev/null +++ b/classes/multilib-allarch.bbclass @@ -0,0 +1,6 @@ +# Since we have multilib enabled for xen, regular allarch doesn't take affect +# and the packages use the default tune. Setting PACKAGE_ARCH forces allarch +# like we want. +PACKAGE_ARCH = "all" + +inherit allarch diff --git a/recipes-connectivity/networkmanager-certs/networkmanager-certs.bb b/recipes-connectivity/networkmanager-certs/networkmanager-certs.bb index 433cf5bb5b..3a7a7ecdcd 100644 --- a/recipes-connectivity/networkmanager-certs/networkmanager-certs.bb +++ b/recipes-connectivity/networkmanager-certs/networkmanager-certs.bb @@ -7,7 +7,7 @@ SRC_URI = " \ file://populate-certs.sh \ " -inherit allarch update-rc.d +inherit multilib-allarch update-rc.d do_install () { install -d ${D}/usr/bin diff --git a/recipes-core/initrdscripts/initramfs-stubdomain_1.0.bb b/recipes-core/initrdscripts/initramfs-stubdomain_1.0.bb index 6fc54f44a2..240fc13c8d 100644 --- a/recipes-core/initrdscripts/initramfs-stubdomain_1.0.bb +++ b/recipes-core/initrdscripts/initramfs-stubdomain_1.0.bb @@ -8,7 +8,7 @@ SRC_URI = " \ file://init.sh \ " -inherit allarch +inherit multilib-allarch do_install() { install -m 0755 ${WORKDIR}/init.sh ${D}/init diff --git a/recipes-core/udev/udev-extraconf-dom0_1.0.bb b/recipes-core/udev/udev-extraconf-dom0_1.0.bb index 8902cfac4f..87ba16edef 100644 --- a/recipes-core/udev/udev-extraconf-dom0_1.0.bb +++ b/recipes-core/udev/udev-extraconf-dom0_1.0.bb @@ -7,7 +7,7 @@ SRC_URI = " \ file://50-usb-powersave.rules \ " -inherit allarch +inherit multilib-allarch do_install() { install -d ${D}${sysconfdir}/udev/rules.d diff --git a/recipes-devtools/bats-suite/bats-suite_git.bb b/recipes-devtools/bats-suite/bats-suite_git.bb index 9fa767b964..9e943cc79d 100644 --- a/recipes-devtools/bats-suite/bats-suite_git.bb +++ b/recipes-devtools/bats-suite/bats-suite_git.bb @@ -7,7 +7,7 @@ SRCREV = "${AUTOREV}" S = "${WORKDIR}/git" -inherit allarch +inherit multilib-allarch do_install () { if [ -e "${S}/dom0" ]; then diff --git a/recipes-devtools/bats/bats_git.bb b/recipes-devtools/bats/bats_git.bb index 1e4f571963..ff060e6da6 100644 --- a/recipes-devtools/bats/bats_git.bb +++ b/recipes-devtools/bats/bats_git.bb @@ -7,7 +7,7 @@ SRCREV = "03608115df2071fff4eaaff1605768c275e5f81f" S = "${WORKDIR}/git" -inherit allarch +inherit multilib-allarch do_install () { ${S}/install.sh ${D}/${exec_prefix} diff --git a/recipes-extended/rsyslog/rsyslog-conf-dom0.bb b/recipes-extended/rsyslog/rsyslog-conf-dom0.bb index fa14133fa5..8e4b542271 100644 --- a/recipes-extended/rsyslog/rsyslog-conf-dom0.bb +++ b/recipes-extended/rsyslog/rsyslog-conf-dom0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "db tools" LICENSE = "GPLv2" LIC_FILES_CHKSUM="file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -inherit allarch +inherit multilib-allarch SRC_URI = "file://rsyslog.conf" diff --git a/recipes-kernel/linux-firmware/linux-firmware_git.bb b/recipes-kernel/linux-firmware/linux-firmware_git.bb index 5e1bf46f2f..0c2b82a82c 100644 --- a/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -136,7 +136,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware S = "${WORKDIR}/git" -inherit allarch update-alternatives +inherit multilib-allarch update-alternatives # OE started complaining about the architecture of the binaries for some reason INSANE_SKIP = "arch" diff --git a/recipes-openxt/argo/argo-module-headers_git.bb b/recipes-openxt/argo/argo-module-headers_git.bb index 9018a59435..5e058ec824 100644 --- a/recipes-openxt/argo/argo-module-headers_git.bb +++ b/recipes-openxt/argo/argo-module-headers_git.bb @@ -8,7 +8,7 @@ require argo.inc S = "${WORKDIR}/git/argo-linux" -inherit allarch +inherit multilib-allarch do_install() { oe_runmake INSTALL_HDR_PATH=${D}${prefix} headers_install diff --git a/recipes-openxt/idl/xenclient-idl_git.bb b/recipes-openxt/idl/xenclient-idl_git.bb index 2dfd1a19a8..8b2210d542 100644 --- a/recipes-openxt/idl/xenclient-idl_git.bb +++ b/recipes-openxt/idl/xenclient-idl_git.bb @@ -6,7 +6,7 @@ require idl.inc S = "${WORKDIR}/git" -inherit allarch +inherit multilib-allarch do_install() { install -m 0755 -d ${D}${idldatadir} diff --git a/recipes-openxt/xen-legacy-block-scripts/xen-legacy-block-scripts_1.0.bb b/recipes-openxt/xen-legacy-block-scripts/xen-legacy-block-scripts_1.0.bb index ef7561ee3d..7264ae764f 100644 --- a/recipes-openxt/xen-legacy-block-scripts/xen-legacy-block-scripts_1.0.bb +++ b/recipes-openxt/xen-legacy-block-scripts/xen-legacy-block-scripts_1.0.bb @@ -10,7 +10,7 @@ SRC_URI = " \ S = "${WORKDIR}" -inherit allarch +inherit multilib-allarch do_install() { install -m 0755 -d ${D}${sysconfdir}/udev diff --git a/recipes-openxt/xen-tap-scripts/xen-tap-scripts_1.0.bb b/recipes-openxt/xen-tap-scripts/xen-tap-scripts_1.0.bb index 9db4f3d212..5ec66fea7d 100644 --- a/recipes-openxt/xen-tap-scripts/xen-tap-scripts_1.0.bb +++ b/recipes-openxt/xen-tap-scripts/xen-tap-scripts_1.0.bb @@ -9,7 +9,7 @@ SRC_URI = " \ S = "${WORKDIR}" -inherit allarch +inherit multilib-allarch do_install() { install -m 0755 -d ${D}${sysconfdir}/udev diff --git a/recipes-openxt/xen-vif-scripts/xen-vif-scripts-dom0_1.0.bb b/recipes-openxt/xen-vif-scripts/xen-vif-scripts-dom0_1.0.bb index 9c244e828c..e58157cf5d 100644 --- a/recipes-openxt/xen-vif-scripts/xen-vif-scripts-dom0_1.0.bb +++ b/recipes-openxt/xen-vif-scripts/xen-vif-scripts-dom0_1.0.bb @@ -9,7 +9,7 @@ SRC_URI = " \ S = "${WORKDIR}" -inherit allarch +inherit multilib-allarch do_install() { install -m 0755 -d ${D}${sysconfdir}/udev diff --git a/recipes-openxt/xen-vif-scripts/xen-vif-scripts-ndvm_1.0.bb b/recipes-openxt/xen-vif-scripts/xen-vif-scripts-ndvm_1.0.bb index ace4573143..1c36b0e627 100644 --- a/recipes-openxt/xen-vif-scripts/xen-vif-scripts-ndvm_1.0.bb +++ b/recipes-openxt/xen-vif-scripts/xen-vif-scripts-ndvm_1.0.bb @@ -9,7 +9,7 @@ SRC_URI = " \ S = "${WORKDIR}" -inherit allarch +inherit multilib-allarch do_install() { install -m 0755 -d ${D}${sysconfdir}/udev diff --git a/recipes-openxt/xenclient-installer/xenclient-installer_git.bb b/recipes-openxt/xenclient-installer/xenclient-installer_git.bb index 5a94a0dc22..688ccc63a7 100644 --- a/recipes-openxt/xenclient-installer/xenclient-installer_git.bb +++ b/recipes-openxt/xenclient-installer/xenclient-installer_git.bb @@ -16,7 +16,7 @@ SRC_URI = " \ S = "${WORKDIR}/git" -inherit allarch deploy +inherit multilib-allarch deploy do_install () { ${S}/install part1 ${D}/install diff --git a/recipes-openxt/xenclient-repo-certs/xenclient-repo-certs_1.0.bb b/recipes-openxt/xenclient-repo-certs/xenclient-repo-certs_1.0.bb index 43acaf035f..31a4051225 100644 --- a/recipes-openxt/xenclient-repo-certs/xenclient-repo-certs_1.0.bb +++ b/recipes-openxt/xenclient-repo-certs/xenclient-repo-certs_1.0.bb @@ -9,7 +9,7 @@ SRC_URI = "file://${REPO_PROD_CACERT} \ FILES_${PN} = "${datadir}/xenclient/repo-certs \ ${bindir}/verify-repo-metadata" -inherit allarch +inherit multilib-allarch do_install() { CERTDIR_PROD=${D}${datadir}/xenclient/repo-certs/prod diff --git a/recipes-openxt/xenclient-uivm-xsessionconfig/xenclient-uivm-xsessionconfig_0.0.2.bb b/recipes-openxt/xenclient-uivm-xsessionconfig/xenclient-uivm-xsessionconfig_0.0.2.bb index ceb9427d65..aab92631fa 100644 --- a/recipes-openxt/xenclient-uivm-xsessionconfig/xenclient-uivm-xsessionconfig_0.0.2.bb +++ b/recipes-openxt/xenclient-uivm-xsessionconfig/xenclient-uivm-xsessionconfig_0.0.2.bb @@ -31,7 +31,7 @@ SRC_URI = " \ file://keyboard \ " -inherit allarch +inherit multilib-allarch do_install () { install -d ${D}/root/.config/xfce4 diff --git a/recipes-security/selinux/selinux-load_1.0.bb b/recipes-security/selinux/selinux-load_1.0.bb index cfc32600e8..c6e9dfb161 100644 --- a/recipes-security/selinux/selinux-load_1.0.bb +++ b/recipes-security/selinux/selinux-load_1.0.bb @@ -8,7 +8,7 @@ SRC_URI = " \ S = "${WORKDIR}" -inherit allarch +inherit multilib-allarch do_install() { install -d ${D}/sbin diff --git a/recipes-support/lvm2/lvm2-conf-initramfs_1.0.bb b/recipes-support/lvm2/lvm2-conf-initramfs_1.0.bb index aaf1c72f17..664f257b01 100644 --- a/recipes-support/lvm2/lvm2-conf-initramfs_1.0.bb +++ b/recipes-support/lvm2/lvm2-conf-initramfs_1.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = "file://lvm.conf" -inherit allarch +inherit multilib-allarch # The lvm2 recipe in openembedded-core uses multilib_script and MULTILIB_SCRIPTS # to handle installation of lvm.conf, and doing so here ensures that the file # is packaged in a compatible way.