Patchwork [2/7] initrdscripts: exclude conflicting packages from world-image

login
register
mail settings
Submitter Martin Jansa
Date Jan. 25, 2013, 7:42 p.m.
Message ID <40602fae206e6946d89593ed8dca2782775b9cf2.1359142768.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/43409/
State New
Headers show

Comments

Martin Jansa - Jan. 25, 2013, 7:42 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 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(+)

Patch

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() {