| Message ID | 20260521154434.2273692-1-richard.purdie@linuxfoundation.org |
|---|---|
| State | Accepted, archived |
| Commit | 91ecfdcc1da3fdfee670244c90da0ab4eb296453 |
| Headers | show |
| Series | xserver-xorg/xwayland: 'Clarify' xserver license | expand |
Hi Richard, The autobuilder wasn't happy with this change I think: ERROR: xserver-xorg-2_21.1.22-r0 do_populate_lic: QA Issue: xserver-xorg-2_21.1.22-r0: Failed to parse LICENSE: MIT && Adobe-Display-PostScript && BSD-3-Clause && DEC-3-Clause && HPND && HPND-Netrek && HPND-sell-MIT-disclaimer-xserver && HPND-sell-variant && HPND-UC && ICU && ISC && MIT-open-group && NTP && SGI-B-2.0 && SMLNJ && X11 && X11-no-permit-persons && X11-swapped [license-syntax] ERROR: xserver-xorg-2_21.1.22-r0 do_populate_lic: Fatal QA errors were found, failing task. https://autobuilder.yoctoproject.org/valkyrie/#/builders/2/builds/3808 I think it's "&", not "&&"? This was seen across multiple jobs on a-full: https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/3862 Antonin
On Tue, 2026-05-26 at 09:08 +0200, Antonin Godard wrote: > The autobuilder wasn't happy with this change I think: > > ERROR: xserver-xorg-2_21.1.22-r0 do_populate_lic: QA Issue: xserver- > xorg-2_21.1.22-r0: Failed to parse LICENSE: MIT && Adobe-Display- > PostScript && BSD-3-Clause && DEC-3-Clause && HPND && HPND-Netrek && > HPND-sell-MIT-disclaimer-xserver && HPND-sell-variant && HPND-UC && > ICU && ISC && MIT-open-group && NTP && SGI-B-2.0 && SMLNJ && X11 && > X11-no-permit-persons && X11-swapped [license-syntax] > ERROR: xserver-xorg-2_21.1.22-r0 do_populate_lic: Fatal QA errors > were found, failing task. > > https://autobuilder.yoctoproject.org/valkyrie/#/builders/2/builds/3808 > > I think it's "&", not "&&"? > > This was seen across multiple jobs on a-full: > https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/3862 Sorry, yes. I got the patches mixed up with trying to rebase the xwayland recipe upgrade and the wrong version was sent out :( The correct version is in master-next and I will resend it. Cheers, Richard
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index f720c9cef4d..0f7eeb33d5f 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -1,7 +1,7 @@ SUMMARY = "The X.Org X server" HOMEPAGE = "http://www.x.org" SECTION = "x11/base" -LICENSE = "MIT" +LICENSE = "MIT && Adobe-Display-PostScript && BSD-3-Clause && DEC-3-Clause && HPND && HPND-Netrek && HPND-sell-MIT-disclaimer-xserver && HPND-sell-variant && HPND-UC && ICU && ISC && MIT-open-group && NTP && SGI-B-2.0 && SMLNJ && X11 && X11-no-permit-persons && X11-swapped" LIC_FILES_CHKSUM = "file://COPYING;md5=f8778cfcd90ece0e4b225f30182227ca" # xf86-*-* packages depend on an X server built with the xfree86 DDX diff --git a/meta/recipes-graphics/xwayland/xwayland_24.1.9.bb b/meta/recipes-graphics/xwayland/xwayland_24.1.9.bb index c4e2d7cfdb9..44b8bb605a7 100644 --- a/meta/recipes-graphics/xwayland/xwayland_24.1.9.bb +++ b/meta/recipes-graphics/xwayland/xwayland_24.1.9.bb @@ -6,7 +6,7 @@ the transition from X Window System to Wayland environments, providing \ a way to run unported applications in the meantime." HOMEPAGE = "https://fedoraproject.org/wiki/Changes/XwaylandStandalone" -LICENSE = "MIT" +LICENSE = "MIT && Adobe-Display-PostScript && BSD-3-Clause && DEC-3-Clause && HPND && HPND-Netrek && HPND-sell-MIT-disclaimer-xserver && HPND-sell-variant && HPND-UC && ICU && ISC && MIT-open-group && NTP && SGI-B-2.0 && SMLNJ && X11 && X11-no-permit-persons && X11-swapped" LIC_FILES_CHKSUM = "file://COPYING;md5=21e33dcccf2d5034f798a8ea62622939" SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz"
The Xserver license, https://gitlab.freedesktop.org/xorg/xserver/-/blob/main/COPYING is a bit of a challenge to decode. Whilst overall thought to be MIT, there are many other simlar/related licences included in there. The make our license data more accurate, update to include all the license variants present. I have submitted a patch upstream to add identifiers to the COPYING file to make it clearer where these come from and save others from repeating this painful exercise: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2218 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +- meta/recipes-graphics/xwayland/xwayland_24.1.9.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)