summaryrefslogtreecommitdiff
path: root/data/live-build-config
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-11-10 22:12:45 +0100
committerChristian Poessinger <christian@poessinger.com>2019-11-11 16:38:36 +0100
commit1dd7264b477a65101f75deca3260c297f535d9f0 (patch)
treebc7a6ac02311d8d4ce1c100a0efb53c2be74e427 /data/live-build-config
parent468dc26d5b94cfa88ab0c91321d6493c8209c20f (diff)
downloadvyos-build-1dd7264b477a65101f75deca3260c297f535d9f0.tar.gz
vyos-build-1dd7264b477a65101f75deca3260c297f535d9f0.zip
hooks: fix installation of linux firmware files
Firmware files have ben installed in wrong subdirectory (/lib/firmware/linux-firmware-<commitid>) (cherry picked from commit 2382c90dc7a30d17628a11f9ff41f8c63867887a)
Diffstat (limited to 'data/live-build-config')
-rwxr-xr-xdata/live-build-config/hooks/live/40-linux-firmware.chroot7
1 files 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=" \