mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-14 05:49:57 +00:00
systemd: use system variables instead of hardcoded paths
Back port commit 980b338fb5
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@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Ting Liu <b28495@freescale.com>
Signed-off-by: Eric Bénard <eric@eukrea.com>
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user