[oe-commits] Steffen Sledz : update-rc.d/systemd: Remove OVERRIDES dependency

git at git.openembedded.org git at git.openembedded.org
Mon Sep 29 16:58:57 UTC 2014


Module: openembedded-core.git
Branch: daisy
Commit: 6e875148f79a6877653a5bf95879b8cda1cacbc6
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6e875148f79a6877653a5bf95879b8cda1cacbc6

Author: Steffen Sledz <sledz at dresearch-fe.de>
Date:   Thu Sep 25 14:17:56 2014 +0200

update-rc.d/systemd: Remove OVERRIDES dependency

Taking run-postinsts and building for two machines which have different
OVERRIDES leads to two different sets of stamps for an allarch package.

We don't need to depend on OVERRIDES in these classes, the end resulting
variables are good enough. We can therefore exclude the dependency
and allow a single package to be generated for run-postinsts.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
Signed-off-by: Steffen Sledz <sledz at dresearch-fe.de>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/systemd.bbclass     | 1 +
 meta/classes/update-rc.d.bbclass | 1 +
 2 files changed, 2 insertions(+)

diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 2bd63a4..1516cd9 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -55,6 +55,7 @@ fi
 
 
 systemd_populate_packages[vardeps] += "systemd_prerm systemd_postinst"
+systemd_populate_packages[vardepsexclude] += "OVERRIDES"
 
 python systemd_populate_packages() {
     if not oe.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d):
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 668ead8..e8debdf 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -71,6 +71,7 @@ PACKAGESPLITFUNCS_prepend = "populate_packages_updatercd "
 PACKAGESPLITFUNCS_remove_class-nativesdk = "populate_packages_updatercd "
 
 populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_preinst updatercd_postinst"
+populate_packages_updatercd[vardepsexclude] += "OVERRIDES"
 
 python populate_packages_updatercd () {
     def update_rcd_auto_depend(pkg):



More information about the Openembedded-commits mailing list