mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
improve Makefile.git
Change the example Makefile.git as suggested in #895 abort when a patch fails to apply fix build with GNU Make 4.0 reset git to the specified version instead of checking out a detached head
This commit is contained in:
parent
872ce5fee3
commit
ab4d151a6a
@ -20,11 +20,11 @@ patch: $(CURDIR)/$(PKG_NAME)/Makefile
|
||||
|
||||
$(CURDIR)/$(PKG_NAME)/Makefile: $(CURDIR)/$(PKG_NAME)
|
||||
# Here you apply your patch.
|
||||
$(foreach patch,$(shell ls [0-9][0-9][0-9][0-9]*.patch),cd "$<" && git am "$(patch)";)
|
||||
$(foreach patch,$(shell ls [0-9][0-9][0-9][0-9]*.patch),cd "$<" && git am "$(patch)" || { git am --abort; exit 1; };)
|
||||
|
||||
$(PKG_NAME)/:
|
||||
$(PKG_NAME):
|
||||
# Get PKG_VERSION of package from PKG_URL
|
||||
git clone $(PKG_URL) $(PKG_NAME) && cd $(PKG_NAME) && git checkout $(PKG_VERSION)
|
||||
git clone $(PKG_URL) $(PKG_NAME) && cd $(PKG_NAME) && git reset --hard $(PKG_VERSION)
|
||||
|
||||
clean::
|
||||
# Reset package to checkout state.
|
||||
|
Loading…
Reference in New Issue
Block a user