Commit 6074f08b authored by Peter Huewe's avatar Peter Huewe Committed by Peter Korsgaard
Browse files

nbd: Bump nbd to version 2.9.15 and remove klcc issue. 



This patch bumps the version of nbd to 2.9.15.
The new version avoids problems with klcc installed on the host system
and also includes two former buildroot patches:
- nbd-fix-build-with-disable-lfs.patch
- nbd-server-fix-read-eagain.patch

Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 1b10ce71

CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


	Updated/fixed packages: busybox, cdrkit, file, gawk,

	gstreamer, intltool, ipsec-tools, iptables, libart, libidn,

	lmbench, lrzsz, ncurses, module-init-tools, netperf,

	lmbench, lrzsz, ncurses, module-init-tools, nbd, netperf,

	ntfsprogs, openssl, php, qt, sqlite, squashfs, tn5250,

	usbutils, xkeyboard-config

package/nbd/nbd-fix-build-with-disable-lfs.patch

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
From 6d452ab0247770a446cfa6dd9b8b4ddea6c8fa4b Mon Sep 17 00:00:00 2001

From: Peter Korsgaard <jacmet@sunsite.dk>

Date: Sun, 22 Nov 2009 23:01:52 +0100

Subject: [PATCH] lfs.h: fix build with --disable-lfs



Running ./configure with --disable-lfs #define's NBD_LFS to 0 and

doesn't #undef it, so the LFS check should use #if rather than #ifdef

similar to how it is done in cliserv.h



Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

---

 lfs.h |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)



diff --git a/lfs.h b/lfs.h

index 8f90f81..929ce08 100644

--- a/lfs.h

+++ b/lfs.h

@@ -2,7 +2,7 @@

 #define LFS_H

 

 #include "config.h"

-#ifdef NBD_LFS

+#if NBD_LFS

 #define _FILE_OFFSET_BITS 64

 #define _LARGEFILE_SOURCE

 #endif /* NBD_LFS */

-- 

1.6.3.3

package/nbd/nbd-server-fix-read-eagain.patch

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
--- nbd-2.9.11.orig/nbd-server.c

+++ nbd-2.9.11/nbd-server.c

@@ -304,10 +304,14 @@

 	ssize_t res;

 	while (len > 0) {

 		DEBUG("*");

-		if ((res = read(f, buf, len)) <= 0)

-			err("Read failed: %m");

-		len -= res;

-		buf += res;

+		if ((res = read(f, buf, len)) <= 0) {

+			if(errno != EAGAIN) {

+				err("Read failed: %m");

+			}

+		} else {

+			len -= res;

+			buf += res;

+		}

 	}

 }

package/nbd/nbd.mk

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

#############################################################



NBD_VERSION = 2.9.11

NBD_VERSION = 2.9.15

NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2

NBD_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nbd/

NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs)