From d88fa68141c8f25761973c413cf5b379c1b05d77 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Thu, 25 Sep 2014 14:17:56 +0200 Subject: 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. (From OE-Core rev: 6e875148f79a6877653a5bf95879b8cda1cacbc6) Signed-off-by: Richard Purdie Signed-off-by: Steffen Sledz Signed-off-by: Richard Purdie --- meta/classes/systemd.bbclass | 1 + meta/classes/update-rc.d.bbclass | 1 + 2 files changed, 2 insertions(+) (limited to 'meta') diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index 2bd63a405b..1516cd9d0a 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 668ead88a9..e8debdf42f 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): -- cgit v1.2.3-54-g00ecf