From 526aa44cf851215b4d0eeb26ff73e5d24b98ab73 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 11 Nov 2026 22:39:03 -0800 Subject: [PATCH] nbdkit: Remove stale 1.33.11 recipe nbdkit_1.33.11.bb and its patch were left behind next to the current recipe and are never selected since the newer version is preferred. AI-Generated: Uses Claude Code Signed-off-by: Khem Raj --- ...void-absolute-buildpaths-in-binaries.patch | 38 ------------------- .../recipes-support/nbdkit/nbdkit_1.33.11.bb | 32 ---------------- 2 files changed, 70 deletions(-) delete mode 100644 meta-networking/recipes-support/nbdkit/nbdkit/0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch delete mode 100644 meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb diff --git a/meta-networking/recipes-support/nbdkit/nbdkit/0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch b/meta-networking/recipes-support/nbdkit/nbdkit/0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch deleted file mode 100644 index 75377dfb80..0000000000 --- a/meta-networking/recipes-support/nbdkit/nbdkit/0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1ccbd8fdbd2e367a702e48c8703b2f010d067b23 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 22 May 2023 18:16:24 -0700 -Subject: [PATCH] plugins: Avoid absolute buildpaths in binaries - -plugins seems to add CC to the plugins shared objects via compiler -cmdline which ends up in real code. Therefore scrub buildpaths from CC -and CFLAGS before passing them to plugin's build. - -Upstream-Status: Submitted [https://gitlab.com/nbdkit/nbdkit/-/merge_requests/30] - -Signed-off-by: Khem Raj ---- - plugins/cc/Makefile.am | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/plugins/cc/Makefile.am b/plugins/cc/Makefile.am -index df8b5d15..80586a17 100644 ---- a/plugins/cc/Makefile.am -+++ b/plugins/cc/Makefile.am -@@ -44,9 +44,12 @@ nbdkit_cc_plugin_la_SOURCES = \ - $(top_srcdir)/include/nbdkit-plugin.h \ - $(NULL) - -+workdir := $(shell dirname $(abs_top_builddir)) -+cc_no_sysroot := $(shell echo \"$(CC)\"|sed -e 's#$(workdir)##g') -+cflags_no_sysroot := $(shell echo \"$(CFLAGS)\"|sed -e 's#$(workdir)##g') - nbdkit_cc_plugin_la_CPPFLAGS = \ -- -DCC="\"$(CC)\"" \ -- -DCFLAGS="\"$(CFLAGS)\"" \ -+ -DCC=\"$(cc_no_sysroot)\" \ -+ -DCFLAGS=\"$(cflags_no_sysroot)\" \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/common/include \ --- -2.40.1 - diff --git a/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb b/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb deleted file mode 100644 index 1c9db1e956..0000000000 --- a/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "nbdkit is a toolkit for creating NBD servers." -DESCRIPTION = "NBD — Network Block Device — is a protocol \ -for accessing Block Devices (hard disks and disk-like things) \ -over a Network. \ -\ -nbdkit is a toolkit for creating NBD servers." - -HOMEPAGE = "https://github.com/libguestfs/nbdkit" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=26250adec854bc317493f6fb98efe049" - -SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https;branch=master \ - file://0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch" -SRCREV = "6c02c6a469d62a047f230b0ccf03f72328312d2b" - - -DEPENDS = "curl xz e2fsprogs zlib" - -# autotools-brokensep is needed as nbdkit does not support build in external directory -inherit pkgconfig python3native perlnative bash-completion autotools-brokensep - -# Those are required to build standalone -EXTRA_OECONF = " --without-libvirt --without-libguestfs --disable-perl" - -# Disable some extended support (not desired for small embedded systems) -#EXTRA_OECONF += " --disable-python" -#EXTRA_OECONF += " --disable-ocaml" -#EXTRA_OECONF += " --disable-rust" -#EXTRA_OECONF += " --disable-ruby" -#EXTRA_OECONF += " --disable-tcl" -#EXTRA_OECONF += " --disable-lua" -#EXTRA_OECONF += " --disable-vddk"