[oe-commits] [openembedded-core] 10/62: initramfs-module-install: Remove allarch and FILESEXTRAPATHS

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch rocko
in repository openembedded-core.

commit 9497127e071d1a5408e04a47fcb7bd29775ec1c6
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: Wed Dec 20 16:56:35 2017 -0800

    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.
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    (cherry picked from commit ecad98a0ffe41d8cc8890d16be09e4b604a1e192)
    Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../initrdscripts/initramfs-module-install-efi_1.0.bb             | 3 ---
 meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb   | 8 +++++---
 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 24b53a8..1e7f76f 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
 
 PR = "r4"
 
-inherit allarch
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 SRC_URI = "file://init-install-efi.sh"
 
 S = "${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 ce7f165..02b69f3 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"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 RDEPENDS_${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid"
 
-PR = "r1"
+# The same restriction as grub
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)'
+COMPATIBLE_HOST_armv7a = 'null'
+COMPATIBLE_HOST_armv7ve = 'null'
 
-inherit allarch
+PR = "r1"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 SRC_URI = "file://init-install.sh"
 
 S = "${WORKDIR}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.