Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make: pkg: don't export globally GITCACHE and GIT_CACHE_DIR vars #14263

Merged
merged 5 commits into from
Jun 23, 2020

Conversation

aabadie
Copy link
Contributor

@aabadie aabadie commented Jun 11, 2020

Contribution description

Currently git-cache is only used in pkg.mk but the corresponding variables (GITCACHE and GIT_CACHE_DIR) are globally exported by the build system.
This PR cleans up this a little:

  • Move definitions of GITCACHE and GIT_CACHE_DIR variables in pkg.mk
  • Only export GIT_CACHE_DIR for the target that clones the package
  • Remove unnecessary redefinition of GITCACHE in flatc and moquitto_rsmb tools
  • Ensure both variables are not exported

Note that it's still possible to set custom GITCACHE and GIT_CACHE_DIR values from the command line.

I might have miss something related to the CI.

Testing procedure

  • A green Murdock
  • git-cache still functional:
    • enable gitcache: ./dist/tools/git/git-cache init
    • build an application with a package works:
      make -C tests/pkg_lvgl
      
    • build flatc or mosquitto_rsmb works:
      make -C dist/tools/flatc
      

Issues/PRs references

Ticks one item in #10850

@aabadie aabadie added Area: build system Area: Build system Area: pkg Area: External package ports Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation Area: tools Area: Supplementary tools labels Jun 11, 2020
@aabadie aabadie requested a review from kaspar030 June 11, 2020 10:41
@aabadie aabadie added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Jun 16, 2020
@aabadie aabadie changed the title make: pkg: don't export GITCACHE and GIT_CACHE_DIR vars make: pkg: don't export globally GITCACHE and GIT_CACHE_DIR vars Jun 17, 2020
@aabadie
Copy link
Contributor Author

aabadie commented Jun 17, 2020

This PR doesn't seem to cause any issue with Murdock. @kaspar030, do you see any issue with the approach ?

Copy link
Contributor

@kaspar030 kaspar030 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK.

@kaspar030
Copy link
Contributor

Error: Commit message is longer than 72 characters:
	    "Makefile.include: don't define/export GITCACHE and GIT_CACHE_DIR globally"

and please squash!

@aabadie aabadie force-pushed the pr/make/git_cache_vars branch from ac384f9 to 47a3f66 Compare June 23, 2020 11:52
@aabadie
Copy link
Contributor Author

aabadie commented Jun 23, 2020

Rebased and squashed!

@aabadie aabadie force-pushed the pr/make/git_cache_vars branch from 47a3f66 to d69036f Compare June 23, 2020 12:54
@aabadie aabadie merged commit f00e0de into RIOT-OS:master Jun 23, 2020
@aabadie aabadie deleted the pr/make/git_cache_vars branch June 23, 2020 15:25
@miri64 miri64 added this to the Release 2020.07 milestone Jun 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: build system Area: Build system Area: pkg Area: External package ports Area: tools Area: Supplementary tools CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants