From 16755da8ff4ab629653899cb2b17e4ab7d10e812 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Fri, 19 Jan 2007 13:26:22 +0000 Subject: packages/nbd/nbd: Update to nbd client 2.8.7 2.8.7 should only be a bugfix update and in contrast to 2.8.4 it compiles with the sanitized kernel headers --- packages/nbd/files/cross-compile.patch | 31 +++++++++++++++---------------- packages/nbd/nbd_2.8.4.bb | 19 ------------------- packages/nbd/nbd_2.8.7.bb | 21 +++++++++++++++++++++ 3 files changed, 36 insertions(+), 35 deletions(-) delete mode 100644 packages/nbd/nbd_2.8.4.bb create mode 100644 packages/nbd/nbd_2.8.7.bb (limited to 'packages/nbd') diff --git a/packages/nbd/files/cross-compile.patch b/packages/nbd/files/cross-compile.patch index 654a3d7a48..1d0a135bb9 100644 --- a/packages/nbd/files/cross-compile.patch +++ b/packages/nbd/files/cross-compile.patch @@ -3,11 +3,11 @@ Cross Compile fixes: let us define those. -Index: nbd-2.8.4/configure.ac +Index: nbd-2.8.7/configure.ac =================================================================== ---- nbd-2.8.4.orig/configure.ac 2006-02-26 15:52:03.000000000 +0100 -+++ nbd-2.8.4/configure.ac 2006-05-25 21:35:26.000000000 +0200 -@@ -68,7 +68,8 @@ +--- nbd-2.8.7.orig/configure.ac 2006-10-17 19:42:11.000000000 +0200 ++++ nbd-2.8.7/configure.ac 2007-01-19 14:19:09.000000000 +0100 +@@ -68,15 +68,16 @@ man8_MANS=nbd-client.8 AC_MSG_RESULT(yes) ;; @@ -17,21 +17,20 @@ Index: nbd-2.8.4/configure.ac esac AC_MSG_CHECKING(where to find a working nbd.h) dnl We need to check for NBD_CMD_DISC, but that's part of an enum, it is not -@@ -82,8 +83,8 @@ - [int foo=NBD_CMD_DISC], - [AC_DEFINE(NBD_H_LOCAL, 1, Set to 1 if a (kernel 2.6) nbd.h can be found in the current directory) - NBD_H='"nbd.h"'], -- AC_TRY_COMPILE([#define u32 int + dnl #define'd. Therefore, we check for something which is differently #define'd + dnl in the old or new versions, even if we don't really care about that. + dnl This might break at some time, but it should work for now, so... +-AC_TRY_COMPILE([#define u32 int -#define u64 int -+ AC_TRY_COMPILE([#define __u32 int ++AC_TRY_COMPILE([#define __u32 int +#define __u64 int - #include - ], - [int foo=NBD_CMD_DISC], -Index: nbd-2.8.4/cliserv.h + #define __be32 int + #define __be64 int + #include "nbd.h" +Index: nbd-2.8.7/cliserv.h =================================================================== ---- nbd-2.8.4.orig/cliserv.h 2006-01-06 18:02:03.000000000 +0100 -+++ nbd-2.8.4/cliserv.h 2006-05-25 21:41:25.000000000 +0200 +--- nbd-2.8.7.orig/cliserv.h 2006-10-17 19:29:12.000000000 +0200 ++++ nbd-2.8.7/cliserv.h 2007-01-19 14:17:15.000000000 +0100 @@ -17,20 +17,26 @@ #if SIZEOF_UNSIGNED_SHORT_INT==4 diff --git a/packages/nbd/nbd_2.8.4.bb b/packages/nbd/nbd_2.8.4.bb deleted file mode 100644 index 103c2053c7..0000000000 --- a/packages/nbd/nbd_2.8.4.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Network Block Device" -LICENSE = "GPLv2" -HOMEPAGE = "http://nbd.sourceforge.net" - -DEPENDS = "glib-2.0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2;md5sum=1b5a0866d025b98d1c24fe19a4f628c3 \ - file://cross-compile.patch;patch=1 " - -inherit autotools - - -PACKAGES = "nbd-client nbd-server" -PACKAGES += "nbd-client-doc nbd-server-doc" - -FILES_nbd-client = "/usr/sbin/nbd-client" -FILES_nbd-server = "/usr/bin/nbd-server" -FILES_nbd-client-doc = "/usr/share/man/man8/*" -FILES_nbd-server-doc = "/usr/share/man/man1/*" diff --git a/packages/nbd/nbd_2.8.7.bb b/packages/nbd/nbd_2.8.7.bb new file mode 100644 index 0000000000..2241fea71e --- /dev/null +++ b/packages/nbd/nbd_2.8.7.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Network Block Device" +LICENSE = "GPLv2" +HOMEPAGE = "http://nbd.sourceforge.net" + +DEPENDS = "glib-2.0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2;md5sum=bc7995b4961385269abc645575bcaf4d \ + file://cross-compile.patch;patch=1 " + +inherit autotools + + +PACKAGES = "nbd-client nbd-server nbd-client-dbg nbd-server-dbg" +PACKAGES += "nbd-client-doc nbd-server-doc" + +FILES_nbd-client = "/usr/sbin/nbd-client" +FILES_nbd-server = "/usr/bin/nbd-server" +FILES_nbd-client-dbg = "/usr/sbin/.debug/nbd-client" +FILES_nbd-server-dbg = "/usr/bin/.debug/nbd-server" +FILES_nbd-client-doc = "/usr/share/man/man8/*" +FILES_nbd-server-doc = "/usr/share/man/man1/*" -- cgit v1.2.3