summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/config/Makefile.kconfig2
-rw-r--r--package/nbd/nbd-fix-build-with-disable-lfs.patch30
-rw-r--r--package/nbd/nbd-server-fix-read-eagain.patch21
-rw-r--r--package/nbd/nbd.mk2
4 files changed, 2 insertions, 53 deletions
diff --git a/package/config/Makefile.kconfig b/package/config/Makefile.kconfig
index 835d0f190..f2693482e 100644
--- a/package/config/Makefile.kconfig
+++ b/package/config/Makefile.kconfig
@@ -179,7 +179,7 @@ HOSTCFLAGS_zconf.tab.o := -I$(src)
HOSTLOADLIBES_qconf = $(KC_QT_LIBS) -ldl
HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK
-HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
+HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl
HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
-D LKC_DIRECT_LINK
diff --git a/package/nbd/nbd-fix-build-with-disable-lfs.patch b/package/nbd/nbd-fix-build-with-disable-lfs.patch
deleted file mode 100644
index 5b270aa44..000000000
--- a/package/nbd/nbd-fix-build-with-disable-lfs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
-
diff --git a/package/nbd/nbd-server-fix-read-eagain.patch b/package/nbd/nbd-server-fix-read-eagain.patch
deleted file mode 100644
index b1f966c77..000000000
--- a/package/nbd/nbd-server-fix-read-eagain.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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;
-+ }
- }
- }
-
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index 8bffaf8cb..fa8dd4f30 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -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)