JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix armbian-firmware-full package build.

Browse Source 
Include symlinks from linux-firmware.
This commit is contained in:
Kevin Schmidt
2024-08-06 18:38:28 +02:00
committed by Igor
parent 1e7b704c84
commit 08ef1a960f
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/functions/compilation/packages/firmware-deb.sh
View File

@@ -30,18 +30,21 @@ function compile_firmware() {
if [[ -n $FULL ]]; then
# Fetch kernel firmware from git. This is large, but we don't have two copies of it anymore. So more manageable.
declare fetched_revision
do_checkout="no" fetch_from_repo "$MAINLINE_FIRMWARE_SOURCE" "linux-firmware-git" "branch:main"
fetch_from_repo "$MAINLINE_FIRMWARE_SOURCE" "linux-firmware-git" "branch:main"
declare -r mainline_firmware_git_sha1="${fetched_revision}"
# use git archive to export the ${mainline_firmware_git_sha1} revision into "${fw_temp_dir}/${fw_dir}/lib/firmware/"
run_host_command_logged git -C "${SRC}/cache/sources/linux-firmware-git" archive --format=tar "${mainline_firmware_git_sha1}" "|" tar -C "${fw_temp_dir}/${fw_dir}/lib/firmware/" -xf -
# Usage of make install ensures proper symlink creation
cd "${SRC}/cache/sources/linux-firmware-git" || exit_with_error "can't change directory"
run_host_command_logged make DESTDIR="${fw_temp_dir}/${fw_dir}" FIRMWAREDIR=/lib/firmware install
# Full version conflicts with more stuff, of course.
extra_conflicts_comma=",amd64-microcode,intel-microcode"
# @TODO: rpardini: disabled, this is not the place to do this; move to extension/bsp/whatever
# cp : create hardlinks for ath11k WCN685x hw2.1 firmware since they are using the same firmware with hw2.0
# run_host_command_logged cp -af --reflink=auto "${fw_temp_dir}/${fw_dir}/lib/firmware/ath11k/WCN6855/hw2.0/" "${fw_temp_dir}/${fw_dir}/lib/firmware/ath11k/WCN6855/hw2.1/"
# This symlink messes with the armbian-firmware overwrite step
# @TODO: remove no longer needed symlink from armbian-firmware
if [[ -d "${fw_temp_dir}/${fw_dir}/lib/firmware/ath11k/WCN6855/hw2.1/" ]]; then
run_host_command_logged rm -r "${fw_temp_dir}/${fw_dir}/lib/firmware/ath11k/WCN6855/hw2.1/"
fi
fi
# Armbian firmware; this overwrites anything in the mainline firmware repo (if that was included, in the full version only)

1
lib/functions/host/prepare-host.sh
View File

@@ -282,6 +282,7 @@ function adaptative_prepare_host_dependencies() {
parted gdisk fdisk # partition tools @TODO why so many?
aria2 curl wget axel # downloaders et al
parallel # do things in parallel (used for fast md5 hashing in initrd cache)
rdfind # armbian-firmware-full/linux-firmware symlink creation step
)
# @TODO: distcc -- handle in extension?