mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-30 00:50:00 +00:00
netcf: support multilib builds
When doing a multilib build, /usr/lib is still created but not collected
into FILES_${PN} by default, resulting in a QA error. Adding both
${libdir} and ${nonarch_libdir} catches all scenarios.
It also turns out that the previous do_install_append would throw an error
in a multilib build since systemd always installs to .../lib/... but
${libdir] would point at .../lib64/...
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
@@ -32,12 +32,22 @@ do_configure_prepend() {
|
||||
do_install_append() {
|
||||
if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
|
||||
install -d ${D}${systemd_unitdir}/system
|
||||
mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
|
||||
rm -rf ${D}${libdir}/systemd/
|
||||
if [ -d "${D}${libdir}/systemd/system" ]; then
|
||||
mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
|
||||
rm -rf ${D}${libdir}/systemd/
|
||||
else
|
||||
mv ${D}${nonarch_libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
|
||||
rm -rf ${D}${nonarch_libdir}/systemd/
|
||||
fi
|
||||
else
|
||||
mv ${D}${sysconfdir}/rc.d/init.d/ ${D}${sysconfdir}
|
||||
rm -rf ${D}${sysconfdir}/rc.d/
|
||||
fi
|
||||
}
|
||||
|
||||
FILES_${PN} += " \
|
||||
${libdir} \
|
||||
${nonarch_libdir} \
|
||||
"
|
||||
|
||||
SYSTEMD_SERVICE_${PN} = "netcf-transaction.service"
|
||||
|
||||
Reference in New Issue
Block a user