diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-18 00:03:02 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-31 13:07:00 +0100 |
commit | 52295fa3deef3b0374b99829626d524cefae6001 (patch) | |
tree | 90a71c05f9efdb6d67685f27b33406ddcc4277df /meta/recipes-core/initrdscripts | |
parent | c3a7382c9aa56fdc06198788833a27e882d5030a (diff) | |
download | poky-52295fa3deef3b0374b99829626d524cefae6001.tar.gz |
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.
(From OE-Core rev: 26e5e5feb695864b11e47e24017e254c28f14494)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/initrdscripts')
3 files changed, 9 insertions, 6 deletions
diff --git a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb index b372fddbba..704c2718a0 100644 --- a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb | |||
@@ -3,11 +3,12 @@ LICENSE = "MIT" | |||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | SRC_URI = "file://init-boot.sh" | 4 | SRC_URI = "file://init-boot.sh" |
5 | 5 | ||
6 | PR = "r0" | 6 | PR = "r1" |
7 | 7 | ||
8 | do_install() { | 8 | do_install() { |
9 | install -m 0755 ${WORKDIR}/init-boot.sh ${D}/init | 9 | install -m 0755 ${WORKDIR}/init-boot.sh ${D}/init |
10 | } | 10 | } |
11 | 11 | ||
12 | PACKAGE_ARCH = "all" | 12 | inherit allarch |
13 | |||
13 | FILES_${PN} += " /init " | 14 | FILES_${PN} += " /init " |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb index f6a6a8a4cb..7051cbd32a 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb | |||
@@ -3,11 +3,12 @@ LICENSE = "MIT" | |||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | SRC_URI = "file://init-live.sh" | 4 | SRC_URI = "file://init-live.sh" |
5 | 5 | ||
6 | PR = "r2" | 6 | PR = "r3" |
7 | 7 | ||
8 | do_install() { | 8 | do_install() { |
9 | install -m 0755 ${WORKDIR}/init-live.sh ${D}/init | 9 | install -m 0755 ${WORKDIR}/init-live.sh ${D}/init |
10 | } | 10 | } |
11 | 11 | ||
12 | PACKAGE_ARCH = "all" | 12 | inherit allarch |
13 | |||
13 | FILES_${PN} += " /init " | 14 | FILES_${PN} += " /init " |
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" | |||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | SRC_URI = "file://init-install.sh" | 4 | SRC_URI = "file://init-install.sh" |
5 | 5 | ||
6 | PR = "r3" | 6 | PR = "r4" |
7 | 7 | ||
8 | RDEPENDS="grub parted e2fsprogs-mke2fs" | 8 | RDEPENDS="grub parted e2fsprogs-mke2fs" |
9 | 9 | ||
@@ -11,7 +11,8 @@ do_install() { | |||
11 | install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh | 11 | install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh |
12 | } | 12 | } |
13 | 13 | ||
14 | PACKAGE_ARCH = "all" | 14 | inherit allarch |
15 | |||
15 | FILES_${PN} = " /install.sh " | 16 | FILES_${PN} = " /install.sh " |
16 | 17 | ||
17 | # Alternatives to grub need adding for other arch support | 18 | # Alternatives to grub need adding for other arch support |