summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2017-12-01 21:53:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-10 22:45:20 +0000
commit09b8b36b30cc5a359fc316169a037a03512cd5af (patch)
treeb74db2b81003a9c8593fe426080dd042db30a0dd
parent31fc614a234946b95bbbe92c5e6f7e59fba594a8 (diff)
downloadpoky-09b8b36b30cc5a359fc316169a037a03512cd5af.tar.gz
initramfs-module-install: Remove allarch and FILESEXTRAPATHS
* files is already included in default FILESPATH * it cannot inherit allarch as it RDEPENDS on bunch of TUNE_PKGARCH packages * use the same COMPATIBLE_HOST restrictions as grub has to prevent ERRORs in bitbake world ERROR: Nothing RPROVIDES 'grub' (but oe-core/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb RDEPENDS on or otherwise requires it) grub was skipped: incompatible with host arm-oe-linux-gnueabi (not in COMPATIBLE_HOST) grub was skipped: incompatible with host arm-oe-linux-gnueabi (not in COMPATIBLE_HOST) NOTE: Runtime target 'grub' is unbuildable, removing... Missing or unbuildable dependency chain was: ['grub'] ERROR: Required build target 'meta-world-pkgdata' has no buildable providers. (From OE-Core rev: ecad98a0ffe41d8cc8890d16be09e4b604a1e192) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb3
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb8
2 files changed, 5 insertions, 6 deletions
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
index 24b53a8498..1e7f76fd56 100644
--- a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
@@ -5,9 +5,6 @@ RDEPENDS_${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools ut
5 5
6PR = "r4" 6PR = "r4"
7 7
8inherit allarch
9
10FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
11SRC_URI = "file://init-install-efi.sh" 8SRC_URI = "file://init-install-efi.sh"
12 9
13S = "${WORKDIR}" 10S = "${WORKDIR}"
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
index ce7f165bfe..02b69f37a4 100644
--- a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
@@ -3,11 +3,13 @@ LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4RDEPENDS_${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid" 4RDEPENDS_${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid"
5 5
6PR = "r1" 6# The same restriction as grub
7COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)'
8COMPATIBLE_HOST_armv7a = 'null'
9COMPATIBLE_HOST_armv7ve = 'null'
7 10
8inherit allarch 11PR = "r1"
9 12
10FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
11SRC_URI = "file://init-install.sh" 13SRC_URI = "file://init-install.sh"
12 14
13S = "${WORKDIR}" 15S = "${WORKDIR}"