Skip to content

Commit

Permalink
Move patch sentinel into idf repo.
Browse files Browse the repository at this point in the history
To hopefully get wiped when CI resets that subrepo...
  • Loading branch information
jmattsson committed Oct 17, 2023
1 parent 090d4f0 commit 29caabb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ bin
.idea
*.iml

.idf_patched
.idf_tools_installed
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ THIS_MK_FILE:=$(notdir $(lastword $(MAKEFILE_LIST)))
THIS_DIR:=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
IDF_PATH=$(THIS_DIR)/sdk/esp32-esp-idf

all: .idf_tools_installed
all: | .idf_tools_installed
. $(IDF_PATH)/export.sh && $(MAKE) "$@"

%: .idf_tools_installed
%: | .idf_tools_installed
. $(IDF_PATH)/export.sh && $(MAKE) "$@"

IDF_PATCHES:=$(wildcard idf-patches/*)

.idf_patched: $(IDF_PATCHES)
$(IDF_PATH)/.patched: $(IDF_PATCHES)
@echo "Discarding local IDF changes..."
(cd "$(IDF_PATH)" && git checkout . )
@echo "Patching IDF..."
for f in $(IDF_PATCHES); do (cd "$(IDF_PATH)" && patch -p1 < "$(THIS_DIR)/$$f" ); done
touch "$@"

.idf_tools_installed: .idf_patched
.idf_tools_installed: $(IDF_PATH)/.patched
"$(THIS_DIR)/install.sh"
touch "$@"

Expand Down

0 comments on commit 29caabb

Please sign in to comment.