aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/kexec
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2009-10-04 23:37:52 +0200
committerAndrea Adami <andrea.adami@gmail.com>2009-10-04 23:40:58 +0200
commit571fb9f63920660ad5bdb332856bfe9129a1f343 (patch)
tree411370258fac273d9e1aab04f845d6c4d2b14e86 /recipes/kexec
parent1d4b26de0ac1d106420dfaadeb16f9acdc01f1b9 (diff)
downloadopenembedded-571fb9f63920660ad5bdb332856bfe9129a1f343.tar.gz
kexec-tools_2.0.1: clean arm detection patch before sending it upstream
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Diffstat (limited to 'recipes/kexec')
-rw-r--r--recipes/kexec/files/fix-arm-arch-detection.patch14
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 e581830ff0..6116c5bb84 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",