Re: [Buildroot] [PATCH v1 1/3] package/xen: add custom version support

AMD General

Hi John, Matt,

> Add the ability to configure specific Xen versions while leaving the default
> version unchanged to avoid breaking any builds already using Xen 4.19.5.
>
> Since the version can be configured, the 3 patches need to be moved to the
> 4.19.5 directory, so they are only applied when using this version.
>
> Signed-off-by: Neal Frager <[email protected]>
> ---
>   .../{ => 4.19.5}/0001-No-trace-backend.patch  |  0
>   ...2-Arm-platforms-fix-build-with-gcc15.patch |  0
>   .../0003-Update-linker-flags.patch            |  0
>   package/xen/Config.in                         | 25 +++++++++++++++++++
>   package/xen/xen.mk                            |  6 +++--
>   5 files changed, 29 insertions(+), 2 deletions(-)
>   rename package/xen/{ => 4.19.5}/0001-No-trace-backend.patch (100%)
>   rename package/xen/{ => 4.19.5}/0002-Arm-platforms-fix-build-with-gcc15.patch (100%)
>   rename package/xen/{ => 4.19.5}/0003-Update-linker-flags.patch (100%)
>
> diff --git a/package/xen/0001-No-trace-backend.patch b/package/xen/4.19.5/0001-No-trace-backend.patch
> similarity index 100%
> rename from package/xen/0001-No-trace-backend.patch
> rename to package/xen/4.19.5/0001-No-trace-backend.patch
> diff --git a/package/xen/0002-Arm-platforms-fix-build-with-gcc15.patch b/package/xen/4.19.5/0002-Arm-platforms-fix-build-with-gcc15.patch
> similarity index 100%
> rename from package/xen/0002-Arm-platforms-fix-build-with-gcc15.patch
> rename to package/xen/4.19.5/0002-Arm-platforms-fix-build-with-gcc15.patch
> diff --git a/package/xen/0003-Update-linker-flags.patch b/package/xen/4.19.5/0003-Update-linker-flags.patch
> similarity index 100%
> rename from package/xen/0003-Update-linker-flags.patch
> rename to package/xen/4.19.5/0003-Update-linker-flags.patch
> diff --git a/package/xen/Config.in b/package/xen/Config.in
> index dc4d434810..bb44202824 100644
> --- a/package/xen/Config.in
> +++ b/package/xen/Config.in
> @@ -10,6 +10,31 @@ config BR2_PACKAGE_XEN
>
>   if BR2_PACKAGE_XEN
>
> +choice
> +       prompt "Xen Version"
> +       help
> +         Select the specific Xen version you want to use
> +
> +config BR2_PACKAGE_XEN_LATEST_VERSION
> +       bool "4.19.5"
> +
> +config BR2_PACKAGE_XEN_CUSTOM_VERSION
> +       bool "Custom version"
> +       help
> +         This option allows to use a specific official version
> +
> +endchoice
> +
> +config BR2_PACKAGE_XEN_CUSTOM_VERSION_VALUE
> +       string "Xen version"
> +       depends on BR2_PACKAGE_XEN_CUSTOM_VERSION
> +
> +config BR2_PACKAGE_XEN_VERSION
> +       string
> +       default "4.19.5"        if BR2_PACKAGE_XEN_LATEST_VERSION
> +       default BR2_PACKAGE_XEN_CUSTOM_VERSION_VALUE \
> +                               if BR2_PACKAGE_XEN_CUSTOM_VERSION
> +
>   config BR2_PACKAGE_XEN_HYPERVISOR
>          bool "Xen hypervisor"
>          help
> diff --git a/package/xen/xen.mk b/package/xen/xen.mk
> index 5756dfc68c..e354718021 100644
> --- a/package/xen/xen.mk
> +++ b/package/xen/xen.mk
> @@ -4,8 +4,7 @@
>   #
>   ################################################################################
>
> -XEN_VERSION = 4.19.5
> -XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION)
> +XEN_VERSION = $(call qstrip,$(BR2_PACKAGE_XEN_VERSION))
>   XEN_SELINUX_MODULES = systemd udev xen
>   XEN_LICENSE = GPL-2.0
>   XEN_LICENSE_FILES = COPYING LICENSES/GPL-2.0
> @@ -13,6 +12,9 @@ XEN_CPE_ID_VENDOR = xen
>   XEN_CPE_ID_PREFIX = cpe:2.3:o
>   XEN_DEPENDENCIES = host-acpica host-meson host-pkgconf host-python3
>
> +# Handle stable official Xen versions
> +XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION)
> +

> Moving this seems like it should be part of the next patch.

> But doesn't matter that much to me, so, with or without:

> Reviewed-by: John Ernberg <[email protected]>

> I see your point.  If someone finds something that really does require a
> change, I will include this change in a v2. Otherwise, I agree that it is not
> so important.

> To be honest, my original development had patches 1 and 2 squashed together
> because the second patch was the one I really wanted to test and verify. This
> move in the first patch is a remnant of my splitting the patch in two before
> submission.

>   # Calculate XEN_ARCH
>   ifeq ($(ARCH),aarch64)
>   XEN_ARCH = arm64
> --
> 2.25.1
>

I am going rebase this patch series tomorrow since a version bump was applied,
and these patches no longer apply cleanly to master.

The only thing I will change is moving the XEN_SITE line move from the first
patch to the second based on John's feedback.

Given there is no functional change to my patch series, would you like me to
keep your Reviewed-by and Tested-by tags in my v2 submission or would you like
to review and test again first?

Best regards,
Neal Frager
AMD
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot