aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-11-17 04:01:43 -0500
committerChen Qi <Qi.Chen@windriver.com>2014-12-19 17:05:16 +0800
commit14030a101df4c3eddbd3f7606b6d8835ab2c6110 (patch)
tree7036be651b26954b9fc51e2190281cd0f780a155
parent3803f210415897cb65d0fa81261a22504f72bd45 (diff)
downloadopenembedded-core-contrib-14030a101df4c3eddbd3f7606b6d8835ab2c6110.tar.gz
openembedded-core-contrib-14030a101df4c3eddbd3f7606b6d8835ab2c6110.tar.bz2
openembedded-core-contrib-14030a101df4c3eddbd3f7606b6d8835ab2c6110.zip
systemd: fix hardcoding of paths
Instead of using '/lib', we should use ${nonarch_lib_dir}. Otherwise, when ${nonarch_lib_dir} is not /lib, there would be errors. Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-rw-r--r--meta/recipes-core/systemd/systemd_216.bb12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb
index 536b7be25d..b90e739776 100644
--- a/meta/recipes-core/systemd/systemd_216.bb
+++ b/meta/recipes-core/systemd/systemd_216.bb
@@ -87,7 +87,7 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
--enable-split-usr \
--without-python \
--with-sysvrcnd-path=${sysconfdir} \
- --with-firmware-path=/lib/firmware \
+ --with-firmware-path=${nonarch_base_libdir}/firmware \
ac_cv_path_KILL=${base_bindir}/kill \
"
# uclibc does not have NSS
@@ -260,10 +260,10 @@ FILES_${PN} = " ${base_bindir}/* \
${exec_prefix}/lib/sysctl.d \
${exec_prefix}/lib/sysusers.d \
${localstatedir} \
- /lib/udev/rules.d/70-uaccess.rules \
- /lib/udev/rules.d/71-seat.rules \
- /lib/udev/rules.d/73-seat-late.rules \
- /lib/udev/rules.d/99-systemd.rules \
+ ${nonarch_base_libdir}/udev/rules.d/70-uaccess.rules \
+ ${nonarch_base_libdir}/udev/rules.d/71-seat.rules \
+ ${nonarch_base_libdir}/udev/rules.d/73-seat-late.rules \
+ ${nonarch_base_libdir}/udev/rules.d/99-systemd.rules \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d', '', d)} \
"
@@ -281,7 +281,7 @@ RRECOMMENDS_${PN} += "systemd-serialgetty systemd-compat-units udev-hwdb\
PACKAGES =+ "udev-dbg udev udev-hwdb"
-FILES_udev-dbg += "/lib/udev/.debug"
+FILES_udev-dbg += "${nonarch_base_libdir}/udev/.debug"
RPROVIDES_udev = "hotplug"