From 2fc261ae8e86e98494ded2b77d65d3ea9af66430 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 5 Sep 2017 09:17:30 +0200 Subject: [PATCH] config/functions: add function get_full_firmware_dir Also update package.mk files to replace the hardcoded /usr/lib/firmware paths. Signed-off-by: Matthias Reichl --- config/functions | 5 +++++ .../linux-drivers/brcmap6xxx-aml/package.mk | 4 ++-- packages/linux-drivers/wetekdvb/package.mk | 4 ++-- .../linux-firmware/firmware-imx/package.mk | 6 +++--- .../linux-firmware/kernel-firmware/package.mk | 2 +- .../wlan-firmware-aml/package.mk | 20 +++++++++---------- packages/linux/package.mk | 6 +++--- 7 files changed, 26 insertions(+), 21 deletions(-) diff --git a/config/functions b/config/functions index 8a741c700c..58dee481be 100644 --- a/config/functions +++ b/config/functions @@ -151,6 +151,11 @@ get_full_module_dir() { echo "/usr/lib/modules/$(get_module_dir)" } +# get full path to firmware dir +get_full_firmware_dir() { + echo "/usr/lib/firmware" +} + # get package's build dir get_build_dir() { local _PKG_NAME="$(get_pkg_variable "$1" PKG_NAME)" _PKG_VERSION="$(get_pkg_version "$1")" diff --git a/packages/linux-drivers/brcmap6xxx-aml/package.mk b/packages/linux-drivers/brcmap6xxx-aml/package.mk index 97e2cbc343..5bf544220b 100644 --- a/packages/linux-drivers/brcmap6xxx-aml/package.mk +++ b/packages/linux-drivers/brcmap6xxx-aml/package.mk @@ -45,6 +45,6 @@ makeinstall_target() { mkdir -p $INSTALL/$(get_full_module_dir)/bcmdhd cp *.ko $INSTALL/$(get_full_module_dir)/bcmdhd - mkdir -p $INSTALL/usr/lib/firmware/brcm - cp $PKG_DIR/config/config.txt $INSTALL/usr/lib/firmware/brcm + mkdir -p $INSTALL/$(get_full_firmware_dir)/brcm + cp $PKG_DIR/config/config.txt $INSTALL/$(get_full_firmware_dir)/brcm } diff --git a/packages/linux-drivers/wetekdvb/package.mk b/packages/linux-drivers/wetekdvb/package.mk index 9232285252..c6d263a8ad 100644 --- a/packages/linux-drivers/wetekdvb/package.mk +++ b/packages/linux-drivers/wetekdvb/package.mk @@ -45,6 +45,6 @@ makeinstall_target() { cp driver/wetekdvb.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME fi - mkdir -p $INSTALL/usr/lib/firmware - cp firmware/* $INSTALL/usr/lib/firmware + mkdir -p $INSTALL/$(get_full_firmware_dir) + cp firmware/* $INSTALL/$(get_full_firmware_dir) } diff --git a/packages/linux-firmware/firmware-imx/package.mk b/packages/linux-firmware/firmware-imx/package.mk index 6103ba8dcd..28c4226f19 100644 --- a/packages/linux-firmware/firmware-imx/package.mk +++ b/packages/linux-firmware/firmware-imx/package.mk @@ -42,7 +42,7 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib/firmware/vpu - cp -P firmware/vpu/vpu_fw_imx6d.bin $INSTALL/usr/lib/firmware/vpu - cp -P firmware/vpu/vpu_fw_imx6q.bin $INSTALL/usr/lib/firmware/vpu + mkdir -p $INSTALL/$(get_full_firmware_dir)/vpu + cp -P firmware/vpu/vpu_fw_imx6d.bin $INSTALL/$(get_full_firmware_dir)/vpu + cp -P firmware/vpu/vpu_fw_imx6q.bin $INSTALL/$(get_full_firmware_dir)/vpu } diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk index 12867d06da..43ef8e8aac 100644 --- a/packages/linux-firmware/kernel-firmware/package.mk +++ b/packages/linux-firmware/kernel-firmware/package.mk @@ -42,7 +42,7 @@ make_target() { # Install additional miscellaneous drivers makeinstall_target() { - FW_TARGET_DIR=$INSTALL/usr/lib/firmware + FW_TARGET_DIR=$INSTALL/$(get_full_firmware_dir) FW_LISTS="${PKG_DIR}/firmwares/any.dat ${PKG_DIR}/firmwares/${TARGET_ARCH}.dat" FW_LISTS+=" ${PROJECT_DIR}/${PROJECT}/${PKG_NAME}/firmwares/any.dat" diff --git a/packages/linux-firmware/wlan-firmware-aml/package.mk b/packages/linux-firmware/wlan-firmware-aml/package.mk index 8480ca7cca..eee765454c 100644 --- a/packages/linux-firmware/wlan-firmware-aml/package.mk +++ b/packages/linux-firmware/wlan-firmware-aml/package.mk @@ -36,20 +36,20 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib/firmware/brcm + mkdir -p $INSTALL/$(get_full_firmware_dir)/brcm # AP6255 - cp -PR bcm_ampak/config/6255/fw_bcm43455c0_*.bin $INSTALL/usr/lib/firmware/brcm - cp -P bcm_ampak/config/6255/nvram.txt $INSTALL/usr/lib/firmware/brcm/nvram_ap6255.txt - cp -P bcm_ampak/config/6255/BT/BCM4345C0.hcd $INSTALL/usr/lib/firmware/brcm/bcm4345c0.hcd + cp -PR bcm_ampak/config/6255/fw_bcm43455c0_*.bin $INSTALL/$(get_full_firmware_dir)/brcm + cp -P bcm_ampak/config/6255/nvram.txt $INSTALL/$(get_full_firmware_dir)/brcm/nvram_ap6255.txt + cp -P bcm_ampak/config/6255/BT/BCM4345C0.hcd $INSTALL/$(get_full_firmware_dir)/brcm/bcm4345c0.hcd # AP6330 - cp -PR bcm_ampak/config/AP6330/Wi-Fi/fw_bcm40183b2*.bin $INSTALL/usr/lib/firmware/brcm - cp -P bcm_ampak/config/AP6330/Wi-Fi/nvram_ap6330.txt $INSTALL/usr/lib/firmware/brcm - cp -P bcm_ampak/config/AP6330/BT/bcm40183b2.hcd $INSTALL/usr/lib/firmware/brcm + cp -PR bcm_ampak/config/AP6330/Wi-Fi/fw_bcm40183b2*.bin $INSTALL/$(get_full_firmware_dir)/brcm + cp -P bcm_ampak/config/AP6330/Wi-Fi/nvram_ap6330.txt $INSTALL/$(get_full_firmware_dir)/brcm + cp -P bcm_ampak/config/AP6330/BT/bcm40183b2.hcd $INSTALL/$(get_full_firmware_dir)/brcm # AP6335 - cp -PR bcm_ampak/config/6335/fw_bcm4339a0_*.bin $INSTALL/usr/lib/firmware/brcm - cp -P bcm_ampak/config/6335/nvram.txt $INSTALL/usr/lib/firmware/brcm/nvram_ap6335.txt - cp -P bcm_ampak/config/6335/BT/bcm4335c0.hcd $INSTALL/usr/lib/firmware/brcm + cp -PR bcm_ampak/config/6335/fw_bcm4339a0_*.bin $INSTALL/$(get_full_firmware_dir)/brcm + cp -P bcm_ampak/config/6335/nvram.txt $INSTALL/$(get_full_firmware_dir)/brcm/nvram_ap6335.txt + cp -P bcm_ampak/config/6335/BT/bcm4335c0.hcd $INSTALL/$(get_full_firmware_dir)/brcm } diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 3b1b62c493..abedea8388 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -263,9 +263,9 @@ makeinstall_init() { } post_install() { - mkdir -p $INSTALL/usr/lib/firmware/ - ln -sf /storage/.config/firmware/ $INSTALL/usr/lib/firmware/updates + mkdir -p $INSTALL/$(get_full_firmware_dir)/ + ln -sf /storage/.config/firmware/ $INSTALL/$(get_full_firmware_dir)/updates # bluez looks in /etc/firmware/ - ln -sf /usr/lib/firmware/ $INSTALL/etc/firmware + ln -sf /$(get_full_firmware_dir)/ $INSTALL/etc/firmware }