riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dist/tools: move check for PKG_SOURCE_LOCAL to buildsystem_sanity_check

Browse Source
This commit is contained in:
Martine Lenders 2021-01-08 15:04:28 +01:00
parent 38a0a86b1b
commit fe74043e9a
No known key found for this signature in database
GPG Key ID: CCD317364F63286F
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/tools/buildsystem_sanity_check/check.sh vendored
View File

@ -305,6 +305,17 @@ check_no_usemodules_in_makefile_include() {
| error_with_message "Don't include USEMODULE 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() { error_on_input() {
! grep '' ! grep ''
} }
@ -323,6 +334,7 @@ all_checks() {
check_files_in_boards_not_reference_board_var check_files_in_boards_not_reference_board_var
check_no_pseudomodules_in_makefile_dep check_no_pseudomodules_in_makefile_dep
check_no_usemodules_in_makefile_include check_no_usemodules_in_makefile_include
check_no_pkg_source_local
} }
main() { main() {

6
dist/tools/pr_check/check.sh vendored
View File

@ -57,10 +57,4 @@ if [ -n "$TRAVIS_PULL_REQUEST" -o -n "$CI_PULL_NR" ]; then
fi fi
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} exit ${EXIT_CODE}