Merge pull request RIOT-OS#15730 from miri64/dist/enh/pkg_source_loca…

…l-to-buildsystem_checks dist/tools: move check for PKG_SOURCE_LOCAL to buildsystem_sanity_check
LordTy · Jan 8, 2021 · 787c2de · 787c2de
2 parents d658be5 + fe74043
commit 787c2de
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/dist/tools/buildsystem_sanity_check/check.sh b/dist/tools/buildsystem_sanity_check/check.sh
@@ -305,6 +305,17 @@ check_no_usemodules_in_makefile_include() {
         | error_with_message "Don't include USEMODULE in Makefile.include"
 }
 
+check_no_pkg_source_local() {
+    local patterns=()
+    local pathspec=()
+
+    patterns+=(-e 'PKG_SOURCE_LOCAL')
+
+    pathspec+=('pkg/*/Makefile')
+    git -C "${RIOTBASE}" grep "${patterns[@]}" -- "${pathspec[@]}" \
+        | error_with_message "Don't push PKG_SOURCE_LOCAL definitions upstream"
+}
+
 error_on_input() {
     ! grep ''
 }
@@ -323,6 +334,7 @@ all_checks() {
     check_files_in_boards_not_reference_board_var
     check_no_pseudomodules_in_makefile_dep
     check_no_usemodules_in_makefile_include
+    check_no_pkg_source_local
 }
 
 main() {

diff --git a/dist/tools/pr_check/check.sh b/dist/tools/pr_check/check.sh
@@ -57,10 +57,4 @@ if [ -n "$TRAVIS_PULL_REQUEST" -o -n "$CI_PULL_NR" ]; then
     fi
 fi
 
-if git grep -q PKG_SOURCE_LOCAL -- pkg/*/Makefile; then
-    echo -e "${CERROR}The following files contain a PKG_SOURCE_LOCAL definition:${CRESET}"
-    git grep -l PKG_SOURCE_LOCAL -- pkg/*/Makefile
-    EXIT_CODE=1
-fi
-
 exit ${EXIT_CODE}