diff options
author | California Sullivan <california.l.sullivan@intel.com> | 2017-09-11 14:33:26 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-12 23:55:28 +0100 |
commit | 3d6f30265eefabcedb0239e9fc8e7398077dddd5 (patch) | |
tree | aabd01adf81b9c9b1543dcca3c990331eeedd0ff /meta/recipes-core | |
parent | e3a69364eb1fdbf1dcb98a04b3ddfc8f9841a7fa (diff) | |
download | poky-3d6f30265eefabcedb0239e9fc8e7398077dddd5.tar.gz |
initramfs-framework: bump PR and fix install-efi and setup-live modules
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].
(From OE-Core rev: d8af496dde699fadb2b21ff45cd20cf31e8abaf7)
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
3 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index c07a5fc8d6..2afc37ee75 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" | |||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" | 4 | RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" |
5 | 5 | ||
6 | PR = "r3" | 6 | PR = "r4" |
7 | 7 | ||
8 | inherit allarch | 8 | inherit allarch |
9 | 9 | ||
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 8143f315fd..2270441d06 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" | |||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | RDEPENDS_${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools util-linux-blkid" | 4 | RDEPENDS_${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools util-linux-blkid" |
5 | 5 | ||
6 | PR = "r1" | 6 | PR = "r4" |
7 | |||
8 | inherit allarch | ||
7 | 9 | ||
8 | FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:" | 10 | FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:" |
9 | SRC_URI = "file://install-efi.sh" | 11 | 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 7627cdc417..4d2fe9dd2b 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" | |||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | RDEPENDS_${PN} = "initramfs-framework-base udev-extraconf" | 4 | RDEPENDS_${PN} = "initramfs-framework-base udev-extraconf" |
5 | 5 | ||
6 | PR = "r1" | 6 | PR = "r4" |
7 | |||
8 | inherit allarch | ||
7 | 9 | ||
8 | FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:" | 10 | FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:" |
9 | SRC_URI = "file://setup-live" | 11 | SRC_URI = "file://setup-live" |