[oe-commits] Ting Liu : systemd: use system variables instead of hardcoded paths
git at git.openembedded.org
git at git.openembedded.org
Fri Dec 21 09:47:21 UTC 2012
Module: meta-openembedded.git
Branch: denzil
Commit: 35f92b4bd4a5f9bbea61237dc7702d87a8812503
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=35f92b4bd4a5f9bbea61237dc7702d87a8812503
Author: Ting Liu <b28495 at freescale.com>
Date: Fri Sep 14 10:17:19 2012 +0000
systemd: use system variables instead of hardcoded paths
Back port commit 980b338fb5100ff4c779335a86f3d9450ea8c54a
Below is the original commit message:
Fix build for ppc64
Consider /lib64 and /usr/lib64
Some 64bit architectures chose lib64 instead of lib
for default library dirnames. So we dig this from metadata
vars base_libdir and libdir instead of hardcoding 'lib'
ppc64 in OE uses lib64 for default libdir
and this leaves lot of udev/systemd
files unpackaged since 'lib' was hardcoded
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
Signed-off-by: Ting Liu <b28495 at freescale.com>
Signed-off-by: Eric Bénard <eric at eukrea.com>
---
meta-oe/classes/systemd.bbclass | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index a2c8ddf..0d88c64 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -154,7 +154,10 @@ python populate_packages_prepend () {
# check service-files and call systemd_add_files_and_parse for each entry
def systemd_check_services():
- searchpaths = '/etc/systemd/system/ /lib/systemd/system/ /usr/lib/systemd/system/'
+ base_libdir = d.getVar('base_libdir', 1)
+ searchpaths = '/etc/systemd/system/' + ' '
+ searchpaths += d.getVar('base_libdir', 1) + '/systemd/system/' + ' '
+ searchpaths += d.getVar('libdir', 1) + '/systemd/system/' + ' '
systemd_packages = d.getVar('SYSTEMD_PACKAGES', 1)
has_exactly_one_service = len(systemd_packages.split()) == 1
if has_exactly_one_service:
More information about the Openembedded-commits
mailing list