From 3fa300ecdb6c69de2c34880d2c5beee3a76033b5 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Thu, 12 Jan 2023 00:29:00 +0100 Subject: [PATCH] CI: fix dtb check detecting itself and improve message (MR 3801) 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. --- .ci/grep.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.ci/grep.sh b/.ci/grep.sh index 53909ac5e..e16b1cd8a 100755 --- a/.ci/grep.sh +++ b/.ci/grep.sh @@ -16,8 +16,10 @@ if grep -qr '(CHANGEME!)' *; then fi # DTBs installed to /usr/share/db -if grep -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb'; then - echo 'Please do not install dtbs to /usr/share/dtb!' - echo 'Unless you have a good reason not to, please put them in /boot/dtbs' +if grep -qr 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/; then + echo 'ERROR: Please do not install dtbs to /usr/share/dtb!' + 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 fi