Merge pull request #5174 from kaspar030/pkg_do_proper_clean_for_git_repos

pkg: (git): move pkgdir to $BINDIRBASE/pkg/$BOARD/$PKG_NAME, do proper clean

Makefile.include

@@ -309,6 +309,9 @@ clean-intermediates:
 	-@for i in $(USEPKG) ; do "$(MAKE)" -C $(RIOTPKG)/$$i clean ; done
 	-@rm -rf $(BINDIR)/*.a $(BINDIR)/*/
 
+clean-pkg:
+	-@for i in $(USEPKG) ; do "$(MAKE)" -C $(RIOTPKG)/$$i distclean ; done
+
 distclean:
 	-@for i in $(USEPKG) ; do "$(MAKE)" -C $(RIOTPKG)/$$i distclean ; done
 	-@rm -rf $(BINDIRBASE)

pkg/ccn-lite/Makefile.include

@@ -1,2 +1,2 @@
-INCLUDES += -I$(RIOTPKG)/ccn-lite -I$(BINDIR)/pkg/ccn-lite/src
+INCLUDES += -I$(RIOTPKG)/ccn-lite -I$(BINDIRBASE)/pkg/$(BOARD)/ccn-lite/src
 INCLUDES += -I$(RIOTBASE)/sys/posix/include

pkg/cmsis-dsp/Makefile.include

@@ -1 +1 @@
-INCLUDES += -I$(BINDIR)/pkg/cmsis-dsp/include
+INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/cmsis-dsp/include

pkg/libcoap/Makefile.include

@@ -1,3 +1,3 @@
-INCLUDES += -I$(BINDIR)/pkg/libcoap \
+INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/libcoap \
 			-I$(RIOTBASE)/sys/posix/include \
 			-I$(RIOTBASE)/sys/net/include

pkg/micro-ecc/Makefile.include

@@ -1 +1 @@
-INCLUDES += -I$(BINDIR)/pkg/micro-ecc
+INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/micro-ecc

pkg/microcoap/Makefile.include

@@ -1 +1 @@
-INCLUDES += -I$(BINDIR)/pkg/microcoap
+INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/microcoap

pkg/oonf_api/Makefile.include

@@ -1 +1 @@
-INCLUDES += -I$(BINDIR)/pkg/oonf_api/src-api
+INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/oonf_api/src-api

pkg/pkg.mk

@@ -2,23 +2,29 @@
 # Include this file if your Package needs to be checked out by git
 #
 PKG_DIR?=$(CURDIR)
-PKG_BUILDDIR?=$(BINDIR)/pkg/$(PKG_NAME)
+PKG_BUILDDIR?=$(BINDIRBASE)/pkg/$(BOARD)/$(PKG_NAME)
 
 .PHONY: git-download
 
 git-download: $(PKG_BUILDDIR)/.git-downloaded
 
+GIT_APPLY_PATCHES:=if test -d "$(PKG_DIR)"/patches; then \
+	git -C "$(PKG_BUILDDIR)" am --ignore-whitespace "$(PKG_DIR)"/patches/*.patch; \
+	fi
+
 $(PKG_BUILDDIR)/.git-downloaded:
 	mkdir -p $(PKG_BUILDDIR)
 	$(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_BUILDDIR)"
-	if test -d "$(PKG_DIR)"/patches; then \
-		git -C "$(PKG_BUILDDIR)" am --ignore-whitespace "$(PKG_DIR)"/patches/*.patch; \
-	fi
+	$(GIT_APPLY_PATCHES)
 	touch $@
 
 clean::
-	@echo "Cleaning package $(PKG_NAME)..."
-	rm -rf "$(PKG_BUILDDIR)"
+	@test -d $(PKG_BUILDDIR) && { \
+		git -C $(PKG_BUILDDIR) clean -f ; \
+		git -C $(PKG_BUILDDIR) checkout "$(PKG_VERSION)"; \
+		$(GIT_APPLY_PATCHES) ; \
+		touch $(PKG_BUILDDIR)/.git-downloaded ; \
+	} > /dev/null 2>&1 || true
 
 distclean::
 	rm -rf "$(PKG_BUILDDIR)"

pkg/relic/Makefile.include

@@ -1 +1 @@
-INCLUDES += -I$(BINDIR)/pkg/relic/include
+INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/relic/include

pkg/tlsf/Makefile

@@ -2,29 +2,29 @@ PKG_NAME = tlsf
 PKG_VERSION = 3.0
 PKG_FILE = tlsf-$(PKG_VERSION).zip
 PKG_URL = http://download.riot-os.org/$(PKG_FILE)
-PKG_DIR=$(CURDIR)/$(PKG_NAME)
+PKG_DIR=$(CURDIR)
+PKG_BUILDDIR=$(BINDIRBASE)/pkg/$(BOARD)/$(PKG_NAME)
+PKG_SRCDIR=$(PKG_BUILDDIR)/src
 
 .PHONY: all clean distclean
 
-all: $(PKG_DIR)/$(PKG_NAME).a
+all: $(PKG_SRCDIR)/$(PKG_NAME).a
 
-$(PKG_DIR)/$(PKG_NAME).a: $(PKG_DIR)/Makefile
+$(PKG_SRCDIR)/$(PKG_NAME).a: $(PKG_SRCDIR)/Makefile
 	$(AD)make -C $(<D)
 
-$(PKG_DIR)/Makefile: $(CURDIR)/$(PKG_FILE) $(CURDIR)/patch.txt
-	@rm -rf $(@D)
-	@mkdir -p $(@D)
-	$(AD)cd $(@D) && $(UNZIP_HERE) $(CURDIR)/$(PKG_FILE)
+$(PKG_SRCDIR)/Makefile: $(PKG_BUILDDIR)/$(PKG_FILE) $(CURDIR)/patch.txt
+	rm -rf $(@D)
+	mkdir -p $(@D)
+	$(AD)cd $(@D) && $(UNZIP_HERE) $(PKG_BUILDDIR)/$(PKG_FILE)
 	$(AD)cd $(@D) && patch --binary -p0 -N -i $(CURDIR)/patch.txt
 
-$(CURDIR)/$(PKG_FILE):
+$(PKG_BUILDDIR)/$(PKG_FILE):
+	@mkdir -p $(@D)
 	$(AD)$(DOWNLOAD_TO_FILE) $@ $(PKG_URL)
 
 clean::
-	rm -rf $(PKG_DIR)/
+	rm -rf $(PKG_SRCDIR)/
 
-distclean:: clean
-	rm -f $(CURDIR)/$(PKG_FILE)
-
-Makefile.include:
-	@true
+distclean::
+	rm -rf $(PKG_BUILDDIR)/

pkg/tlsf/Makefile.include

@@ -1 +1 @@
-INCLUDES += -I$(RIOTPKG)/tlsf/tlsf
+INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/tlsf/src