From f6acfb8139a3ac53dc9103cbe074d7ab5281795f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 25 Jan 2013 14:08:34 +0100 Subject: initrdscripts: exclude conflicting packages from world-image Signed-off-by: Martin Jansa --- meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 2 ++ meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 861bec363f..810f9a8b8e 100644 --- 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 2d378e2101..e7e0fb11cc 100644 --- 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() { -- cgit 1.2.3-korg