From 84c301cf9a4e88d1c6634ff0786eed86f397c5db Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 3 Jun 2007 07:33:00 +0000
Subject: enable quilt for host builds and add some additional checks

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7473 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/quilt.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'include/quilt.mk')

diff --git a/include/quilt.mk b/include/quilt.mk
index 5fbdda1b9f..beb0840c00 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -10,7 +10,7 @@ ifneq ($(QUILT),)
   STAMP_PREPARED:=$(strip $(STAMP_PREPARED))_q
   STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched
   CONFIG_AUTOREBUILD=
-  PATCHES:=$(shell cd ./patches; ls)
+  PATCHES:=$(shell (cd ./patches && ls) 2>/dev/null)
   define Build/Patch/Default
 	rm -rf $(PKG_BUILD_DIR)/patches
 	mkdir -p $(PKG_BUILD_DIR)/patches
@@ -36,18 +36,23 @@ endif
 
 $(STAMP_PATCHED): $(STAMP_PREPARED)
 	@cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null || true
-	cd $(PKG_BUILD_DIR); quilt push -a
+	$(if $(strip $(PATCHES)),cd $(PKG_BUILD_DIR); quilt push -a)
 	touch $@
 
 refresh: $(STAMP_PREPARED)
+	@[ -f "$(PKG_BUILD_DIR)/.quilt_used" ] || { \
+		echo "The source directory was not unpacked using quilt. Please rebuild with QUILT=1"; \
+		false; \
+	}
 	@[ -f "$(PKG_BUILD_DIR)/patches/series" ] || { \
-		echo "The source directory was not unpacked using quilt. Please rebuild."; \
+		echo "The source directory contains no quilt patches."; \
 		false; \
 	}
 	@[ "$$(cat $(PKG_BUILD_DIR)/patches/series | md5sum)" = "$$(sort $(PKG_BUILD_DIR)/patches/series | md5sum)" ] || { \
 		echo "The patches are not sorted in the right order. Please fix."; \
 		false; \
 	}
+	mkdir -p ./patches
 	rm -f ./patches/* 2>/dev/null >/dev/null
 	@( \
 		for patch in $$(cat $(PKG_BUILD_DIR)/patches/series); do \
-- 
cgit v1.2.3