jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 05:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

config/functions: add function get_full_firmware_dir

Browse Source 
Also update package.mk files to replace the hardcoded
/usr/lib/firmware paths.

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2017-09-05 09:17:30 +02:00
parent d101bdfa24
commit 2fc261ae8e
7 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/functions
View File

@ -151,6 +151,11 @@ get_full_module_dir() {
echo "/usr/lib/modules/$(get_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 package's build dir
get_build_dir() { get_build_dir() {
local _PKG_NAME="$(get_pkg_variable "$1" PKG_NAME)" _PKG_VERSION="$(get_pkg_version "$1")" local _PKG_NAME="$(get_pkg_variable "$1" PKG_NAME)" _PKG_VERSION="$(get_pkg_version "$1")"

4
packages/linux-drivers/brcmap6xxx-aml/package.mk
View File

@ -45,6 +45,6 @@ makeinstall_target() {
mkdir -p $INSTALL/$(get_full_module_dir)/bcmdhd mkdir -p $INSTALL/$(get_full_module_dir)/bcmdhd
cp *.ko $INSTALL/$(get_full_module_dir)/bcmdhd cp *.ko $INSTALL/$(get_full_module_dir)/bcmdhd
mkdir -p $INSTALL/usr/lib/firmware/brcm mkdir -p $INSTALL/$(get_full_firmware_dir)/brcm
cp $PKG_DIR/config/config.txt $INSTALL/usr/lib/firmware/brcm cp $PKG_DIR/config/config.txt $INSTALL/$(get_full_firmware_dir)/brcm
} }

4
packages/linux-drivers/wetekdvb/package.mk
View File

@ -45,6 +45,6 @@ makeinstall_target() {
cp driver/wetekdvb.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME cp driver/wetekdvb.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
fi fi
mkdir -p $INSTALL/usr/lib/firmware mkdir -p $INSTALL/$(get_full_firmware_dir)
cp firmware/* $INSTALL/usr/lib/firmware cp firmware/* $INSTALL/$(get_full_firmware_dir)
} }

6
packages/linux-firmware/firmware-imx/package.mk
View File

@ -42,7 +42,7 @@ make_target() {
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/lib/firmware/vpu mkdir -p $INSTALL/$(get_full_firmware_dir)/vpu
cp -P firmware/vpu/vpu_fw_imx6d.bin $INSTALL/usr/lib/firmware/vpu cp -P firmware/vpu/vpu_fw_imx6d.bin $INSTALL/$(get_full_firmware_dir)/vpu
cp -P firmware/vpu/vpu_fw_imx6q.bin $INSTALL/usr/lib/firmware/vpu cp -P firmware/vpu/vpu_fw_imx6q.bin $INSTALL/$(get_full_firmware_dir)/vpu
} }

2
packages/linux-firmware/kernel-firmware/package.mk
View File

@ -42,7 +42,7 @@ make_target() {
# Install additional miscellaneous drivers # Install additional miscellaneous drivers
makeinstall_target() { 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="${PKG_DIR}/firmwares/any.dat ${PKG_DIR}/firmwares/${TARGET_ARCH}.dat"
FW_LISTS+=" ${PROJECT_DIR}/${PROJECT}/${PKG_NAME}/firmwares/any.dat" FW_LISTS+=" ${PROJECT_DIR}/${PROJECT}/${PKG_NAME}/firmwares/any.dat"

20
packages/linux-firmware/wlan-firmware-aml/package.mk
View File

@ -36,20 +36,20 @@ make_target() {
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/lib/firmware/brcm mkdir -p $INSTALL/$(get_full_firmware_dir)/brcm
# AP6255 # AP6255
cp -PR bcm_ampak/config/6255/fw_bcm43455c0_*.bin $INSTALL/usr/lib/firmware/brcm cp -PR bcm_ampak/config/6255/fw_bcm43455c0_*.bin $INSTALL/$(get_full_firmware_dir)/brcm
cp -P bcm_ampak/config/6255/nvram.txt $INSTALL/usr/lib/firmware/brcm/nvram_ap6255.txt 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/usr/lib/firmware/brcm/bcm4345c0.hcd cp -P bcm_ampak/config/6255/BT/BCM4345C0.hcd $INSTALL/$(get_full_firmware_dir)/brcm/bcm4345c0.hcd
# AP6330 # AP6330
cp -PR bcm_ampak/config/AP6330/Wi-Fi/fw_bcm40183b2*.bin $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/usr/lib/firmware/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/usr/lib/firmware/brcm cp -P bcm_ampak/config/AP6330/BT/bcm40183b2.hcd $INSTALL/$(get_full_firmware_dir)/brcm
# AP6335 # AP6335
cp -PR bcm_ampak/config/6335/fw_bcm4339a0_*.bin $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/usr/lib/firmware/brcm/nvram_ap6335.txt 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/usr/lib/firmware/brcm cp -P bcm_ampak/config/6335/BT/bcm4335c0.hcd $INSTALL/$(get_full_firmware_dir)/brcm
} }

6
packages/linux/package.mk
View File

@ -263,9 +263,9 @@ makeinstall_init() {
} }
post_install() { post_install() {
mkdir -p $INSTALL/usr/lib/firmware/ mkdir -p $INSTALL/$(get_full_firmware_dir)/
ln -sf /storage/.config/firmware/ $INSTALL/usr/lib/firmware/updates ln -sf /storage/.config/firmware/ $INSTALL/$(get_full_firmware_dir)/updates
# bluez looks in /etc/firmware/ # bluez looks in /etc/firmware/
ln -sf /usr/lib/firmware/ $INSTALL/etc/firmware ln -sf /$(get_full_firmware_dir)/ $INSTALL/etc/firmware
} }