mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-10-21 12:21:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-kernel/coreos-firmware: Fix deletion of unneeded firmware files

Browse Source 
The code was tripping up over whitespace, resulting in scary error
messages, and was more cumbersome than it needed to be.

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
This commit is contained in:
James Le Cuirot 2025-10-10 18:25:36 +01:00
parent 303f2a6716
commit 4f6e00d94f
No known key found for this signature in database
GPG Key ID: 1226415D00DD3137
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild vendored
View File

@ -156,7 +156,7 @@ src_prepare() {
# Fail if any firmware is missing.
einfo "Scanning for files required by ${KV_FULL}"
echo -n > "${T}/firmware-scan"
echo "# Remove files that shall not be installed from this list." > ${PN}.conf
local kofile fwfile failed
for kofile in $(find "${kernel_mods}" -name '*.ko' -o -name '*.ko.xz'); do
for fwfile in $(modinfo --field firmware "${kofile}"); do
@ -164,10 +164,9 @@ src_prepare() {
eerror "Missing firmware: ${fwfile} (${kofile##*/})"
failed=1
elif [[ -L "${fwfile}" ]]; then
echo "${fwfile}" >> "${T}/firmware-scan"
realpath --relative-to=. "${fwfile}" >> "${T}/firmware-scan"
printf "%s\n" "${fwfile}" "$(realpath --relative-to=. "${fwfile}")" >> ${PN}.conf
else
echo "${fwfile}" >> "${T}/firmware-scan"
printf "%s\n" "${fwfile}" >> ${PN}.conf
fi
done
done
@ -177,20 +176,13 @@ src_prepare() {
# AMD's microcode is shipped as part of coreos-firmware, but not a dependency to
# any module, so add it manually
use amd64 && find amd-ucode/ -type f -not -name "*.asc" >> "${T}/firmware-scan"
use amd64 && find amd-ucode/ -type f -not -name "*.asc" >> ${PN}.conf
einfo "Pruning all unneeded firmware files..."
sort -u "${T}/firmware-scan" > "${T}/firmware"
find * -not -type d \
| sort "${T}/firmware" "${T}/firmware" - \
| uniq -u | xargs -r rm
find * -type f -name "* *" -exec rm -f {} \;
find * -not -type d -not -name ${PN}.conf -print0 | grep -Fzxvf ${PN}.conf | xargs -r0 rm -v
default
echo "# Remove files that shall not be installed from this list." > ${PN}.conf
find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
# whitelist of misc files
local misc_files=(
build_packages.py
@ -318,7 +310,7 @@ src_prepare() {
if use !unknown-license; then
einfo "Removing files with unknown license ..."
# Flatcar: do not die even if no such license file is there.
rm -v "${unknown_license[@]}"
rm -vf "${unknown_license[@]}"
fi
if use !redistributable; then