Skip to content

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

Merged
aabadie merged 5 commits intoRIOT-OS:masterfrom
aabadie:pr/make/git_cache_vars
Jun 23, 2020
Merged

make: pkg: don't export globally GITCACHE and GIT_CACHE_DIR vars#14263
aabadie merged 5 commits intoRIOT-OS:masterfrom
aabadie:pr/make/git_cache_vars

Conversation

@aabadie
Copy link
Copy Markdown
Contributor

@aabadie aabadie commented Jun 11, 2020 •
edited
Loading

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
@cladmi cladmi mentioned this pull request Jun 11, 2020
Closed
19 tasks
@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
Copy Markdown
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 ?

kaspar030
kaspar030 approved these changes Jun 23, 2020
View reviewed changes
Copy link
Copy Markdown
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
Copy Markdown
Contributor

kaspar030 commented Jun 23, 2020 

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
Copy Markdown
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

Reviewers

@kaspar030 kaspar030 kaspar030 approved these changes

Assignees

No one assigned

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

Milestone

Release 2020.07

Development

Successfully merging this pull request may close these issues.

3 participants

@aabadie @kaspar030 @miri64