Skip to content

Commit

Permalink
Merge pull request RIOT-OS#20689 from bmewen/cachedir-tag
Browse files Browse the repository at this point in the history
Makefile.include: creation of CACHEDIR.TAG as a dependency of pkg-prepare
  • Loading branch information
Enoch247 authored Jun 18, 2024
2 parents f68f512 + b275e61 commit aee2ea6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
6 changes: 0 additions & 6 deletions Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,6 @@ BUILDDEPS += $(RIOTBUILD_CONFIG_HEADER_C)
BUILDDEPS += pkg-prepare
BUILDDEPS += $(APPDEPS)
BUILDDEPS += $(MODULE_LIST_DIR)
BUILDDEPS += $(BUILD_DIR)/CACHEDIR.TAG

# 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
Expand Down Expand Up @@ -756,11 +755,6 @@ $(_SUBMAKE_LIBS): $(APPLICATION_MODULE).module pkg-build $(GENSRC)
print-size: $(ELFFILE)
$(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
$(Q)$(OBJCOPY) $(OFLAGS) -Oihex $< $@

Expand Down
9 changes: 8 additions & 1 deletion pkg/pkg.mk
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,15 @@ PKG_CUSTOM_PREPARED ?=
# Declare 'all' first to have it being the default target
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
prepare: $(PKG_PREPARED)
prepare: $(PKG_PREPARED) | $(BUILD_DIR)/CACHEDIR.TAG
@:

# Allow packages to add a custom step to be `prepared`.
Expand Down

0 comments on commit aee2ea6

Please sign in to comment.