TEST: align text_diff to 64 bytes

Signed-off-by: Krystian Hebel <[email protected]>

qubesos_1019-x86-boot-Makefile-align-text_diff-to-0x40-bytes.patch

@@ -0,0 +1,30 @@
+From 43e205e9cffb6c4c251d03d1299bd630911a2fe7 Mon Sep 17 00:00:00 2001
+From: Krystian Hebel <[email protected]>
+Date: Wed, 6 Nov 2024 18:03:48 +0100
+Subject: [PATCH] x86/boot/Makefile: align text_diff to 0x40 bytes
+
+This is the file alignment when building Xen through Qubes builder.
+
+Signed-off-by: Krystian Hebel <[email protected]>
+---
+ xen/arch/x86/boot/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile
+index c32a1f5878cb..2ab9c168ba43 100644
+--- a/xen/arch/x86/boot/Makefile
++++ b/xen/arch/x86/boot/Makefile
+@@ -47,7 +47,7 @@ LD32 := $(LD) $(subst x86_64,i386,$(LDFLAGS_DIRECT))
+ # is greater than 2^16 so that any 16bit relocations if present in the object
+ # file turns into a build-time error.
+ text_gap := 0x010200
+-text_diff := 0x408020
++text_diff := 0x408040
+
+ $(obj)/build32.base.lds: AFLAGS-y += -DGAP=$(text_gap) -DTEXT_DIFF=$(text_diff)
+ $(obj)/build32.offset.lds: AFLAGS-y += -DGAP=$(text_gap) -DTEXT_DIFF=$(text_diff) -DFINAL
+
+base-commit: 4c1075e7653746ee4c783d605673ef607780ea68
+-- 
+2.47.0
+

vmm-xen.spec.in

@@ -81,6 +81,7 @@ Provides: xen-gvt
 # This fixes building .efi file. While it isn't used (even on UEFI) in the final
 # system, keep it to create RPMs similar to the original ones.
 Patch0203: qubesos_0203-xen.efi.build.patch
+Patch1019: qubesos_1019-x86-boot-Makefile-align-text_diff-to-0x40-bytes.patch
 
 %if %build_qemutrad
 BuildRequires: libidn-devel zlib-devel SDL-devel curl-devel