From 1dd7264b477a65101f75deca3260c297f535d9f0 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 10 Nov 2019 22:12:45 +0100 Subject: hooks: fix installation of linux firmware files Firmware files have ben installed in wrong subdirectory (/lib/firmware/linux-firmware-) (cherry picked from commit 2382c90dc7a30d17628a11f9ff41f8c63867887a) --- data/live-build-config/hooks/live/40-linux-firmware.chroot | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/data/live-build-config/hooks/live/40-linux-firmware.chroot b/data/live-build-config/hooks/live/40-linux-firmware.chroot index 7d0de1f2..d3f34dec 100755 --- a/data/live-build-config/hooks/live/40-linux-firmware.chroot +++ b/data/live-build-config/hooks/live/40-linux-firmware.chroot @@ -14,9 +14,10 @@ if [ "${ret}" != "200" ]; then exit 1 fi -tar xf /tmp/linux-firmware-${COMMIT}.tar.gz -C /lib -mv /lib/linux-firmware-${COMMIT} /lib/firmware -rm -f /tmp/linux-firmware-${COMMIT}.tar.gz +tar xf /tmp/linux-firmware-${COMMIT}.tar.gz -C /tmp +mkdir -p /lib/firmware +mv /tmp/linux-firmware-${COMMIT}/* /lib/firmware +rm -rf /tmp/linux-firmware-${COMMIT}* # We do not need all firmware blobs .. cleanup RM_FIRMWARE=" \ -- cgit v1.2.3