[oe-commits] Andreas Müller : systemd.bbclass: run code in populate_packages_prepend only if ${D} exists

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 916b26ef7d8c3779616763ceca144380bd6c058c
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=916b26ef7d8c3779616763ceca144380bd6c058c

Author: Andreas Müller <schnitzeltony at googlemail.com>
Date:   Wed Feb 22 14:00:10 2012 +0100

systemd.bbclass: run code in populate_packages_prepend only if ${D} exists

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 <schnitzeltony at googlemail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 meta-oe/classes/systemd.bbclass |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index b2d4191..e13f09d 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)
 }