mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-26 12:00:48 -09:00
44b7435c7a
Remove some patches that have been applied upstream, or adapt them for upstream files that have been moved around. Patch 0001 is no longer needed: a similar upstream patch is fixing this issue. See [1]. The .checkpackageignore entry is also removed. The COPYING license file was updated in [2]. This commit updates this license file hash. Since the GPL-2.0 license text was moved to the package file LICENSES/GPL-2.0, this commit also adds this new file in XEN_LICENSE_FILES and its hash. This commit also adds --disable-werror in XEN_CONF_OPTS. The code is generating warnings with newer gcc version. This makes the compilation works in all configurations. This commit adds a comment in hash file about pgp signature check. This fixes many vulnerabilities: - CVE-2021-28687 - CVE-2021-28690 - CVE-2021-28693 - CVE-2021-28697 - CVE-2021-28702 - CVE-2021-28704 - CVE-2021-28707 - CVE-2021-28708 - CVE-2022-26357 - CVE-2022-33746 - CVE-2022-42331 - CVE-2022-42333 - CVE-2022-42334 - CVE-2023-34321 - CVE-2023-34322 - CVE-2023-34323 - CVE-2023-46837 - CVE-2024-31142 - CVE-2025-27466 - CVE-2025-58142 - CVE-2025-58143 - CVE-2025-58144 - CVE-2025-58145 Note: xen version 4.19.5 is not the latest at the time of this commit. It is an intermediate bump because: 1. the xen build has significantly changed after this 4.19.5 version, so this intermediate step will help future updates; 2. this intermediate version includes many CVE security fixes; and 3. it also reduces the number of package patches. [1] https://xenbits.xen.org/gitweb/?p=qemu-xen.git;a=commitdiff;h=03556ea920b23c466ce7c1283199033de33ee671 [2] https://xenbits.xen.org/gitweb/?p=xen.git;a=commitdiff;h=7b068ac89024308862c4f448dd248645d2b8e882 Co-authored-by: Vincent Stehlé <vincent.stehle@arm.com> Signed-off-by: Titouan Christophe <titouan.christophe@mind.be> Tested-by: Julien Olivain <ju.o@free.fr> Reviewed-by: Julien Olivain <ju.o@free.fr> [Julien: - reorder XEN_DEPENDENCIES alphabetically - fix COPYING license hash - add LICENSES/GPL-2.0 in XEN_LICENSE_FILES - add commit log comment about --disable-werror - add commit log note about the intermediate version - drop patch 0001 - renumber patches - remove all .checkpackageignore entries - add "Upstream:" tag in all remaining patches - add pgp signature check comment in hash file ] Signed-off-by: Julien Olivain <ju.o@free.fr>
82 lines
2.9 KiB
Diff
82 lines
2.9 KiB
Diff
From 2ba2eef5b11d81b801265ae92df91571c19cc8a3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle@arm.com>
|
|
Date: Tue, 30 Sep 2025 11:39:54 +0200
|
|
Subject: [PATCH] Update linker flags
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Upstream: Buildroot specific. This is a temporary patch for an intermediate bump.
|
|
Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
|
|
---
|
|
tools/Makefile | 29 +++++++++++++++++++++-
|
|
tools/qemu-xen/include/hw/xen/xen_native.h | 2 +-
|
|
2 files changed, 29 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tools/Makefile b/tools/Makefile
|
|
index a9a3196e..5d289651 100644
|
|
--- a/tools/Makefile
|
|
+++ b/tools/Makefile
|
|
@@ -37,8 +37,12 @@ SUBDIRS-$(CONFIG_X86) += xenpaging
|
|
SUBDIRS-$(CONFIG_X86) += debugger
|
|
SUBDIRS-$(CONFIG_TESTS) += tests
|
|
|
|
+# These don't cross-compile
|
|
+ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
|
|
SUBDIRS-y += python
|
|
SUBDIRS-$(CONFIG_PYGRUB) += pygrub
|
|
+endif
|
|
+
|
|
SUBDIRS-$(OCAML_TOOLS) += ocaml
|
|
|
|
ifeq ($(CONFIG_RUMP),y)
|
|
@@ -236,8 +240,31 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
|
|
-DXC_WANT_COMPAT_GNTTAB_API=1 \
|
|
-DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \
|
|
-DXC_WANT_COMPAT_DEVICEMODEL_API=1 \
|
|
+ -I$(XEN_ROOT)/tools/include \
|
|
$(EXTRA_CFLAGS_QEMU_XEN)" \
|
|
- --extra-ldflags="$(QEMU_UPSTREAM_RPATH)" \
|
|
+ --extra-ldflags=" \
|
|
+ -L$(XEN_ROOT)/tools/libs/call \
|
|
+ -L$(XEN_ROOT)/tools/libs/ctrl \
|
|
+ -L$(XEN_ROOT)/tools/libs/devicemodel \
|
|
+ -L$(XEN_ROOT)/tools/libs/evtchn \
|
|
+ -L$(XEN_ROOT)/tools/libs/foreignmemory \
|
|
+ -L$(XEN_ROOT)/tools/libs/gnttab \
|
|
+ -L$(XEN_ROOT)/tools/libs/guest \
|
|
+ -L$(XEN_ROOT)/tools/libs/store \
|
|
+ -L$(XEN_ROOT)/tools/libs/toolcore \
|
|
+ -L$(XEN_ROOT)/tools/libs/toollog \
|
|
+ -L$(XEN_ROOT)/tools/xenstore \
|
|
+ -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/call \
|
|
+ -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/ctrl \
|
|
+ -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/devicemodel \
|
|
+ -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/evtchn \
|
|
+ -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/foreignmemory \
|
|
+ -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/gnttab \
|
|
+ -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/guest \
|
|
+ -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/store \
|
|
+ -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toolcore \
|
|
+ -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toollog \
|
|
+ $(QEMU_UPSTREAM_RPATH)" \
|
|
--bindir=$(LIBEXEC_BIN) \
|
|
--datadir=$(SHAREDIR)/qemu-xen \
|
|
--localstatedir=$(localstatedir) \
|
|
diff --git a/tools/qemu-xen/include/hw/xen/xen_native.h b/tools/qemu-xen/include/hw/xen/xen_native.h
|
|
index 6bcc83ba..2590904e 100644
|
|
--- a/tools/qemu-xen/include/hw/xen/xen_native.h
|
|
+++ b/tools/qemu-xen/include/hw/xen/xen_native.h
|
|
@@ -2,7 +2,7 @@
|
|
#define QEMU_HW_XEN_NATIVE_H
|
|
|
|
#ifdef __XEN_INTERFACE_VERSION__
|
|
-#error In Xen native files, include xen_native.h before other Xen headers
|
|
+#warning In Xen native files, include xen_native.h before other Xen headers
|
|
#endif
|
|
|
|
/*
|
|
--
|
|
2.51.0
|
|
|