From fe74043e9aa8eae18bc1f4b9ea536ec43c452f50 Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Fri, 8 Jan 2021 15:04:28 +0100 Subject: [PATCH] dist/tools: move check for PKG_SOURCE_LOCAL to buildsystem_sanity_check --- dist/tools/buildsystem_sanity_check/check.sh | 12 ++++++++++++ dist/tools/pr_check/check.sh | 6 ------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dist/tools/buildsystem_sanity_check/check.sh b/dist/tools/buildsystem_sanity_check/check.sh index 39dfc93b0c..6cf009a7be 100755 --- 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 index 6eb850b019..12eb2ada8a 100755 --- 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}