initrdscripts: exclude conflicting packages from world-image

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
index 861bec363fe17e78a4cef222e9a962ad78b9a7a6..810f9a8b8ebe339a3eb56419a4a9c87846622287 100644 (file)
--- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
@@ -34,6 +34,8 @@ do_install() {
     install -m 0755 ${WORKDIR}/debug ${D}/init.d/00-debug
 }
 
+EXCLUDE_PACKAGES_FROM_WORLD_IMAGE = "${PN}-base"
+
 PACKAGES = "${PN}-base \
             initramfs-module-mdev \
             initramfs-module-udev \

diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
index 2d378e2101547cdcf3f233d25efb4eed344d1ea7..e7e0fb11ccf8113ccfd16953dada8108054efddf 100644 (file)
--- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
@@ -5,6 +5,8 @@ DEPENDS = "virtual/kernel"
 RDEPENDS_${PN} = "udev udev-extraconf"
 SRC_URI = "file://init-live.sh"
 
+EXCLUDE_FROM_WORLD_IMAGE = "1"
+
 PR = "r11"
 
 do_install() {