forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

CI: fix dtb check detecting itself and improve message (MR 3801)

Browse source 
Previously, the grep command would detect the /usr/bin/share string
inside of the .ci/grep.sh file, so only check the device folder to
avoid this. Other folders shouldn't contain any kernels anyway.

[ci:skip-build]: Everything but linux-postmarketos-qcom-sm7150
built fine in CI, and linux-postmarketos-qcom-sm7150 built fine
locally. Building linux-postmarketos-qcom-sm7150 via the CI failed
because it took over 3 hours so the CI timed out.
This commit is contained in:
Newbyte 2023-01-12 00:29:00 +01:00 committed by Luca Weiss
parent 14d50e1c06
commit 3fa300ecdb
No known key found for this signature in database
GPG key ID: 72D843B89D4DD756
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.ci/grep.sh
View file

@ -16,8 +16,10 @@ if grep -qr '(CHANGEME!)' *; then
fi fi
# DTBs installed to /usr/share/db # DTBs installed to /usr/share/db
if grep -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb'; then if grep -qr 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/; then
echo 'Please do not install dtbs to /usr/share/dtb!' echo 'ERROR: Please do not install dtbs to /usr/share/dtb!'
echo 'Unless you have a good reason not to, please put them in /boot/dtbs' echo 'ERROR: Unless you have a good reason not to, please put them in /boot/dtbs'
echo 'ERROR: Files that need fixing:'
grep --color=always -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/
exit 1 exit 1
fi fi