Re: [Buildroot] [PATCH v4 1/4] package/xen: fix build error when BR2_PACKAGE_XEN_TOOLS not enabled
Stewart Hildebrand via buildroot <[email protected]>
| Newsgroups | net.busybox.buildroot |
|---|---|
| Message-ID | <[email protected]> |
On 8/3/26 16:51, Neal Frager wrote: > The 0002-Update-linker-flags.patch assumes that the qemu-xen files are included > in the xen source tree. However, if BR2_PACKAGE_XEN_TOOLS is not enabled, the > qemu-xen dependency will not be handled and the patch will fail to apply with > the following error. > > Fixes: build error below > Applying 0002-Update-linker-flags.patch using patch: > patching file tools/Makefile > Hunk #1 succeeded at 36 (offset -1 lines). > Hunk #2 succeeded at 185 (offset -8 lines). > can't find file to patch at input line 76 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |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 > -------------------------- > No file to patch. Skipping patch. > 1 out of 1 hunk ignored > make: *** [package/pkg-generic.mk:239: output/build/xen-4.21.1/.stamp_patched] Error 1 > > To avoid making BR2_PACKAGE_XEN_TOOLS a required option, fix the > 0002-Update-linker-flags.patch so that the part that modifies the qemu-xen > sources is correctly moved to a patch in the qemu-xen package. > > Move this: > #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 > > /* > > to: > package/qemu-xen/0001-Update-linker-flags.patch Can you undefine __XEN_INTERFACE_VERSION__, and drop the xen_native.h hunk altogether? diff --git a/package/xen/xen.mk b/package/xen/xen.mk index 75252d1123b7..bddfdbba38a6 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -40,7 +40,8 @@ XEN_MAKE_ENV = \ CROSS_COMPILE=$(TARGET_CROSS) \ HOST_EXTRACFLAGS="-Wno-error" \ XEN_HAS_CHECKPOLICY=n \ - $(TARGET_CONFIGURE_OPTS) + $(TARGET_CONFIGURE_OPTS) \ + EXTRA_CFLAGS_QEMU_XEN="-U__XEN_INTERFACE_VERSION__" ifeq ($(BR2_PACKAGE_XEN_HYPERVISOR),y) XEN_MAKE_OPTS += dist-xen _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot