From cb726c166d9c6d17f5232ba3aea650b5a8411ce4 Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Tue, 24 Jul 2007 14:06:13 +0000
Subject: Patch correctly kexec, make sure utils is built using HOSTCC

---
 package/kexec/kexec-patch.sh                            | 16 ++++++++++++++++
 .../kexec-tools-003-build-util-using-host-gcc.patch     | 17 +++++++++++++++++
 package/kexec/kexec.mk                                  |  5 +++--
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100755 package/kexec/kexec-patch.sh
 create mode 100644 package/kexec/kexec-tools-003-build-util-using-host-gcc.patch

(limited to 'package/kexec')

diff --git a/package/kexec/kexec-patch.sh b/package/kexec/kexec-patch.sh
new file mode 100755
index 000000000..4889705fc
--- /dev/null
+++ b/package/kexec/kexec-patch.sh
@@ -0,0 +1,16 @@
+#!/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-tools-003-build-util-using-host-gcc.patch b/package/kexec/kexec-tools-003-build-util-using-host-gcc.patch
new file mode 100644
index 000000000..d2090d40f
--- /dev/null
+++ b/package/kexec/kexec-tools-003-build-util-using-host-gcc.patch
@@ -0,0 +1,17 @@
+diff -urN kexec-tools-1.101-0rig/util/Makefile kexec-tools-1.101/util/Makefile
+--- kexec-tools-1.101-0rig/util/Makefile	2004-12-16 22:08:21.000000000 +0100
++++ kexec-tools-1.101/util/Makefile	2007-07-24 16:32:48.000000000 +0200
+@@ -1,4 +1,4 @@
+ BIN_TO_HEX:= $(OBJDIR)/bin/bin-to-hex
+ $(BIN_TO_HEX): util/bin-to-hex.c
+ 	mkdir -p $(@D)
+-	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
++	$(HOSTCC) $(HOST_CFLAGS) $< -o $@
+diff -urN kexec-tools-1.101-0rig/util/Makefile~ kexec-tools-1.101/util/Makefile~
+--- kexec-tools-1.101-0rig/util/Makefile~	1970-01-01 01:00:00.000000000 +0100
++++ kexec-tools-1.101/util/Makefile~	2004-12-16 22:08:21.000000000 +0100
+@@ -0,0 +1,4 @@
++BIN_TO_HEX:= $(OBJDIR)/bin/bin-to-hex
++$(BIN_TO_HEX): util/bin-to-hex.c
++	mkdir -p $(@D)
++	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk
index 36f2d8cc5..c6155194f 100644
--- a/package/kexec/kexec.mk
+++ b/package/kexec/kexec.mk
@@ -35,9 +35,10 @@ $(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)
-	toolchain/patch-kernel.sh $(KEXEC_DIR) $(KEXEC_DIR)/debian/patches \*.patch
+	package/kexec/kexec-patch.sh $(KEXEC_DIR) $(KEXEC_DIR)/debian/patches 00list
+#	toolchain/patch-kernel.sh $(KEXEC_DIR) $(KEXEC_DIR)/debian/patches \*.patch
 endif
-	toolchain/patch-kernel.sh $(KEXEC_DIR) package/kexec/ kexec\*.dpatch
+	toolchain/patch-kernel.sh $(KEXEC_DIR) package/kexec/ kexec\*.patch
 	touch $@
 
 $(KEXEC_DIR)/.configured: $(KEXEC_DIR)/.unpacked
-- 
cgit v1.2.3