8.3 rebase xs 20250328

[stormi]

Naïve merge. Don't trust me, nor on packaging, nor on patches that I haven't reviewed at all anyway.

[gthvn1]

@stormi should't we also rebase xs-opam before? Because xs-opam provides the opam switch to build xapi . Or maybe there are no changes in the xs-opam repo?

[gthvn1]

Ok in fact we are probably using directly the upstream xs-opam repo so no need to worry about it.

[gthvn1]

NOTE: I was asking because with my current implementation of qcow-tool I rely on xs-opam 6.88 so I hope this "rebase" would also use the new version of xs-opam ;)

[stormi]

We're actually rebasing on xs-opam-repo-6.87.0-1.xs8.src.rpm but I haven't reached that letter yet (doing things in the alphabetical order)

[gthvn1]

I'm not sure how to handle things related to xs9 so I added questions for @xcp-ng-rpms/os-platform-release (I guess).

[gthvn1]

We will need to cherry-pick this one as well: xapi-project/xen-api@4ee32f2
it is in 25.15

[stormi]

This backport, as well as the other two, should be in a separate commit, not in the merge commit.

Arguably the rest of the patchqueue update could be in its own commit too:

• import commit
• merge commit, leaving TODOs
• patch update commit, only updating the existing patch queue
• a commit to add backports that are already known to be necessary

Each time refining the changelog. If you don't want a changelog entry to look like it's complete when it isn't yet, you can add - WIP at the end of the line, and remove it in the last commit:

* Fri Mar 28 2025 Samuel Verschelde <stormi-xcp@ylix.fr> - 25.6.0-1.1 - WIP

Lastly, as you're doing most of the work on patches, you could update the date and put your name instead of mine.

[stormi]

@glehmann you moved all patch updates to a separate commit, which is fine, but above I was asking that we moved new backports to their own commit, to separate them from mere adaptation to the new sources.

[stormi]

That's the only remaining comment. I still think added patches would better be in a separate commit, but I'm ready to approve as is.

[glehmann]

scratch build: https://koji.xcp-ng.org/taskinfo?taskID=81356

[glehmann]

I guess I should have run the scratch build on the v8.3-u-gtn1 target, in order to have the up-to-date xs-opam-repo? (it's not failed yet, just wondering)

[glehmann]

it failed because it doesn't have the expected xs-opam-repo, as expected!
new scratch build based on the v8.3-u-gtn1 target: https://koji.xcp-ng.org/taskinfo?taskID=81359