From a0511a12917f1478b00e57254e50a42fbb26d8a5 Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Fri, 27 Jul 2007 07:34:44 +0000
Subject: Patch kexec inside makefile

---
 package/kexec/kexec-patch.sh | 16 ----------------
 package/kexec/kexec.mk       |  7 ++++---
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100755 package/kexec/kexec-patch.sh

(limited to 'package')

diff --git a/package/kexec/kexec-patch.sh b/package/kexec/kexec-patch.sh
deleted file mode 100755
index 4889705fc..000000000
--- a/package/kexec/kexec-patch.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-SRCDIR=$1
-PATCHDIR=$2
-PATCHLIST=${PATCHDIR}/$3
-
-do_patch()
-{
-	cd ${SRCDIR}
-	for f in `cat ${PATCHLIST}` ; do
-		echo ${PATCHDIR}/$f
-		cat ${PATCHDIR}/$f | patch -p2
-	done
-}
-
-do_patch
-
diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk
index c6155194f..a7c218b2d 100644
--- a/package/kexec/kexec.mk
+++ b/package/kexec/kexec.mk
@@ -34,9 +34,10 @@ kexec-source: $(DL_DIR)/$(KEXEC_SOURCE) $(DL_DIR)/$(KEXEC_PATCH)
 $(KEXEC_DIR)/.unpacked: $(DL_DIR)/$(KEXEC_SOURCE) $(DL_DIR)/$(KEXEC_PATCH)
 	$(KEXEC_CAT) $(DL_DIR)/$(KEXEC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 ifneq ($(KEXEC_PATCH),)
-	(cd $(KEXEC_DIR) && $(KEXEC_CAT) $(DL_DIR)/$(KEXEC_PATCH) | patch -p1)
-	package/kexec/kexec-patch.sh $(KEXEC_DIR) $(KEXEC_DIR)/debian/patches 00list
-#	toolchain/patch-kernel.sh $(KEXEC_DIR) $(KEXEC_DIR)/debian/patches \*.patch
+	(cd $(KEXEC_DIR) && $(KEXEC_CAT) $(DL_DIR)/$(KEXEC_PATCH) | patch -p1;	\
+	for f in `cat debian/patches/00list` ; do	\
+		cat debian/patches/$$f | patch -p2 ; 	\
+	done)
 endif
 	toolchain/patch-kernel.sh $(KEXEC_DIR) package/kexec/ kexec\*.patch
 	touch $@
-- 
cgit v1.2.3