Patch kexec inside makefile

diff --git a/package/kexec/kexec-patch.sh b/package/kexec/kexec-patch.sh
deleted file mode 100755 (executable)
index 4889705..0000000
--- 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 c6155194f60472cf0b8775c3b111abc8de554edc..a7c218b2d4d000e579c3616d97be26c844448db0 100644 (file)
--- 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 $@