All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Bertrand Marquis" <bertrand.marquis@arm.com>
To: Christopher Clark <christopher.w.clark@gmail.com>
Cc: "meta-virtualization@lists.yoctoproject.org"
	<meta-virtualization@lists.yoctoproject.org>,
	"cardoe@gentoo.org" <cardoe@gentoo.org>,
	"bruce.ashfield@gmail.com" <bruce.ashfield@gmail.com>
Subject: Re: [meta-virtualization][PATCH 2/2] xen, xen-tools: upgrade version to latest 4.15
Date: Tue, 13 Apr 2021 07:50:08 +0000	[thread overview]
Message-ID: <5FD7ADC9-C018-4400-B51A-40C14618BB91@arm.com> (raw)
In-Reply-To: <20210413030951.40543-2-christopher.w.clark@gmail.com>

Hi Christopher,

> On 13 Apr 2021, at 04:09, Christopher Clark via lists.yoctoproject.org <christopher.w.clark=gmail.com@lists.yoctoproject.org> wrote:
>
> Update the git recipes revision to the recent master branch point for
> starting 4.16 development.
>
> Remove the xen-tools python patch for 4.14.

I do not think the 4.14 recipe should be removed as we decided a while ago that we should
always have a recipe for:
- current release - 1
- current release
- master

More then that we have very near Hardknott release and meta-virtualization was not branched
so this is a really bad idea to do a version bump right now.

I would suggest to:
- add recipes for Xen and Xen-tools 4.15
- set preferred version to 4.14

and after branching change the preferred version to 4.15 on master.

What do you think ?

Regards
Bertrand

>
> Signed-off-by: Christopher Clark <christopher.w.clark@gmail.com>
> Signed-off-by: Christopher Clark <christopher.w.clark@gmail.com>
> ---
> ...ython-pygrub-pass-DISTUTILS-xen-4.14.patch | 66 -------------------
> .../{xen-tools_4.14.bb => xen-tools_4.15.bb}  |  6 +-
> recipes-extended/xen/xen-tools_git.bb         |  4 +-
> .../xen/{xen_4.14.bb => xen_4.15.bb}          |  4 +-
> recipes-extended/xen/xen_git.bb               |  4 +-
> 5 files changed, 9 insertions(+), 75 deletions(-)
> delete mode 100644 recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch
> rename recipes-extended/xen/{xen-tools_4.14.bb => xen-tools_4.15.bb} (68%)
> rename recipes-extended/xen/{xen_4.14.bb => xen_4.15.bb} (85%)
>
> diff --git a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch
> deleted file mode 100644
> index f0688fd..0000000
> --- a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -From d79dcc2002008c58683de82f06c168d6eea57991 Mon Sep 17 00:00:00 2001
> -From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
> -Date: Fri, 19 Oct 2018 11:01:37 +0200
> -Subject: [PATCH] python,pygrub: pass DISTUTILS env vars as setup.py args
> -
> -Allow to respect the target install dir (PYTHON_SITEPACKAGES_DIR)
> -as well as other parameters set by the OpenEmbedded build system.
> -This is especially useful when the target libdir is not the default one
> -(/usr/lib), but for example /usr/lib64.
> -
> -Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
> -
> -Forward-ported to Xen 4.12.0
> -Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
> -
> -Modified to support pygrub installation with python 3
> -Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
> -
> -Forward-ported to Xen 4.14.0
> -Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
> -diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
> -index 3063c49..513314b 100644
> ---- a/tools/pygrub/Makefile
> -+++ b/tools/pygrub/Makefile
> -@@ -10,14 +10,17 @@ INSTALL_LOG = build/installed_files.txt
> - all: build
> - .PHONY: build
> - build:
> --CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build
> -+CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build $(DISTUTILS_BUILD_ARGS)
> -
> - .PHONY: install
> - install: all
> - $(INSTALL_DIR) $(DESTDIR)/$(bindir)
> - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) \
> - setup.py install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
> -- --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force
> -+ --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force \
> -+ $(DISTUTILS_INSTALL_ARGS)
> -+rm -f $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
> -+$(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
> - set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \
> -              "`readlink -f $(DESTDIR)/$(bindir)`" != \
> -              "`readlink -f $(LIBEXEC_BIN)`" ]; then \
> -diff --git a/tools/python/Makefile b/tools/python/Makefile
> -index 541858e..4d4a344 100644
> ---- a/tools/python/Makefile
> -+++ b/tools/python/Makefile
> -@@ -10,7 +10,7 @@ INSTALL_LOG = build/installed_files.txt
> -
> - .PHONY: build
> - build:
> --CC="$(CC)" CFLAGS="$(PY_CFLAGS)" $(PYTHON) setup.py build
> -+CC="$(CC)" CFLAGS="$(PY_CFLAGS)" $(PYTHON) setup.py build $(DISTUTILS_BUILD_ARGS)
> -
> - .PHONY: install
> - install:
> -@@ -18,7 +18,7 @@ install:
> -
> - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) \
> - setup.py install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
> ----root="$(DESTDIR)" --force
> -+--root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS)
> -
> - $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN)
> - $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN)
> diff --git a/recipes-extended/xen/xen-tools_4.14.bb b/recipes-extended/xen/xen-tools_4.15.bb
> similarity index 68%
> rename from recipes-extended/xen/xen-tools_4.14.bb
> rename to recipes-extended/xen/xen-tools_4.15.bb
> index a79b41d..314dc52 100644
> --- a/recipes-extended/xen/xen-tools_4.14.bb
> +++ b/recipes-extended/xen/xen-tools_4.15.bb
> @@ -1,11 +1,11 @@
> -SRCREV ?= "ad844aa352559a8b1f36e391a27d9d7dbddbdc36"
> +SRCREV ?= "e25aa9939ae0cd8317605be3d5c5611b76bc4ab4"
>
> -XEN_REL ?= "4.14"
> +XEN_REL ?= "4.15"
> XEN_BRANCH ?= "stable-${XEN_REL}"
>
> SRC_URI = " \
>     git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
> -    file://0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch \
> +    file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
>     "
>
> LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
> diff --git a/recipes-extended/xen/xen-tools_git.bb b/recipes-extended/xen/xen-tools_git.bb
> index 71850ee..0188bdd 100644
> --- a/recipes-extended/xen/xen-tools_git.bb
> +++ b/recipes-extended/xen/xen-tools_git.bb
> @@ -1,6 +1,6 @@
> -SRCREV ?= "9dc687f155a57216b83b17f9cde55dd43e06b0cd"
> +SRCREV ?= "e680cc48b7184d3489873d6776f84ba1fc238ced"
>
> -XEN_REL ?= "4.15"
> +XEN_REL ?= "4.16"
> XEN_BRANCH ?= "master"
>
> SRC_URI = " \
> diff --git a/recipes-extended/xen/xen_4.14.bb b/recipes-extended/xen/xen_4.15.bb
> similarity index 85%
> rename from recipes-extended/xen/xen_4.14.bb
> rename to recipes-extended/xen/xen_4.15.bb
> index 653e3b6..2842c0a 100644
> --- a/recipes-extended/xen/xen_4.14.bb
> +++ b/recipes-extended/xen/xen_4.15.bb
> @@ -1,6 +1,6 @@
> -SRCREV ?= "ad844aa352559a8b1f36e391a27d9d7dbddbdc36"
> +SRCREV ?= "e25aa9939ae0cd8317605be3d5c5611b76bc4ab4"
>
> -XEN_REL ?= "4.14"
> +XEN_REL ?= "4.15"
> XEN_BRANCH ?= "stable-${XEN_REL}"
>
> SRC_URI = " \
> diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb
> index 2b62c5c..eaf3956 100644
> --- a/recipes-extended/xen/xen_git.bb
> +++ b/recipes-extended/xen/xen_git.bb
> @@ -1,6 +1,6 @@
> -SRCREV ?= "9dc687f155a57216b83b17f9cde55dd43e06b0cd"
> +SRCREV ?= "e680cc48b7184d3489873d6776f84ba1fc238ced"
>
> -XEN_REL ?= "4.15"
> +XEN_REL ?= "4.16"
> XEN_BRANCH ?= "master"
>
> SRC_URI = " \
> --
> 2.25.1
>
>
> 
>

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

  reply	other threads:[~2021-04-13  7:50 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-13  3:09 [meta-virtualization][PATCH 1/2] xen-tools: fix 32-bit x86 build by setting pvshim configure flags Christopher Clark
2021-04-13  3:09 ` [meta-virtualization][PATCH 2/2] xen, xen-tools: upgrade version to latest 4.15 Christopher Clark
2021-04-13  7:50   ` Bertrand Marquis [this message]
2021-04-13 12:51     ` Bruce Ashfield
2021-04-13 13:24       ` Bertrand Marquis
2021-04-14  5:13         ` Christopher Clark
2021-04-14  7:40           ` Bertrand Marquis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5FD7ADC9-C018-4400-B51A-40C14618BB91@arm.com \
    --to=bertrand.marquis@arm.com \
    --cc=bruce.ashfield@gmail.com \
    --cc=cardoe@gentoo.org \
    --cc=christopher.w.clark@gmail.com \
    --cc=meta-virtualization@lists.yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.