From 3804ea3b6993184060236cfbb0d05c43b7cff017 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 11 Oct 2011 11:35:02 -0700 Subject: libaio: Update to 0.3.109 Signed-off-by: Saul Wold --- .../recipes-extended/libaio/libaio/00_arches.patch | 103 +++++++++++---------- meta/recipes-extended/libaio/libaio_0.3.107.bb | 22 ----- meta/recipes-extended/libaio/libaio_0.3.109.bb | 22 +++++ 3 files changed, 76 insertions(+), 71 deletions(-) delete mode 100644 meta/recipes-extended/libaio/libaio_0.3.107.bb create mode 100644 meta/recipes-extended/libaio/libaio_0.3.109.bb (limited to 'meta/recipes-extended') 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] from openembedded, added by Qing He ---- libaio-0.3.106.orig/src/syscall-m68k.h -+++ libaio-0.3.106/src/syscall-m68k.h +Index: libaio-0.3.109/src/syscall-m68k.h +=================================================================== +--- /dev/null ++++ libaio-0.3.109/src/syscall-m68k.h @@ -0,0 +1,78 @@ +#define __NR_io_setup 241 +#define __NR_io_destroy 242 @@ -83,8 +85,10 @@ from openembedded, added by Qing He +return (type) __res; \ +} + ---- libaio-0.3.106.orig/src/syscall-sparc.h -+++ libaio-0.3.106/src/syscall-sparc.h +Index: libaio-0.3.109/src/syscall-sparc.h +=================================================================== +--- /dev/null ++++ libaio-0.3.109/src/syscall-sparc.h @@ -0,0 +1,130 @@ +/* $Id: unistd.h,v 1.74 2002/02/08 03:57:18 davem Exp $ */ + @@ -216,14 +220,14 @@ from openembedded, added by Qing He +return -1; \ +} + ---- libaio-0.3.106.orig/src/syscall.h -+++ libaio-0.3.106/src/syscall.h -@@ -22,6 +22,16 @@ - #include "syscall-s390.h" - #elif defined(__alpha__) +Index: libaio-0.3.109/src/syscall.h +=================================================================== +--- libaio-0.3.109.orig/src/syscall.h ++++ libaio-0.3.109/src/syscall.h +@@ -24,6 +24,14 @@ #include "syscall-alpha.h" -+#elif defined(__arm__) -+#include "syscall-arm.h" + #elif defined(__arm__) + #include "syscall-arm.h" +#elif defined(__m68k__) +#include "syscall-m68k.h" +#elif defined(__sparc__) @@ -235,8 +239,10 @@ from openembedded, added by Qing He #else #error "add syscall-arch.h" #endif ---- libaio-0.3.106.orig/src/syscall-mips.h -+++ libaio-0.3.106/src/syscall-mips.h +Index: libaio-0.3.109/src/syscall-mips.h +=================================================================== +--- /dev/null ++++ libaio-0.3.109/src/syscall-mips.h @@ -0,0 +1,223 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -461,51 +467,45 @@ from openembedded, added by Qing He + +#endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */ + ---- libaio-0.3.106.orig/src/libaio.h -+++ libaio-0.3.106/src/libaio.h -@@ -72,6 +72,40 @@ - #define PADDED(x, y) unsigned y; x - #define PADDEDptr(x, y) unsigned y; x - #define PADDEDul(x, y) unsigned y; unsigned long x -+#elif defined(__arm__) -+# if defined (__ARMEB__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+# else /* little endian, 32 bits */ -+#define PADDED(x, y) x; unsigned y -+#define PADDEDptr(x, y) x; unsigned y -+#define PADDEDul(x, y) unsigned long x; unsigned y -+# endif +Index: libaio-0.3.109/src/libaio.h +=================================================================== +--- libaio-0.3.109.orig/src/libaio.h ++++ libaio-0.3.109/src/libaio.h +@@ -83,6 +83,30 @@ typedef enum io_iocb_cmd { + #define PADDEDptr(x, y) x; unsigned y + #define PADDEDul(x, y) unsigned long x; unsigned y + # endif +#elif defined(__m68k__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x ++#define PADDED(x, y) unsigned y; x ++#define PADDEDptr(x, y) unsigned y; x ++#define PADDEDul(x, y) unsigned y; unsigned long x +#elif defined(__sparc__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x ++#define PADDED(x, y) unsigned y; x ++#define PADDEDptr(x, y) unsigned y; x ++#define PADDEDul(x, y) unsigned y; unsigned long x +#elif defined(__hppa__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x ++#define PADDED(x, y) unsigned y; x ++#define PADDEDptr(x, y) unsigned y; x ++#define PADDEDul(x, y) unsigned y; unsigned long x +#elif defined(__mips__) +# if defined (__MIPSEB__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x ++#define PADDED(x, y) unsigned y; x ++#define PADDEDptr(x, y) unsigned y; x ++#define PADDEDul(x, y) unsigned y; unsigned long x +# elif defined(__MIPSEL__) /* little endian, 32 bits */ -+#define PADDED(x, y) x; unsigned y -+#define PADDEDptr(x, y) x; unsigned y -+#define PADDEDul(x, y) unsigned long x; unsigned y ++#define PADDED(x, y) x; unsigned y ++#define PADDEDptr(x, y) x; unsigned y ++#define PADDEDul(x, y) unsigned long x; unsigned y +# else +# error "neither mipseb nor mipsel?" +# endif #else #error endian? #endif ---- libaio-0.3.106.orig/src/syscall-parisc.h -+++ libaio-0.3.106/src/syscall-parisc.h +Index: libaio-0.3.109/src/syscall-parisc.h +=================================================================== +--- /dev/null ++++ libaio-0.3.109/src/syscall-parisc.h @@ -0,0 +1,146 @@ +/* + * Linux system call numbers. @@ -653,9 +653,14 @@ from openembedded, added by Qing He + return K_INLINE_SYSCALL(sname, 5, arg1, arg2, arg3, arg4, arg5); \ +} + ---- libaio-0.3.106.orig/src/syscall-arm.h -+++ libaio-0.3.106/src/syscall-arm.h -@@ -0,0 +1,116 @@ +Index: libaio-0.3.109/src/syscall-arm.h +=================================================================== +--- libaio-0.3.109.orig/src/syscall-arm.h ++++ libaio-0.3.109/src/syscall-arm.h +@@ -114,3 +114,119 @@ type fname(type1 arg1, type2 arg2, type3 + return (type) __res_r0; \ + } + +/* + * linux/include/asm-arm/unistd.h + * diff --git a/meta/recipes-extended/libaio/libaio_0.3.107.bb b/meta/recipes-extended/libaio/libaio_0.3.107.bb deleted file mode 100644 index 16c7b6b090..0000000000 --- a/meta/recipes-extended/libaio/libaio_0.3.107.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Asynchronous I/O library" -DESCRIPTION = "Asynchronous input/output library that uses the kernels native interface" -HOMEPAGE = "http://lse.sourceforge.net/io/aio.html" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" - -PR = "r0" - -SRC_URI = "${DEBIAN_MIRROR}/main/liba/libaio/libaio_${PV}.orig.tar.gz \ - file://00_arches.patch \ - file://toolchain.patch \ - file://destdir.patch" - -SRC_URI[md5sum] = "db32c19c61ca937bcb1ba48da9180682" -SRC_URI[sha256sum] = "e6ad9246d7cd615d90fb3d231eec94111a36a85e9ffc759ac6bdab1a03995f27" - -EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}" - -do_install () { - oe_runmake install DESTDIR=${D} -} diff --git a/meta/recipes-extended/libaio/libaio_0.3.109.bb b/meta/recipes-extended/libaio/libaio_0.3.109.bb new file mode 100644 index 0000000000..869b2da002 --- /dev/null +++ b/meta/recipes-extended/libaio/libaio_0.3.109.bb @@ -0,0 +1,22 @@ +SUMMARY = "Asynchronous I/O library" +DESCRIPTION = "Asynchronous input/output library that uses the kernels native interface" +HOMEPAGE = "http://lse.sourceforge.net/io/aio.html" + +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" + +PR = "r0" + +SRC_URI = "${DEBIAN_MIRROR}/main/liba/libaio/libaio_${PV}.orig.tar.gz \ + file://00_arches.patch \ + file://toolchain.patch \ + file://destdir.patch" + +SRC_URI[md5sum] = "435a5b16ca6198eaf01155263d855756" +SRC_URI[sha256sum] = "bf4a457253cbaab215aea75cb6e18dc8d95bbd507e9920661ff9bdd288c8778d" + +EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}" + +do_install () { + oe_runmake install DESTDIR=${D} +} -- cgit v1.2.3