On Tue, Apr 13, 2021 at 3:50 AM Bertrand Marquis <[email protected]> wrote: > > Hi Christopher, > > > On 13 Apr 2021, at 04:09, Christopher Clark via lists.yoctoproject.org > > <[email protected]> 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
I recall the discussion, but can't find my mailing list archive of it. If anyone has a pointer, I need to refresh my memory. See below for why. > > 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 won't actually branch and declare meta-virt released for a couple of weeks after the Yocto release. It takes a bit of time for retesting and final stabilization. So there is some time, but yes, I'm not really doing much for uprev's that will land in the release (I have about 15 uprevs done locally as well that I'm deciding on). I can either run a master-next for a bit, or I'll branch earlier, if we have some changes that are better in tree. > I would suggest to: > - add recipes for Xen and Xen-tools 4.15 > - set preferred version to 4.14 >From the Xen release pages I just read, there isn't a LTS release, is there ? (or did I miss it ?). Without a LTS, I'd hesitate to support the three versions when we get into a timing issue like this (it hits me all the time with the kernel in oe-core). We only do that with the kernel in a given release due to LTS support. Otherwise, it would just be two: A tagged release + latest. If 4.15 is not the preferred version, I'd prefer it to not be in the release at all, since it won't get much testing. If someone wants it, I'd just point them at master. So my summary is, we can keep the three versions, but I'd suggest that 4.15 never lands in the hardknott branch, and only master. And for the fall, we'd have 4.15 + 4.16 + the git recipe for the latest. In that latter case, the patch as it stands is close to ok for master, and I'll just never put it into the hardknott branch. Also, feel free to drop by #meta-virt to discuss more interactively. Bruce > > and after branching change the preferred version to 4.15 on master. > > What do you think ? > > Regards > Bertrand > > > > > Signed-off-by: Christopher Clark <[email protected]> > > Signed-off-by: Christopher Clark <[email protected]> > > --- > > ...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 <[email protected]> > > -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 <[email protected]> > > - > > -Forward-ported to Xen 4.12.0 > > -Signed-off-by: Christopher Clark <[email protected]> > > - > > -Modified to support pygrub installation with python 3 > > -Signed-off-by: Christopher Clark <[email protected]> > > - > > -Forward-ported to Xen 4.14.0 > > -Signed-off-by: Christopher Clark <[email protected]> > > -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. -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6356): https://lists.yoctoproject.org/g/meta-virtualization/message/6356 Mute This Topic: https://lists.yoctoproject.org/mt/82056591/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
