From 06b152fac0ff29652476f7b914d7b34d53523cc7 Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Fri, 10 Jul 2020 11:16:29 +0200
Subject: [PATCH] pkg/pkg.mk: improve clean and distclean for in-source builds

---
 pkg/pkg.mk | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkg/pkg.mk b/pkg/pkg.mk
index a97a39dc3d..da306c76ce 100644
--- a/pkg/pkg.mk
+++ b/pkg/pkg.mk
@@ -126,17 +126,14 @@ ifeq ($(PKG_SOURCE_DIR),$(PKG_BUILD_DIR))
 # This is the case for packages that are built within their source directory
 # e.g. micropython and openthread
 clean::
-	@-test -d $(PKG_SOURCE_DIR) && $(GIT_IN_PKG) clean $(GIT_QUIET) -xdff
-
-distclean::
-	rm -rf $(PKG_SOURCE_DIR)
+	@-test -d $(PKG_SOURCE_DIR) && $(GIT_IN_PKG) clean -xdff '**' -e $(PKG_STATE:$(PKG_SOURCE_DIR)/%='%*')
 else
 clean::
 	rm -rf $(PKG_BUILD_DIR)
+endif
 
 distclean:: clean
 	rm -rf $(PKG_SOURCE_DIR)
-endif
 
 # Dependencies to 'patches'
 -include $(PKG_PATCHED).d