From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 6 Mar 2018 20:50:05 +0000 (+0100)
Subject: imagebuilder: remove split patch dirs from imagebuilder archive
X-Git-Tag: v18.06.0-rc1~699
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a02a69d5f8a82aec2df7ad14018366d37b68ec11;p=oweals%2Fopenwrt.git

imagebuilder: remove split patch dirs from imagebuilder archive

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 418cf59c00..05c7cf3318 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -63,7 +63,8 @@ endif
 	fi
 	rm -rf \
 		$(PKG_BUILD_DIR)/target/linux/*/files{,-*} \
-		$(PKG_BUILD_DIR)/target/linux/*/patches{,-*}
+		$(PKG_BUILD_DIR)/target/linux/*/patches{,-*} \
+		$(PKG_BUILD_DIR)/target/linux/generic/{pending,backport,hack}{,-*}
 	-cp $(KERNEL_BUILD_DIR)/* $(IB_KDIR)/ # don't copy subdirectories here
 	-cp $(LINUX_DIR)/.config $(IB_LDIR)/
 	rm -f $(IB_KDIR)/root.*