manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workaround for #1084791 part 2 

The previous commit did not work properly.
Now output is generated that shows whether the workaround has been
applied or needs to be removed again.
This commit is contained in:
Roland Clobus 2024-10-28 11:36:06 +01:00
parent bb7e9e6368
commit 399393565c
No known key found for this signature in database
GPG Key ID: 62C57C6AA61495BD
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
functions/firmwarelists.sh
View File

@ -92,11 +92,15 @@ Firmware_List_From_Contents () {
fi
# Work around #1084791 (File conflict between firmware-realtek and firmware-realtek-rtl8723cs-bt)
# TODO: This work around must be removed as soon as the bug is fixed
if In_list non-free-firmware/kernel/firmware-realtek ${FIRMWARE_PACKAGES} \
&& In_list non-free-firmware/kernel/firmware-realtek-rtl8723cs-bt ${FIRMWARE_PACKAGES} \
&& In_list ${DISTRO_CHROOT} sid unstable
if In_list ${DISTRO_CHROOT} sid unstable
then
BLOCKLIST_FIRMWARE="${BLOCKLIST_FIRMWARE} firmware-realtek-rtl8723cs-bt"
if In_list non-free-firmware/kernel/firmware-realtek,non-free-firmware/kernel/firmware-realtek-rtl8723cs-bt ${FIRMWARE_PACKAGES}
then
BLOCKLIST_FIRMWARE="${BLOCKLIST_FIRMWARE} firmware-realtek-rtl8723cs-bt"
Echo_message "Workaround for #1084791 has been applied by preferring the newer package firmware-realtek"
else
Echo_warning "Workaround for #1084791 must be removed again"
fi
fi
# Deduplicate the list and prepare for easier manipulation by having each package on its own line