From patchwork Fri Jan 25 19:42:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/7] initrdscripts: exclude conflicting packages from world-image Date: Fri, 25 Jan 2013 19:42:49 -0000 From: Martin Jansa X-Patchwork-Id: 43409 Message-Id: <40602fae206e6946d89593ed8dca2782775b9cf2.1359142768.git.Martin.Jansa@gmail.com> To: openembedded-core@lists.openembedded.org 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 cbb4a39..8df391e 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 55a8600..17be28f 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 @@ RDEPENDS = "udev" DEPENDS = "virtual/kernel" SRC_URI = "file://init-live.sh" +EXCLUDE_FROM_WORLD_IMAGE = "1" + PR = "r11" do_compile() {