From ea931f83e3d7e30cb1a26f5aa6976f137b70e37f Mon Sep 17 00:00:00 2001 From: Peter Hoyes Date: Thu, 28 Jan 2021 15:27:00 +0000 Subject: [PATCH] arm-autonomy: Use correct PACKAGE_ARCH in recipes-extended xen-devicetree should be $MACHINE_ARCH. xenguest-* should be allarch Issue-Id: SCM-2039 Signed-off-by: Peter Hoyes Change-Id: Id5666e1dc02a174e74bb8e843cb588287717d136 Signed-off-by: Jon Mason --- .../recipes-extended/xen-devicetree/xen-devicetree.bb | 1 + meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb | 2 +- meta-arm-autonomy/recipes-extended/xenguest/xenguest-mkimage.bb | 2 ++ meta-arm-autonomy/recipes-extended/xenguest/xenguest-network.bb | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb b/meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb index 29b80231..db955e16 100644 --- a/meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb +++ b/meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb @@ -30,6 +30,7 @@ XEN_DEVICETREE_DTSI_MERGE ?= "xen.dtsi" inherit nopackages deploy DEPENDS += "dtc-native" +PACKAGE_ARCH = "${MACHINE_ARCH}" do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb index ffb0fc39..2bfd6a95 100644 --- a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb +++ b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb @@ -37,7 +37,7 @@ XENGUEST_MANAGER_LOG_LEVEL ?= "ERROR" INITSCRIPT_NAME = "xenguest" INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 79 0 1 6 ." -inherit update-rc.d +inherit allarch update-rc.d do_compile() { echo "XENGUEST_VOLUME_DEVICE=\"${XENGUEST_MANAGER_VOLUME_DEVICE}\"" > \ diff --git a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-mkimage.bb b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-mkimage.bb index 6ea5fb10..080f137d 100644 --- a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-mkimage.bb +++ b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-mkimage.bb @@ -17,6 +17,8 @@ S = "${WORKDIR}" # Can be built native also to produce xenguest images during Yocto build BBCLASSEXTEND = "native" +inherit allarch + do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network.bb b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network.bb index 9464d43a..5f186593 100644 --- a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network.bb +++ b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-network.bb @@ -39,7 +39,7 @@ INITSCRIPT_PARAMS_${PN} = "start 01 2 3 4 5 . stop 81 0 1 6 ." INITSCRIPT_NAME_${PN}-kea-dhcp4 = "kea-restore-default-config" INITSCRIPT_PARAMS_${PN}-kea-dhcp4 = "defaults 20" -inherit update-rc.d +inherit allarch update-rc.d do_install() { cat ${WORKDIR}/xenguest-network-bridge.in \