Re: [Xen-devel] [PATCH raisin 3/4] Update config-4.6 and config-4.5 to point to stable branches

[George Dunlap <george.dunlap@xxxxxxxxxx>]

On 14/06/16 11:01, Stefano Stabellini wrote:
> On Tue, 14 Jun 2016, George Dunlap wrote:
>> On 14/06/16 10:40, Stefano Stabellini wrote:
>>> On Mon, 13 Jun 2016, George Dunlap wrote:
>>>> Point xen, qemu, and qemu-trad to stable-4.5 and -4.6 branches.
>>>>
>>>> And point the default libvirt to point to the libvirt 1.3.3
>>>> maintenance branch, rather than xen-tested-master.
>>>>
>>>> Also update OVMF revision for 4.6 to a version that builds with modern
>>>> gccs.
>>>>
>>>> Singed-off-by: George Dunlap <george.dunlap@xxxxxxxxxx>
>>>>
>>>> CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
>>>> ---
>>>>  configs/config-4.5     | 6 +++---
>>>>  configs/config-4.6     | 8 ++++----
>>>>  configs/config-master  | 3 +++
>>>>  configs/config-url-git | 2 +-
>>>>  4 files changed, 11 insertions(+), 8 deletions(-)
>>>>
>>>> diff --git a/configs/config-4.5 b/configs/config-4.5
>>>> index 4163b68..8db9a9d 100644
>>>> --- a/configs/config-4.5
>>>> +++ b/configs/config-4.5
>>>> @@ -1,8 +1,8 @@
>>>>  XEN_REVISION="origin/stable-4.5"
>>>> -QEMU_REVISION="master"
>>>> -QEMU_TRADITIONAL_REVISION="master"
>>>> +QEMU_REVISION="origin/stable-4.5"
>>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.5"
>>>>  SEABIOS_REVISION="rel-1.7.5"
>>>>  GRUB_REVISION="master"
>>>> -LIBVIRT_REVISION="origin/xen-tested-master"
>>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
>>>>  OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
>>>>  LINUX_REVISION="master"
>>>> diff --git a/configs/config-4.6 b/configs/config-4.6
>>>> index e8b2a09..b003a30 100644
>>>> --- a/configs/config-4.6
>>>> +++ b/configs/config-4.6
>>>> @@ -1,8 +1,8 @@
>>>>  XEN_REVISION="origin/stable-4.6"
>>>> -QEMU_REVISION="master"
>>>> -QEMU_TRADITIONAL_REVISION="master"
>>>> +QEMU_REVISION="origin/stable-4.6"
>>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.6"
>>>>  SEABIOS_REVISION="rel-1.8.2"
>>>>  GRUB_REVISION="master"
>>>> -LIBVIRT_REVISION="origin/xen-tested-master"
>>>> -OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
>>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
>>>> +OVMF_REVISION="52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d"
>>>>  LINUX_REVISION="master"
>>>> diff --git a/configs/config-master b/configs/config-master
>>>> index bd26ce3..fce7436 100644
>>>> --- a/configs/config-master
>>>> +++ b/configs/config-master
>>>> @@ -6,3 +6,6 @@ GRUB_REVISION="master"
>>>>  LIBVIRT_REVISION="origin/xen-tested-master"
>>>>  OVMF_REVISION="origin/xen-tested-master"
>>>>  LINUX_REVISION="master"
>>>> +
>>>> +# oss-tested branch
>>>> +LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
>>>
>>> Why keep this around? I would remove it.
>>
>> Because...
>>
>>>> diff --git a/configs/config-url-git b/configs/config-url-git
>>>> index 79813c4..614f522 100644
>>>> --- a/configs/config-url-git
>>>> +++ b/configs/config-url-git
>>>> @@ -3,6 +3,6 @@ QEMU_URL="git://xenbits.xen.org/qemu-xen.git"
>>>>  QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.git"
>>>>  SEABIOS_URL="git://xenbits.xen.org/seabios.git"
>>>>  GRUB_URL="git://git.savannah.gnu.org/grub.git"
>>>> -LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
>>>> +LIBVIRT_URL="git://libvirt.org/libvirt.git"
>>
>> ...here, the LIBVIRT_URL in config-url-git is set to the libvirt.org URL
>> so that the stable releases can be pointed to v1.3.3-maint instead. The
>> xen.org repo doesn't contain the v1.3.3-maint branch, and the
>> libvirt.org repo doesn't contain the 'xen-tested-master' branch.
>>
>> I admit this is a bit ugly, *almost* separating things entirely but then
>> not. But I don't see another easy way of having both the 1.3.3
>> maintenance branch and the oss-tested branch. (Unless we started having
>> osstest test the maintenance branch as well.)
>  
> I would drop git://xenbits.xen.org/libvirt.git and xen-tested-master
> entirely and just stick to v1.3.3-maint everywhere. Or the other way
> around.

Well I assume that people building one of the releases want something
relatively stable and supported, so xen-tested-master is obviously
unsuitable (and might not actually be capable of building against Xen
versions older than a certain point due to the fact that libxl cannot be
both forward- and backward-compatible).  And I also assume that people
building with XEN_RELEASE="master" want the bleeding edge of everything
so that they can test new features (or indeed, so that they can write
new features).  So I think we actually do want both -- a maintenance
branch for releases, and xen-tested-master for developers and
bleeding-edge users.

 -George

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel