Commit bc81fbb0 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

nbd: bump to version 3.0 



[Peter: only disable fallocate for uClibc toolchains]
Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent ce41184f

package/nbd/nbd-fix-non-lfs.patch

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
From 8dd182693e9995bc1aeb907f9fd4ec06c18fc56f Mon Sep 17 00:00:00 2001

From: Peter Korsgaard <jacmet@sunsite.dk>

Date: Mon, 5 Dec 2011 23:27:30 +0100

Subject: [PATCH] lfs.h: fix !LFS builds



Commit 448637fba4 (Fix 32/64 bit confusion) broke !LFS builds as it

added the PARAM_OFFT defines inside the wrong conditional.



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

---

 lfs.h |    4 ++--

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



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

index 64a03de..68d3b81 100644

--- a/lfs.h

+++ b/lfs.h

@@ -6,14 +6,14 @@

 #define _FILE_OFFSET_BITS 64

 #ifndef _LARGEFILE_SOURCE

 #define _LARGEFILE_SOURCE

+#endif

 #define PARAM_OFFT PARAM_INT64

 #else

 #define PARAM_OFFT PARAM_INT

-#endif

+#endif /* NBD_LFS */

 #ifdef HAVE_SYNC_FILE_RANGE

 #define USE_SYNC_FILE_RANGE

 #define _GNU_SOURCE

 #endif /* HAVE_SYNC_FILE_RANGE */

-#endif /* NBD_LFS */

 

 #endif /* LFS_H */

-- 

1.7.7.1

package/nbd/nbd-server-susv3-legacy.patch

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
--- nbd-2.9.11/nbd-server.c	2009-10-01 16:10:15.000000000 +0200

+++ nbd-2.9.11/nbd-server.c	2009-10-01 16:10:32.000000000 +0200

@@ -264,7 +264,7 @@

   

   	inet_aton(opts->clientname, &client);

 	while (fgets(line,LINELEN,f)!=NULL) {

-		if((tmp=index(line, '/'))) {

+		if((tmp=strchr(line, '/'))) {

 			if(strlen(line)<=tmp-line) {

 				msg4(LOG_CRIT, ERRMSG, line, opts->server->authname);

 				return 0;

package/nbd/nbd.mk

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

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



NBD_VERSION = 2.9.24

NBD_VERSION = 3.0

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)

NBD_DEPENDENCIES = libglib2



ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)

# We have linux/falloc.h

# but uClibc lacks fallocate(2) which is a glibc-ism

NBD_CONF_ENV = ac_cv_header_linux_falloc_h=no

endif



ifneq ($(BR2_NBD_CLIENT),y)

	NBD_TOREMOVE += nbd-client

endif