On Tue, Nov 28, 2023 at 5:49 AM Bruce Ashfield <[email protected]> wrote:
> On Tue, Nov 28, 2023 at 7:56 AM Bruce Ashfield via > lists.yoctoproject.org > <[email protected]> wrote: > > > > On Tue, Nov 28, 2023 at 3:42 AM Orzel, Michal via > > lists.yoctoproject.org <[email protected]> > > wrote: > > > > > > On 28/11/2023 04:11, Christopher Clark wrote: > > > > > > > > On Mon, Nov 27, 2023 at 6:08 AM Michal Orzel <[email protected] > <mailto:[email protected]>> wrote: > > > > > > > > On 27/11/2023 14:55, Bruce Ashfield wrote: > > > > > > > > > > On Mon, Nov 27, 2023 at 5:38 AM Michal Orzel < > [email protected] <mailto:[email protected]>> wrote: > > > > >> > > > > >> Some follow-up patches after a recent Xen recipes update. > > > > >> > > > > >> Open question: > > > > >> Shouldn't we set 4.18 as a default version? > > > > > > > > > > Not yet (and definitely not for nanbield). Perhaps once it has > been under > > > > > test for a few weeks. I did the updates to get them some extra > soak time > > > > > and make them available in both the upcoming release > (nanbield) and > > > > > master for those that want to use the latest, without making > it a default > > > > > version jump so late in the cycle. > > > > Ok. > > > > > > > > Thanks, Bruce. > > > > > > > > > As for the changes in master, the 4.18 version on the _git > recipes is > > > > > intentional, as there's been no 4.19 tag that I can find and I > don't bump > > > > > versions until I see that in the repo .. so for now, it is > just the +git > > > > > and +stable that is the difference between the 4.18 and _git > versions. > > > > You won't see any 4.19 tag until the next release. The version > is advertised in > > > > the main Makefile [1] and this is what user can see in the system > > > > (e.g. in the boot log, xl info, xen_version hypercall). > > > > Bumping the XEN_REL of master recipes > > > > > > > > I think it could be helpful for the context of this thread to > describe them as the "git recipes" rather than using the term "master > recipe", because the latter unfortunately seems to convey that they are > somehow superior to the other, versioned, Xen recipes, when in practice > they are not -- they are deliberately not the default version of Xen that > is built since, as you note, they are defined: > > > > > > > > to reflect the current development version > > > > > > > > of Xen. ie. The git recipes are present alongside the other recipes > that provide the stable release version(s) of Xen. > > > > > > > > As Michal has noted above, putting 4.19 for XEN_REL into the git > recipe does look right from a Xen source tree perspective for that SRCREV, > even though there is not a 4.19 Xen release, but the proposed commit > message should be updated to avoid the term "master recipe". > > > Sounds good to me. > > > > > > @Bruce, may I please ask you to take my patch modifying XEN_REL and do > s/master/git in title on commit? > > > If not, I will push a v2 of this patch. > > > > Regardless of what I've done in the past, I'm still inclined to hold > > the line on the versioning until at least the first -rc is released. > > > > FWIW, I also don't change the version of the linux-yocto-dev kernels > until a valid > -rc1 is released, even though the "version' has moved on from the previous > release. > > That being said, until I find a better option to keep the versions > reported via > the runtime to match the package version, I can either bump the version or > hold / revert the _git recipe until the first release candidates are out. > > I'll go ahead and stage the change with the fixup, even if I don't like the > version management scheme :) > Thanks for the extra info, Bruce. So there is still a way to meet your versioning scheme and have the runtime version match the package version by changing the default Xen branch selector in the git recipe via the XEN_BRANCH variable to the latest stable branch, thus: diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/ xen_git.bb index 784e71ce..547a7943 100644 --- a/recipes-extended/xen/xen_git.bb +++ b/recipes-extended/xen/xen_git.bb @@ -2,7 +2,7 @@ SRCREV ?= "f96e2f64576cdbb147391c7cb399d393385719a9" XEN_REL ?= "4.18" -XEN_BRANCH ?= "master" +XEN_BRANCH ?= "stable-4.18" SRC_URI = " \ git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ and then anyone building a development version of Xen can update both the XEN_BRANCH and XEN_REL variables to match the revision that they are choosing to build. Does that look OK? Or another option is to use the XEN_REL value to select the default stable branch to use: diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/ xen_git.bb index 784e71ce..35e6b859 100644 --- a/recipes-extended/xen/xen_git.bb +++ b/recipes-extended/xen/xen_git.bb @@ -2,7 +2,7 @@ SRCREV ?= "f96e2f64576cdbb147391c7cb399d393385719a9" XEN_REL ?= "4.18" -XEN_BRANCH ?= "master" +XEN_BRANCH ?= "stable-${XEN_REL}" SRC_URI = " \ git://xenbits.xen.org/xen.git;branch=${XEN_BRAN Christopher > > Bruce > > > Bruce > > > > > > > > ~Michal > > > > > > > > > > > > > > > -- > > - Thou shalt not follow the NULL pointer, for chaos and madness await > > thee at its end > > - "Use the force Harry" - Gandalf, Star Trek II > > > > > > > > > -- > - 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 (#8481): https://lists.yoctoproject.org/g/meta-virtualization/message/8481 Mute This Topic: https://lists.yoctoproject.org/mt/102826507/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
