RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #20689 from bmewen/cachedir-tag

Browse Source 
Makefile.include: creation of CACHEDIR.TAG as a dependency of pkg-prepare
This commit is contained in:
Joshua DeWeese 2024-06-18 19:54:39 +00:00 committed by GitHub
commit aee2ea64f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.include
View File

@ -688,7 +688,6 @@ BUILDDEPS += $(RIOTBUILD_CONFIG_HEADER_C)
BUILDDEPS += pkg-prepare BUILDDEPS += pkg-prepare
BUILDDEPS += $(APPDEPS) BUILDDEPS += $(APPDEPS)
BUILDDEPS += $(MODULE_LIST_DIR) BUILDDEPS += $(MODULE_LIST_DIR)
BUILDDEPS += $(BUILD_DIR)/CACHEDIR.TAG
# Build dependencies depend on clean (if a make goal), as clean may wipe them. # Build dependencies depend on clean (if a make goal), as clean may wipe them.
# Without them depending on clean parallel builds occasionally fail due to # Without them depending on clean parallel builds occasionally fail due to
@ -756,11 +755,6 @@ $(_SUBMAKE_LIBS): $(APPLICATION_MODULE).module pkg-build $(GENSRC)
print-size: $(ELFFILE) print-size: $(ELFFILE)
$(Q)$(SIZE) $(SIZEFLAGS) $< $(Q)$(SIZE) $(SIZEFLAGS) $<
$(BUILD_DIR)/CACHEDIR.TAG:
$(Q)mkdir -p "$(BUILD_DIR)"
$(Q)echo "Signature: 8a477f597d28d172789f06886806bc55" > "$@"
$(Q)echo "# This folder contains RIOT's build cache" >> "$@"
%.hex: %.elf %.hex: %.elf
$(Q)$(OBJCOPY) $(OFLAGS) -Oihex $< $@ $(Q)$(OBJCOPY) $(OFLAGS) -Oihex $< $@

9
pkg/pkg.mk
View File

@ -82,8 +82,15 @@ PKG_CUSTOM_PREPARED ?=
# Declare 'all' first to have it being the default target # Declare 'all' first to have it being the default target
all: prepare all: prepare
BUILD_DIR ?= $(RIOTBASE)/build
$(BUILD_DIR)/CACHEDIR.TAG:
$(Q)mkdir -p "$(BUILD_DIR)"
$(Q)echo "Signature: 8a477f597d28d172789f06886806bc55" > "$@"
$(Q)echo "# This folder contains RIOT's build cache" >> "$@"
# Add noop builtin to avoid "Nothing to be done for prepare" message # Add noop builtin to avoid "Nothing to be done for prepare" message
prepare: $(PKG_PREPARED) prepare: $(PKG_PREPARED) | $(BUILD_DIR)/CACHEDIR.TAG
@: @:
# Allow packages to add a custom step to be `prepared`. # Allow packages to add a custom step to be `prepared`.