[oe-commits] Andrea Adami : kexec-tools_2.0.1: clean arm detection patch before sending it upstream

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 571fb9f63920660ad5bdb332856bfe9129a1f343
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=571fb9f63920660ad5bdb332856bfe9129a1f343

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Sun Oct  4 23:37:52 2009 +0200

kexec-tools_2.0.1: clean arm detection patch before sending it upstream

Signed-off-by: Andrea Adami <andrea.adami at gmail.com>

---

 recipes/kexec/files/fix-arm-arch-detection.patch |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/recipes/kexec/files/fix-arm-arch-detection.patch b/recipes/kexec/files/fix-arm-arch-detection.patch
index e581830..6116c5b 100644
--- a/recipes/kexec/files/fix-arm-arch-detection.patch
+++ b/recipes/kexec/files/fix-arm-arch-detection.patch
@@ -1,20 +1,16 @@
---- kexec-tools/kexec/phys_arch.c.old	2009-09-25 23:46:04.000000000 +0200
-+++ kexec-tools/kexec/phys_arch.c	2009-09-28 22:26:04.000000000 +0200
-@@ -13,9 +13,16 @@
+--- kexec-tools/kexec/phys_arch.c.old	2008-07-15 02:46:43.000000000 +0200
++++ kexec-tools/kexec/phys_arch.c	2009-10-04 23:58:04.000000000 +0200
+@@ -13,9 +13,12 @@
 		return -1;
 	}
 
 -	for (i = 0; arches[i].machine; ++i)
 -		if (strcmp(utsname.machine, arches[i].machine) == 0)
 +	for (i = 0; arches[i].machine; ++i) {
-+
-+		if ((strcmp(arches[i].machine, "arm") == 0) && (strncmp(utsname.machine, arches[i].machine, 3) == 0)) {
++		if ((strcmp(arches[i].machine, "arm") == 0) && (strncmp(utsname.machine, arches[i].machine, 3) == 0))
 +			return arches[i].arch;
-+		}
-+
-+		if (strcmp(utsname.machine, arches[i].machine) == 0) {
++		if (strcmp(utsname.machine, arches[i].machine) == 0)
 			return arches[i].arch;
-+		}
 +	}
 
 	fprintf(stderr, "Unsupported machine type: %s\n",