Bump initramfs-framework PR, as it was missed in the previous initramfs-framework patch.
These modules are shell scripts so they can be allarch. Fix the SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS in layer.conf, as these dependencies moved from the main recipe to these modules. Finally, set the PR to 4 in the new module recipes to avoid breaking package feeds. Fixes [YOCTO #12024]. Signed-off-by: California Sullivan <[email protected]> --- Reading the commit message this maybe should be split into multiple patches, but since they're issues caused by the taking the v1 version of my previous patch, I'm not sure. Let me know if its the former. meta/conf/layer.conf | 8 ++++---- meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 2 +- .../initrdscripts/initramfs-module-install-efi_1.0.bb | 4 +++- .../recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb | 4 +++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 04aa730..df457c2 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -50,12 +50,12 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ docbook-xsl-stylesheets->perl \ ca-certificates->openssl \ initramfs-framework->${VIRTUAL-RUNTIME_base-utils} \ - initramfs-framework->dosfstools \ - initramfs-framework->e2fsprogs \ initramfs-framework->eudev \ - initramfs-framework->parted \ initramfs-framework->systemd \ - initramfs-framework->util-linux \ + initramfs-module-install-efi->dosfstools \ + initramfs-module-install-efi->e2fsprogs \ + initramfs-module-install-efi->parted \ + initramfs-module-install-efi->util-linux \ liberation-fonts->fontconfig \ cantarell-fonts->fontconfig \ gnome-icon-theme->librsvg \ diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index c07a5fc..2afc37e 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" -PR = "r3" +PR = "r4" inherit allarch 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 8143f31..2270441 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 @@ -3,7 +3,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" RDEPENDS_${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools util-linux-blkid" -PR = "r1" +PR = "r4" + +inherit allarch FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:" SRC_URI = "file://install-efi.sh" diff --git a/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb index 7627cdc..4d2fe9d 100644 --- a/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb @@ -3,7 +3,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" RDEPENDS_${PN} = "initramfs-framework-base udev-extraconf" -PR = "r1" +PR = "r4" + +inherit allarch FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:" SRC_URI = "file://setup-live" -- 2.9.5 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
