mirror of
https://github.com/thead-yocto-mirror/meta-openembedded
synced 2026-09-09 07:34:53 +02:00
f158ce33b5
Nbdkit uses plugins to add more sources of data for nbd client. Nbdkit can also spawn nbd-client, uses unix or network socket to communicate with client, uses different plugins to serve data for nbd device eg. curl, file, custom plugins in many languages (perl, python) and some others. Fix build when printf is a macro instead of function Use BSD-3-Clause for license inherit bash-completion so these are packaged correctly Signed-off-by: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
40 lines
1.0 KiB
Diff
40 lines
1.0 KiB
Diff
From 28f07715ab4d670ce81e12776bbece043305bd83 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Sat, 11 Apr 2020 15:08:39 -0700
|
|
Subject: [PATCH] server: Fix build when printf is a macro
|
|
|
|
clang complains on x86 when building
|
|
|
|
main.c:116:2: error: embedding a #include directive within macro arguments is not supported
|
|
^
|
|
|
|
convert nesting include into a string assignment, to same effect but
|
|
making it compatible with clang as well
|
|
|
|
Upstream-Status: Submitted [https://github.com/libguestfs/nbdkit/pull/3]
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
server/main.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/server/main.c b/server/main.c
|
|
index 748122f..c0ac874 100644
|
|
--- a/server/main.c
|
|
+++ b/server/main.c
|
|
@@ -112,9 +112,10 @@ static void
|
|
usage (void)
|
|
{
|
|
/* --{short,long}-options remain undocumented */
|
|
- printf (
|
|
+ char const *opt_list =
|
|
#include "synopsis.c"
|
|
- );
|
|
+ ;
|
|
+ printf ("%s\n", opt_list);
|
|
printf ("\n"
|
|
"Please read the nbdkit(1) manual page for full usage.\n");
|
|
}
|
|
--
|
|
2.26.0
|
|
|