summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-01-25 14:08:34 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-04-02 19:49:37 +0200
commitf6acfb8139a3ac53dc9103cbe074d7ab5281795f (patch)
treee9ece57f80b63f25778febe6061e900360872510
parentacc1ffdb37f4af35ed4bcfee3b48d988358ff505 (diff)
downloadopenembedded-core-contrib-f6acfb8139a3ac53dc9103cbe074d7ab5281795f.tar.gz
openembedded-core-contrib-f6acfb8139a3ac53dc9103cbe074d7ab5281795f.tar.bz2
openembedded-core-contrib-f6acfb8139a3ac53dc9103cbe074d7ab5281795f.zip
initrdscripts: exclude conflicting packages from world-image
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb2
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb2
2 files changed, 4 insertions, 0 deletions
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() {