summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/libaio/libaio/00_arches.patch103
-rw-r--r--meta/recipes-extended/libaio/libaio_0.3.109.bb (renamed from meta/recipes-extended/libaio/libaio_0.3.107.bb)4
2 files changed, 56 insertions, 51 deletions
diff --git a/meta/recipes-extended/libaio/libaio/00_arches.patch b/meta/recipes-extended/libaio/libaio/00_arches.patch
index 77c2b3c317..91f4588cc5 100644
--- a/meta/recipes-extended/libaio/libaio/00_arches.patch
+++ b/meta/recipes-extended/libaio/libaio/00_arches.patch
@@ -2,8 +2,10 @@ Upstream-Status: Inappropriate [embedded specific]
2 2
3from openembedded, added by Qing He <qing.he@intel.com> 3from openembedded, added by Qing He <qing.he@intel.com>
4 4
5--- libaio-0.3.106.orig/src/syscall-m68k.h 5Index: libaio-0.3.109/src/syscall-m68k.h
6+++ libaio-0.3.106/src/syscall-m68k.h 6===================================================================
7--- /dev/null
8+++ libaio-0.3.109/src/syscall-m68k.h
7@@ -0,0 +1,78 @@ 9@@ -0,0 +1,78 @@
8+#define __NR_io_setup 241 10+#define __NR_io_setup 241
9+#define __NR_io_destroy 242 11+#define __NR_io_destroy 242
@@ -83,8 +85,10 @@ from openembedded, added by Qing He <qing.he@intel.com>
83+return (type) __res; \ 85+return (type) __res; \
84+} 86+}
85+ 87+
86--- libaio-0.3.106.orig/src/syscall-sparc.h 88Index: libaio-0.3.109/src/syscall-sparc.h
87+++ libaio-0.3.106/src/syscall-sparc.h 89===================================================================
90--- /dev/null
91+++ libaio-0.3.109/src/syscall-sparc.h
88@@ -0,0 +1,130 @@ 92@@ -0,0 +1,130 @@
89+/* $Id: unistd.h,v 1.74 2002/02/08 03:57:18 davem Exp $ */ 93+/* $Id: unistd.h,v 1.74 2002/02/08 03:57:18 davem Exp $ */
90+ 94+
@@ -216,14 +220,14 @@ from openembedded, added by Qing He <qing.he@intel.com>
216+return -1; \ 220+return -1; \
217+} 221+}
218+ 222+
219--- libaio-0.3.106.orig/src/syscall.h 223Index: libaio-0.3.109/src/syscall.h
220+++ libaio-0.3.106/src/syscall.h 224===================================================================
221@@ -22,6 +22,16 @@ 225--- libaio-0.3.109.orig/src/syscall.h
222 #include "syscall-s390.h" 226+++ libaio-0.3.109/src/syscall.h
223 #elif defined(__alpha__) 227@@ -24,6 +24,14 @@
224 #include "syscall-alpha.h" 228 #include "syscall-alpha.h"
225+#elif defined(__arm__) 229 #elif defined(__arm__)
226+#include "syscall-arm.h" 230 #include "syscall-arm.h"
227+#elif defined(__m68k__) 231+#elif defined(__m68k__)
228+#include "syscall-m68k.h" 232+#include "syscall-m68k.h"
229+#elif defined(__sparc__) 233+#elif defined(__sparc__)
@@ -235,8 +239,10 @@ from openembedded, added by Qing He <qing.he@intel.com>
235 #else 239 #else
236 #error "add syscall-arch.h" 240 #error "add syscall-arch.h"
237 #endif 241 #endif
238--- libaio-0.3.106.orig/src/syscall-mips.h 242Index: libaio-0.3.109/src/syscall-mips.h
239+++ libaio-0.3.106/src/syscall-mips.h 243===================================================================
244--- /dev/null
245+++ libaio-0.3.109/src/syscall-mips.h
240@@ -0,0 +1,223 @@ 246@@ -0,0 +1,223 @@
241+/* 247+/*
242+ * This file is subject to the terms and conditions of the GNU General Public 248+ * This file is subject to the terms and conditions of the GNU General Public
@@ -461,51 +467,45 @@ from openembedded, added by Qing He <qing.he@intel.com>
461+ 467+
462+#endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */ 468+#endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
463+ 469+
464--- libaio-0.3.106.orig/src/libaio.h 470Index: libaio-0.3.109/src/libaio.h
465+++ libaio-0.3.106/src/libaio.h 471===================================================================
466@@ -72,6 +72,40 @@ 472--- libaio-0.3.109.orig/src/libaio.h
467 #define PADDED(x, y) unsigned y; x 473+++ libaio-0.3.109/src/libaio.h
468 #define PADDEDptr(x, y) unsigned y; x 474@@ -83,6 +83,30 @@ typedef enum io_iocb_cmd {
469 #define PADDEDul(x, y) unsigned y; unsigned long x 475 #define PADDEDptr(x, y) x; unsigned y
470+#elif defined(__arm__) 476 #define PADDEDul(x, y) unsigned long x; unsigned y
471+# if defined (__ARMEB__) /* big endian, 32 bits */ 477 # endif
472+#define PADDED(x, y) unsigned y; x
473+#define PADDEDptr(x, y) unsigned y; x
474+#define PADDEDul(x, y) unsigned y; unsigned long x
475+# else /* little endian, 32 bits */
476+#define PADDED(x, y) x; unsigned y
477+#define PADDEDptr(x, y) x; unsigned y
478+#define PADDEDul(x, y) unsigned long x; unsigned y
479+# endif
480+#elif defined(__m68k__) /* big endian, 32 bits */ 478+#elif defined(__m68k__) /* big endian, 32 bits */
481+#define PADDED(x, y) unsigned y; x 479+#define PADDED(x, y) unsigned y; x
482+#define PADDEDptr(x, y) unsigned y; x 480+#define PADDEDptr(x, y) unsigned y; x
483+#define PADDEDul(x, y) unsigned y; unsigned long x 481+#define PADDEDul(x, y) unsigned y; unsigned long x
484+#elif defined(__sparc__) /* big endian, 32 bits */ 482+#elif defined(__sparc__) /* big endian, 32 bits */
485+#define PADDED(x, y) unsigned y; x 483+#define PADDED(x, y) unsigned y; x
486+#define PADDEDptr(x, y) unsigned y; x 484+#define PADDEDptr(x, y) unsigned y; x
487+#define PADDEDul(x, y) unsigned y; unsigned long x 485+#define PADDEDul(x, y) unsigned y; unsigned long x
488+#elif defined(__hppa__) /* big endian, 32 bits */ 486+#elif defined(__hppa__) /* big endian, 32 bits */
489+#define PADDED(x, y) unsigned y; x 487+#define PADDED(x, y) unsigned y; x
490+#define PADDEDptr(x, y) unsigned y; x 488+#define PADDEDptr(x, y) unsigned y; x
491+#define PADDEDul(x, y) unsigned y; unsigned long x 489+#define PADDEDul(x, y) unsigned y; unsigned long x
492+#elif defined(__mips__) 490+#elif defined(__mips__)
493+# if defined (__MIPSEB__) /* big endian, 32 bits */ 491+# if defined (__MIPSEB__) /* big endian, 32 bits */
494+#define PADDED(x, y) unsigned y; x 492+#define PADDED(x, y) unsigned y; x
495+#define PADDEDptr(x, y) unsigned y; x 493+#define PADDEDptr(x, y) unsigned y; x
496+#define PADDEDul(x, y) unsigned y; unsigned long x 494+#define PADDEDul(x, y) unsigned y; unsigned long x
497+# elif defined(__MIPSEL__) /* little endian, 32 bits */ 495+# elif defined(__MIPSEL__) /* little endian, 32 bits */
498+#define PADDED(x, y) x; unsigned y 496+#define PADDED(x, y) x; unsigned y
499+#define PADDEDptr(x, y) x; unsigned y 497+#define PADDEDptr(x, y) x; unsigned y
500+#define PADDEDul(x, y) unsigned long x; unsigned y 498+#define PADDEDul(x, y) unsigned long x; unsigned y
501+# else 499+# else
502+# error "neither mipseb nor mipsel?" 500+# error "neither mipseb nor mipsel?"
503+# endif 501+# endif
504 #else 502 #else
505 #error endian? 503 #error endian?
506 #endif 504 #endif
507--- libaio-0.3.106.orig/src/syscall-parisc.h 505Index: libaio-0.3.109/src/syscall-parisc.h
508+++ libaio-0.3.106/src/syscall-parisc.h 506===================================================================
507--- /dev/null
508+++ libaio-0.3.109/src/syscall-parisc.h
509@@ -0,0 +1,146 @@ 509@@ -0,0 +1,146 @@
510+/* 510+/*
511+ * Linux system call numbers. 511+ * Linux system call numbers.
@@ -653,9 +653,14 @@ from openembedded, added by Qing He <qing.he@intel.com>
653+ return K_INLINE_SYSCALL(sname, 5, arg1, arg2, arg3, arg4, arg5); \ 653+ return K_INLINE_SYSCALL(sname, 5, arg1, arg2, arg3, arg4, arg5); \
654+} 654+}
655+ 655+
656--- libaio-0.3.106.orig/src/syscall-arm.h 656Index: libaio-0.3.109/src/syscall-arm.h
657+++ libaio-0.3.106/src/syscall-arm.h 657===================================================================
658@@ -0,0 +1,116 @@ 658--- libaio-0.3.109.orig/src/syscall-arm.h
659+++ libaio-0.3.109/src/syscall-arm.h
660@@ -114,3 +114,119 @@ type fname(type1 arg1, type2 arg2, type3
661 return (type) __res_r0; \
662 }
663
659+/* 664+/*
660+ * linux/include/asm-arm/unistd.h 665+ * linux/include/asm-arm/unistd.h
661+ * 666+ *
diff --git a/meta/recipes-extended/libaio/libaio_0.3.107.bb b/meta/recipes-extended/libaio/libaio_0.3.109.bb
index 16c7b6b090..869b2da002 100644
--- a/meta/recipes-extended/libaio/libaio_0.3.107.bb
+++ b/meta/recipes-extended/libaio/libaio_0.3.109.bb
@@ -12,8 +12,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/liba/libaio/libaio_${PV}.orig.tar.gz \
12 file://toolchain.patch \ 12 file://toolchain.patch \
13 file://destdir.patch" 13 file://destdir.patch"
14 14
15SRC_URI[md5sum] = "db32c19c61ca937bcb1ba48da9180682" 15SRC_URI[md5sum] = "435a5b16ca6198eaf01155263d855756"
16SRC_URI[sha256sum] = "e6ad9246d7cd615d90fb3d231eec94111a36a85e9ffc759ac6bdab1a03995f27" 16SRC_URI[sha256sum] = "bf4a457253cbaab215aea75cb6e18dc8d95bbd507e9920661ff9bdd288c8778d"
17 17
18EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}" 18EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}"
19 19