root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

add firmware check to testsuite

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-11 21:30:51 +02:00
parent 8053db203e
commit 9981ca815c
4 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
usr/bin/archboot-firmware-check.sh → usr/bin/archboot-fw-check.sh
View file

@ -16,7 +16,12 @@ for i in $(find "${_MODULE_DIR}" | grep '.ko.*'); do
modinfo -F firmware "${i}" >>modules.txt
done
find "${_FIRMWARE}" | grep '.zst$' >firmware.txt
cp firmware.txt firmware.orig.txt
while read -r i; do
sed -i -e "s#${i}##g" firmware.txt
done < modules.txt
grep -v -E 'amd|amss|atmel|ath[0-9]|board-2|brcm|cs42l43|htc_*|i915|imx|intel|iwlwifi|libertas|m3\.bin|mediatek|mrvl|mwl.*|mt7650|nvidia|radeon|regdb|rsi|rt[0-9][0-9]*|rtl|rtw8[8-9]|slicoss|ti-connect|ti_*|vpu_*|/.zst' firmware.txt > error-firmware.txt
grep -v -E 'amd|amss|atmel|ath[0-9]|board-2|brcm|cs42l43|htc_*|i915|imx|intel|iwlwifi|libertas|m3\.bin|mediatek|mrvl|mwl.*|mt7650|nvidia|radeon|regdb|rsi|rt[0-9][0-9]*|rtl|rtw8[8-9]|slicoss|ti-connect|ti_*|vpu_*|/.zst' firmware.txt > fw-error.txt
if [[ -s fw-error.txt ]]; then
exit 1
fi
exit 0

9
usr/bin/archboot-testsuite.sh
View file

@ -5,8 +5,8 @@
_LOG=testsuite.log
_APPNAME=${0##*/}
_usage () {
echo "Tests for Archboot Environment"
echo "------------------------------"
echo "Testsuite for Archboot Environment"
echo "----------------------------------"
echo "usage: ${_APPNAME} run"
exit 0
}
@ -76,6 +76,11 @@ for i in $(grep '/usr/bin/' binary.txt | sed -e 's#^/usr/bin/##g'); do
fi
done
_result base-binary-error.txt
_run_test "Firmware Check"
if ! archboot-fw-check.sh; then
TEST_FAIL=1
fi
_result fw-error.txt
# uninstall base again!
pacman --noconfirm -Rdd base &>>"${_LOG}"
_run_test "Pacman Package Database Test"

2
usr/lib/archboot/cpio/hooks/installer
View file

@ -6,7 +6,7 @@ _run ()
{
_dir /mnt/install
_map _binary genfstab arch-chroot pacstrap \
archboot-{binary-check.sh,firmware-check,not-installed.sh,testsuite.sh} hwdetect
archboot-{binary-check.sh,fw-check,not-installed.sh,testsuite.sh} hwdetect
_file_rename /usr/bin/archboot-setup.sh /usr/bin/setup
_file_rename /usr/bin/archboot-launcher.sh /usr/bin/launcher
_file_rename /usr/bin/archboot-quickinst.sh /usr/bin/quickinst

2
usr/lib/archboot/update/manage.sh
View file

@ -151,7 +151,7 @@ _download_latest_task() {
for i in ${_SCRIPTS}; do
[[ -e "${_BIN}/${i}" ]] && ${_DLPROG} -o "${_BIN}/${i}" "${_SOURCE}${_BIN}/archboot-${i}.sh?inline=false"
done
_SCRIPTS="binary-check.sh firmware-check.sh not-installed.sh secureboot-keys.sh testsuite.sh mkkeys.sh hwsim.sh"
_SCRIPTS="binary-check.sh fw-check.sh not-installed.sh secureboot-keys.sh testsuite.sh mkkeys.sh hwsim.sh"
for i in ${_SCRIPTS}; do
[[ -e "${_BIN}/${i}" ]] && ${_DLPROG} -o "${_BIN}/${i}" "${_SOURCE}${_BIN}/archboot-${i}?inline=false"
[[ -e "${_BIN}/archboot-${i}" ]] && ${_DLPROG} -o "${_BIN}/archboot-${i}" "${_SOURCE}${_BIN}/archboot-${i}?inline=false"