diff options
| author | Khem Raj <raj.khem@gmail.com> | 2013-02-14 04:02:00 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-15 12:18:26 +0000 |
| commit | 22e16f44b58ae6bbf719b9074d39aac065a402f1 (patch) | |
| tree | 7b39f3c297a9fbb7ed01207557debc04b4ba492a | |
| parent | 17f8e03ace51df6b94fdcb7e410acf79c7b046ce (diff) | |
| download | openembedded-core-22e16f44b58ae6bbf719b9074d39aac065a402f1.tar.gz openembedded-core-22e16f44b58ae6bbf719b9074d39aac065a402f1.tar.bz2 openembedded-core-22e16f44b58ae6bbf719b9074d39aac065a402f1.zip | |
systemd.bbclass: Dont use libdir and base_libdir for units
systemd always uses /lib and /usr/lib to store unit files
so using libdir and base_libdir is incorrect. It will work
where libdir is usr/lib and base_libdir is /lib but wont work
when say its /lib64
Add a check to make sure that SYSTEMD_PACKAGES are part of PACKAGES
too, otherwise error out
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/systemd.bbclass | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index 8b558137ab..00865edc7c 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass @@ -49,6 +49,12 @@ python systemd_populate_packages() { val = (d.getVar(var, True) or "").strip() return val + # Check if systemd-packages already included in PACKAGES + def systemd_check_package(pkg_systemd): + packages = d.getVar('PACKAGES', True) + if not pkg_systemd in packages.split(): + bb.error('%s does not appear in package list, please add it', " " + pkg_systemd) + # Add a runtime dependency on systemd to pkg def systemd_add_rdepends(pkg): @@ -118,11 +124,9 @@ python systemd_populate_packages() { # Check service-files and call systemd_add_files_and_parse for each entry def systemd_check_services(): - base_libdir = d.getVar('base_libdir', True) searchpaths = [oe.path.join(d.getVar("sysconfdir", True), "systemd", "system"),] - searchpaths.append(oe.path.join(d.getVar("base_libdir", True), "systemd", "system")) - searchpaths.append(oe.path.join(d.getVar("libdir", True), "systemd", "system")) - searchpaths.append(oe.path.join(d.getVar("libdir", True), "systemd", "user")) + searchpaths.append(oe.path.join(d.getVar("nonarch_base_libdir", True), "systemd", "system")) + searchpaths.append(oe.path.join(d.getVar("exec_prefix", True), d.getVar("nonarch_base_libdir", True), "systemd", "system")) systemd_packages = d.getVar('SYSTEMD_PACKAGES', True) has_exactly_one_service = len(systemd_packages.split()) == 1 if has_exactly_one_service: @@ -149,6 +153,7 @@ python systemd_populate_packages() { # Run all modifications once when creating package if os.path.exists(d.getVar("D", True)): for pkg in d.getVar('SYSTEMD_PACKAGES', True).split(): + systemd_check_package(pkg) if d.getVar('SYSTEMD_SERVICE_' + pkg, True): systemd_generate_package_scripts(pkg) systemd_add_rdepends(pkg) |