فهرست منبع

Patch kexec inside makefile

Ulf Samuelsson 18 سال پیش
والد
کامیت
a0511a1291
2فایلهای تغییر یافته به همراه4 افزوده شده و 19 حذف شده
  1. 0 16
      package/kexec/kexec-patch.sh
  2. 4 3
      package/kexec/kexec.mk

+ 0 - 16
package/kexec/kexec-patch.sh

@@ -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
-

+ 4 - 3
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 $@