mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -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>
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From d12666d74dc742bb06c30b96d6b874a3e14c6b46 Mon Sep 17 00:00:00 2001
|
|
From: Jan Beulich <jbeulich@suse.com>
|
|
Date: Tue, 26 Aug 2025 08:41:18 +0200
|
|
Subject: [PATCH] Arm/platforms: fix build with gcc15
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
For two of the headers gcc15 complains "header guard ... followed by
|
|
'#define' of a different macro". Misra certainly wouldn't have liked
|
|
this either, if these headers were covered by a scan.
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Acked-by: Michal Orzel <michal.orzel@amd.com>
|
|
Upstream: https://xenbits.xen.org/gitweb/?p=xen.git;a=commitdiff;h=39f95089e2ba15c5438ce904c0cbbd8d79d3e6e7
|
|
Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
|
|
---
|
|
xen/arch/arm/include/asm/platforms/midway.h | 2 +-
|
|
xen/arch/arm/include/asm/platforms/omap5.h | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/xen/arch/arm/include/asm/platforms/midway.h b/xen/arch/arm/include/asm/platforms/midway.h
|
|
index 099e435..6914393 100644
|
|
--- a/xen/arch/arm/include/asm/platforms/midway.h
|
|
+++ b/xen/arch/arm/include/asm/platforms/midway.h
|
|
@@ -1,5 +1,5 @@
|
|
#ifndef __ASM_ARM_PLATFORMS_MIDWAY_H
|
|
-#define __ASM_ASM_PLATFORMS_MIDWAY_H
|
|
+#define __ASM_ARM_PLATFORMS_MIDWAY_H
|
|
|
|
/* addresses of SREG registers for resetting the SoC */
|
|
#define MW_SREG_PWR_REQ 0xfff3cf00
|
|
diff --git a/xen/arch/arm/include/asm/platforms/omap5.h b/xen/arch/arm/include/asm/platforms/omap5.h
|
|
index c559c84..8867b45 100644
|
|
--- a/xen/arch/arm/include/asm/platforms/omap5.h
|
|
+++ b/xen/arch/arm/include/asm/platforms/omap5.h
|
|
@@ -1,5 +1,5 @@
|
|
#ifndef __ASM_ARM_PLATFORMS_OMAP5_H
|
|
-#define __ASM_ASM_PLATFORMS_OMAP5_H
|
|
+#define __ASM_ARM_PLATFORMS_OMAP5_H
|
|
|
|
#define REALTIME_COUNTER_BASE 0x48243200
|
|
#define INCREMENTER_NUMERATOR_OFFSET 0x10
|
|
--
|
|
2.53.0
|
|
|