From 916b26ef7d8c3779616763ceca144380bd6c058c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 22 Feb 2012 14:00:10 +0100 Subject: [PATCH] systemd.bbclass: run code in populate_packages_prepend only if ${D} exists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All further manipulations need to be performed only once. This modication avoids unwanted behaviour when inheriting rm_work.bbclass [1] [1] http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-February/038067.html Signed-off-by: Andreas Müller Signed-off-by: Koen Kooi --- meta-oe/classes/systemd.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass index b2d4191d12..e13f09dc3e 100644 --- a/meta-oe/classes/systemd.bbclass +++ b/meta-oe/classes/systemd.bbclass @@ -127,6 +127,8 @@ python populate_packages_prepend () { bb.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d) - for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): - systemd_generate_package_scripts(pkg_systemd) + # run all modifications once when creating package + if os.path.exists('${D}'): + for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): + systemd_generate_package_scripts(pkg_systemd) }