firmware-imx: install firmware loading scripts regardless of the init manager

When we added the SDMA fw systemd service, we accidentally made it so that all
scripts were installed only when using systemd. These files are still needed
when using sysvinit, so correct this change.

While at it, include the SDMA fw service in firmware-imx-sdma's FILES.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2021-09-06 12:56:09 +02:00
parent 05d21a1310
commit c26d78d7a1
1 changed files with 9 additions and 7 deletions

View File

@ -24,14 +24,16 @@ SYSTEMD_SERVICE_${PN}-sdma = "sdma-firmware.service"
do_install() {
install -d ${D}${base_libdir}/firmware/imx
# Install loading scripts
install -d ${D}${sysconfdir}
install -m 0755 ${WORKDIR}/sdma ${D}${sysconfdir}
install -m 0755 ${WORKDIR}/epdc ${D}${sysconfdir}
install -m 0755 ${WORKDIR}/regulatory ${D}${sysconfdir}
install -m 0755 ${WORKDIR}/hdmi ${D}${sysconfdir}
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
# Install loading scripts
install -d ${D}${sysconfdir}
# Install SDMA systemd service
install -d ${D}${systemd_system_unitdir}
install -m 0755 ${WORKDIR}/sdma ${D}${sysconfdir}
install -m 0755 ${WORKDIR}/epdc ${D}${sysconfdir}
install -m 0755 ${WORKDIR}/regulatory ${D}${sysconfdir}
install -m 0755 ${WORKDIR}/hdmi ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/sdma-firmware.service ${D}${systemd_system_unitdir}
fi
@ -100,7 +102,7 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-*"
PACKAGES =+ "${PN}-epdc ${PN}-sdma ${PN}-easrc ${PN}-regulatory ${PN}-hdmi ${PN}-xcvr ${PN}-xuvi"
FILES_${PN}-epdc = "${base_libdir}/firmware/imx/epdc/ ${sysconfdir}/epdc"
FILES_${PN}-sdma = "${base_libdir}/firmware/imx/sdma ${sysconfdir}/sdma"
FILES_${PN}-sdma = "${base_libdir}/firmware/imx/sdma ${sysconfdir}/sdma ${systemd_system_unitdir}/sdma-firmware.service"
FILES_${PN}-easrc = "${base_libdir}/firmware/imx/easrc/"
FILES_${PN}-regulatory = "${sysconfdir}/regulatory"
FILES_${PN}-hdmi = "${base_libdir}/firmware/imx/hdmi/ ${sysconfdir}/hdmi"