diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2012-10-09 11:12:16 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-10-09 11:16:04 +0200 |
| commit | aff5f48fb89ae8427cbbd5341f3bd1d4e43582f6 (patch) | |
| tree | 5c1b684fa748da57276a51e865eee24c2b161c14 | |
| parent | edc5dd9a2247a38b38905f2bc41805aa91c0617f (diff) | |
| download | meta-openembedded-aff5f48fb89ae8427cbbd5341f3bd1d4e43582f6.tar.gz | |
Revert "systemd.bbclass: Dont check for multilib and change for nativesdk renaming"
This triggers:
ERROR: Nothing RPROVIDES 'connman-systemd' (but /OE/tentacle/sources/meta-angstrom/recipes-images/angstrom/systemd-image.bb RDEPENDS on or otherwise requires it)
This reverts commit cbac8756e815c3f141cebf6d2e6875400980a4f9.
| -rw-r--r-- | meta-systemd/classes/systemd.bbclass | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta-systemd/classes/systemd.bbclass b/meta-systemd/classes/systemd.bbclass index d1f723613a..96d7f8f559 100644 --- a/meta-systemd/classes/systemd.bbclass +++ b/meta-systemd/classes/systemd.bbclass | |||
| @@ -68,11 +68,9 @@ def systemd_after_parse(d): | |||
| 68 | 68 | ||
| 69 | 69 | ||
| 70 | bpn = d.getVar('BPN', 1) | 70 | bpn = d.getVar('BPN', 1) |
| 71 | ml = d.getVar('MLPREFIX', 1) | ||
| 72 | if bpn + "-native" != d.getVar('PN', 1) and \ | 71 | if bpn + "-native" != d.getVar('PN', 1) and \ |
| 73 | bpn + "-cross" != d.getVar('PN', 1) and \ | 72 | bpn + "-cross" != d.getVar('PN', 1) and \ |
| 74 | ml + bpn != d.getVar('PN', 1) and \ | 73 | bpn + "-nativesdk" != d.getVar('PN', 1): |
| 75 | "nativesdk-" + bpn != d.getVar('PN', 1): | ||
| 76 | systemd_check_vars() | 74 | systemd_check_vars() |
| 77 | for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): | 75 | for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): |
| 78 | systemd_create_package(pkg_systemd) | 76 | systemd_create_package(pkg_systemd) |