summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2017-09-11 14:33:26 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-12 23:55:28 +0100
commit3d6f30265eefabcedb0239e9fc8e7398077dddd5 (patch)
treeaabd01adf81b9c9b1543dcca3c990331eeedd0ff /meta
parente3a69364eb1fdbf1dcb98a04b3ddfc8f9841a7fa (diff)
downloadpoky-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')
-rw-r--r--meta/conf/layer.conf8
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb2
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb4
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb4
4 files changed, 11 insertions, 7 deletions
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 04aa730160..df457c2821 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -50,12 +50,12 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
50 docbook-xsl-stylesheets->perl \ 50 docbook-xsl-stylesheets->perl \
51 ca-certificates->openssl \ 51 ca-certificates->openssl \
52 initramfs-framework->${VIRTUAL-RUNTIME_base-utils} \ 52 initramfs-framework->${VIRTUAL-RUNTIME_base-utils} \
53 initramfs-framework->dosfstools \
54 initramfs-framework->e2fsprogs \
55 initramfs-framework->eudev \ 53 initramfs-framework->eudev \
56 initramfs-framework->parted \
57 initramfs-framework->systemd \ 54 initramfs-framework->systemd \
58 initramfs-framework->util-linux \ 55 initramfs-module-install-efi->dosfstools \
56 initramfs-module-install-efi->e2fsprogs \
57 initramfs-module-install-efi->parted \
58 initramfs-module-install-efi->util-linux \
59 liberation-fonts->fontconfig \ 59 liberation-fonts->fontconfig \
60 cantarell-fonts->fontconfig \ 60 cantarell-fonts->fontconfig \
61 gnome-icon-theme->librsvg \ 61 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 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"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" 4RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}"
5 5
6PR = "r3" 6PR = "r4"
7 7
8inherit allarch 8inherit 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"
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 parted e2fsprogs-mke2fs dosfstools util-linux-blkid" 4RDEPENDS_${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools util-linux-blkid"
5 5
6PR = "r1" 6PR = "r4"
7
8inherit allarch
7 9
8FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:" 10FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:"
9SRC_URI = "file://install-efi.sh" 11SRC_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"
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 udev-extraconf" 4RDEPENDS_${PN} = "initramfs-framework-base udev-extraconf"
5 5
6PR = "r1" 6PR = "r4"
7
8inherit allarch
7 9
8FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:" 10FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:"
9SRC_URI = "file://setup-live" 11SRC_URI = "file://setup-live"