From 26e5e5feb695864b11e47e24017e254c28f14494 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 18 May 2011 00:03:02 +0100 Subject: Improve handling of 'all' architecture recipes and their interaction with sstate The existing PACKAGE_ARCH = "all" mechanism of sharing packages is problematic with sstate since there are a variety of variables which have target specific values and the sstate package therefore correctly changes signature depending on the MACHINE setting. This patch creates a new "allarch" class which sets: PACKAGE_ARCH = "all" (as per the existing convention) INHIBIT_DEFAULT_DEPS = "1" (since its not target specific and therefore can't depend on the cross compiler or target libc) TARGET_ARCH = "all" TARGET_OS = "linux" TARGET_CC_ARCH = "none" (since these variables shouldn't change between the different packages and target compiler flags shouldn't be getting used) PACKAGE_EXTRA_ARCHS = "" (since we shouldn't be depending on any architecture specific package architectures) Not all PACKAGE_ARCH = "all" recipes can use this class since some run configure checks on the compiler. This means they have target specific components and therefore the "all" classification is incorrect. Signed-off-by: Richard Purdie --- meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb') diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb index c599be5c58..fdda71819f 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = "file://init-install.sh" -PR = "r3" +PR = "r4" RDEPENDS="grub parted e2fsprogs-mke2fs" @@ -11,7 +11,8 @@ do_install() { install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh } -PACKAGE_ARCH = "all" +inherit allarch + FILES_${PN} = " /install.sh " # Alternatives to grub need adding for other arch support -- cgit 1.2.3-korg