diff options
author | Steffen Sledz <sledz@dresearch-fe.de> | 2014-09-25 14:17:56 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-29 17:58:35 +0100 |
commit | d88fa68141c8f25761973c413cf5b379c1b05d77 (patch) | |
tree | e911214f8f344fa53664b63f8e0f684155ff00ce /meta | |
parent | 3a93bfe1c7834805bd4aa4a5442cecd0cb64115b (diff) | |
download | poky-d88fa68141c8f25761973c413cf5b379c1b05d77.tar.gz |
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 <richard.purdie@linuxfoundation.org>
Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/systemd.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/update-rc.d.bbclass | 1 |
2 files changed, 2 insertions, 0 deletions
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 | |||
55 | 55 | ||
56 | 56 | ||
57 | systemd_populate_packages[vardeps] += "systemd_prerm systemd_postinst" | 57 | systemd_populate_packages[vardeps] += "systemd_prerm systemd_postinst" |
58 | systemd_populate_packages[vardepsexclude] += "OVERRIDES" | ||
58 | 59 | ||
59 | python systemd_populate_packages() { | 60 | python systemd_populate_packages() { |
60 | if not oe.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): | 61 | 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 " | |||
71 | PACKAGESPLITFUNCS_remove_class-nativesdk = "populate_packages_updatercd " | 71 | PACKAGESPLITFUNCS_remove_class-nativesdk = "populate_packages_updatercd " |
72 | 72 | ||
73 | populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_preinst updatercd_postinst" | 73 | populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_preinst updatercd_postinst" |
74 | populate_packages_updatercd[vardepsexclude] += "OVERRIDES" | ||
74 | 75 | ||
75 | python populate_packages_updatercd () { | 76 | python populate_packages_updatercd () { |
76 | def update_rcd_auto_depend(pkg): | 77 | def update_rcd_auto_depend(pkg): |