From: "Alexis Lothoré via buildroot" <buildroot@buildroot.org>
To: buildroot@buildroot.org
Cc: "Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
"Alexis Lothoré" <alexis.lothore@bootlin.com>
Subject: [Buildroot] [PATCH] package/openscap: drop duplicate patch
Date: Wed, 02 Sep 2026 10:11:49 +0200 [thread overview]
Message-ID: <20260902-revert-openscap-patch-v1-1-f56161b6c7bd@bootlin.com> (raw)
Commit bd5b267b1de0 ("package/openscap: fix build failure with dbus and
musl") brought an upstream patch to fix a build failure on the openscap
package, detected by the autobuilder on buildroot 2026.02.x, which had
openscap 1.3.12 at that time. bd5b267b1de0 has recently been merged on
master; openscap has already been bumped to 1.4.4 on this branch, and so
it already brings the needed fix for musl+dbus build configurations,
hence making the patch step fail. This upstream patch is then not needed
anymore on any maintained branch.
Fixes: https://autobuild.buildroot.org/results/d11d0b82dcdb4bf10f6c37db8bdbc42a78bdf28b/
Fixes: https://autobuild.buildroot.org/results/4397a4ef94ccf482f1ab9d24b6334adb0222a580/
Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
---
Up to my knowledge the faulty patch has been merged only on master, so
the revert is only needed on master.
---
| 48 ----------------------
1 file changed, 48 deletions(-)
diff --git a/package/openscap/0002-OVAL-probes-add-missing-header-include.patch b/package/openscap/0002-OVAL-probes-add-missing-header-include.patch
deleted file mode 100644
index 0c7598b2b5e1..000000000000
--- a/package/openscap/0002-OVAL-probes-add-missing-header-include.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ab69b76cb40d6f35d252246e965245804b17591f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= <alexis.lothore@bootlin.com>
-Date: Thu, 13 Aug 2026 15:18:15 +0200
-Subject: [PATCH] OVAL/probes: add missing header include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Openscap build can fail with the following log when
--Wimplicit-function-declaration is turned into an error:
-
-In file included from [...]/src/OVAL/probes/unix/linux/systemdunitproperty_probe.c:38:
-[...]/src/OVAL/probes/unix/linux/systemdshared.h: In function ‘get_all_systemd_units’:
-[...]/src/OVAL/probes/unix/linux/systemdshared.h:188:50: error: implicit declaration of function ‘basename’; did you mean ‘rename’? [-Wimplicit-function-declaration]
- 188 | char *unit_name_s = oscap_strdup(basename(value.str));
- | ^~~~~~~~
- | rename
-In file included from [...]/src/OVAL/probes/unix/linux/systemdunitdependency_probe.c:37:
-[...]/src/OVAL/probes/unix/linux/systemdshared.h: In function ‘get_all_systemd_units’:
-[...]/src/OVAL/probes/unix/linux/systemdshared.h:188:50: error: implicit declaration of function ‘basename’; did you mean ‘rename’? [-Wimplicit-function-declaration]
- 188 | char *unit_name_s = oscap_strdup(basename(value.str));
- | ^~~~~~~~
- | rename
-
-Add the missing header include pointed by `man 3 basename` to fix the
-error.
-
-Upstream: https://github.com/OpenSCAP/openscap/commit/ab69b76cb40d6f35d252246e965245804b17591f
-Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
----
- src/OVAL/probes/unix/linux/systemdshared.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/OVAL/probes/unix/linux/systemdshared.h b/src/OVAL/probes/unix/linux/systemdshared.h
-index 879ae5be9d6c..57e94ca6f49e 100644
---- a/src/OVAL/probes/unix/linux/systemdshared.h
-+++ b/src/OVAL/probes/unix/linux/systemdshared.h
-@@ -35,6 +35,7 @@
- #include <config.h>
- #endif
-
-+#include <libgen.h>
- #include <limits.h>
- #include <stdio.h>
- #include "common/debug_priv.h"
---
-2.55.0
-
---
base-commit: 79fd6241e4347f67d659cc02669448397b458d52
change-id: 20260902-revert-openscap-patch-672e3864658f
Best regards,
--
Alexis Lothoré <alexis.lothore@bootlin.com>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next reply other threads:[~2026-09-02 8:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-02 8:11 Alexis Lothoré via buildroot [this message]
2026-09-02 19:26 ` [Buildroot] [PATCH] package/openscap: drop duplicate patch Julien Olivain via buildroot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260902-revert-openscap-patch-v1-1-f56161b6c7bd@bootlin.com \
--to=buildroot@buildroot.org \
--cc=alexis.lothore@bootlin.com \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.