diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-23 20:00:31 +0100 |
|---|---|---|
| committer |   Andreas Oberritter <obi@opendreambox.org> | 2015-02-23 17:15:47 +0100 |
| commit | 9c7442841df5b41f7d9773064d16b78a2eaccab3 (patch) | |
| tree | 287143a1672a84478624521f4dc1e2236ea6217c /meta/classes | |
| parent | 1abb540a31b6887108be0c181ddacf3735e87965 (diff) | |
| download | openembedded-core-contrib-9c7442841df5b41f7d9773064d16b78a2eaccab3.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit fdc949154e64afb41dd4db3a97be74a15963128d)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/systemd.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/update-rc.d.bbclass | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index 25cd3affce..834fdce805 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass @@ -55,6 +55,8 @@ 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 c9bf04c4f8..ec88bc3c20 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -69,6 +69,7 @@ python __anonymous() { PACKAGESPLITFUNCS_prepend = "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_package(pkg): |