mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 16:27:27 +00:00
nbd: upgrade 3.26.1 -> 3.27.0
Drop the patches now present in 3.27.0. Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
@@ -1,43 +0,0 @@
|
|||||||
From 909d20a2ee4afecd5ae4cc5950c8ee599f72972d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Mon, 20 May 2024 17:48:13 -0700
|
|
||||||
Subject: [PATCH] nbd-client: Fix build on musl + gcc14
|
|
||||||
|
|
||||||
GCC-14 has promoted incompatible-pointer-types warning into error which is
|
|
||||||
now flagged especially with when building on musl
|
|
||||||
|
|
||||||
Fixes following error
|
|
||||||
|
|
||||||
| ../nbd-3.26.1/nbd-client.c: In function 'openunix':
|
|
||||||
| ../nbd-3.26.1/nbd-client.c:345:27: error: passing argument 2 of 'connect' from incompatible pointer type [-Wincompatible-pointer-types]
|
|
||||||
| 345 | if (connect(sock, &un_addr, sizeof(un_addr)) == -1) {
|
|
||||||
| | ^~~~~~~~
|
|
||||||
| | |
|
|
||||||
| | struct sockaddr_un *
|
|
||||||
| In file included from ../nbd-3.26.1/nbd-client.c:25:
|
|
||||||
| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/nbd/3.26.1/recipe-sysroot/usr/include/sys/socket.h:386:19: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *'
|
|
||||||
| 386 | int connect (int, const struct sockaddr *, socklen_t);
|
|
||||||
| | ^~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://lists.debian.org/nbd/2024/05/msg00012.html]
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
nbd-client.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/nbd-client.c b/nbd-client.c
|
|
||||||
index 8d1101b..7b25c67 100644
|
|
||||||
--- a/nbd-client.c
|
|
||||||
+++ b/nbd-client.c
|
|
||||||
@@ -342,7 +342,7 @@ int openunix(const char *path) {
|
|
||||||
return -1;
|
|
||||||
};
|
|
||||||
|
|
||||||
- if (connect(sock, &un_addr, sizeof(un_addr)) == -1) {
|
|
||||||
+ if (connect(sock, (struct sockaddr*)&un_addr, sizeof(un_addr)) == -1) {
|
|
||||||
err_nonfatal("CONNECT failed");
|
|
||||||
close(sock);
|
|
||||||
return -1;
|
|
||||||
--
|
|
||||||
2.45.1
|
|
||||||
|
|
||||||
-50
@@ -1,50 +0,0 @@
|
|||||||
From f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dave Jones <dave.jones@canonical.com>
|
|
||||||
Date: Thu, 14 Mar 2024 11:13:05 +0000
|
|
||||||
Subject: [PATCH] Fix the check & no cases of enable_manpages
|
|
||||||
|
|
||||||
Currently, running "configure --disable-manpages" while docbook2man *is*
|
|
||||||
installed results in the error "don't know what to do here" when it
|
|
||||||
should disable manpages.
|
|
||||||
|
|
||||||
There also appears to be a missing conditional at the start of the line;
|
|
||||||
there's closing un-matched ]) at the end of the line. Still, at this
|
|
||||||
point the check can be done in pure shell; no need for AC macros. I've
|
|
||||||
also removed the confusing m4_divert_text call on the check case. Not
|
|
||||||
sure why that was there, but it appears unnecessary.
|
|
||||||
|
|
||||||
Upstream-Status: Backport [https://github.com/NetworkBlockDevice/nbd/commit/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c]
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
configure.ac | 13 +++++++++----
|
|
||||||
1 file changed, 9 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -328,7 +328,7 @@ AC_MSG_CHECKING([whether man pages are r
|
|
||||||
AC_ARG_ENABLE([manpages],
|
|
||||||
AS_HELP_STRING([--disable-manpages], [Do not install man pages]),
|
|
||||||
[],
|
|
||||||
- [: m4_divert_text([DEFAULTS], [enable_manpages=check])]
|
|
||||||
+ [enable_manpages=check]
|
|
||||||
)
|
|
||||||
AC_MSG_RESULT([$enable_manpages])
|
|
||||||
|
|
||||||
@@ -337,9 +337,14 @@ AS_IF([test "x$enable_manpages" != "xno"
|
|
||||||
])
|
|
||||||
AS_IF([test "x$enable_manpages" = "xyes" -a "x$DB2M" = "x"], [
|
|
||||||
AC_MSG_ERROR([docbook2man not found, but is required to build manpages])
|
|
||||||
- ],
|
|
||||||
- [test "x$DB2M" != "x"], [enable_manpages=yes],
|
|
||||||
- [AC_MSG_ERROR([don't know what to do here])])
|
|
||||||
+ ])
|
|
||||||
+if test "x$enable_manpages" = "xcheck"; then
|
|
||||||
+ if test "x$DB2M" = "x"; then
|
|
||||||
+ enable_manpages=no
|
|
||||||
+ else
|
|
||||||
+ enable_manpages=yes
|
|
||||||
+ fi
|
|
||||||
+fi
|
|
||||||
AC_MSG_CHECKING([whether to build manpages])
|
|
||||||
AC_MSG_RESULT([$enable_manpages])
|
|
||||||
|
|
||||||
+1
-3
@@ -7,10 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
|||||||
DEPENDS = "autoconf-archive bison-native glib-2.0 libnl zlib bison-native"
|
DEPENDS = "autoconf-archive bison-native glib-2.0 libnl zlib bison-native"
|
||||||
|
|
||||||
SRC_URI = "https://github.com/NetworkBlockDevice/${BPN}/releases/download/${BP}/${BP}.tar.xz \
|
SRC_URI = "https://github.com/NetworkBlockDevice/${BPN}/releases/download/${BP}/${BP}.tar.xz \
|
||||||
file://f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch \
|
|
||||||
file://0001-nbd-client-Fix-build-on-musl-gcc14.patch \
|
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "f0cf509fa5b20b1a07f7904eb637e9b47d3e30b6ed6f00075af5d8b701c78fef"
|
SRC_URI[sha256sum] = "422a02adcdbab01c622307c6babeda5c84ca6c6f2d4e0b29936e6ae9b6a7662f"
|
||||||
|
|
||||||
inherit autotools pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
Reference in New Issue
Block a user