Skip to contentSkip to conversation

weston: fix LIC_FILES_CHKSUM endline and md5sum for src/compositor.c

PATCH In review Andre McCurdy 2 participants 3 messages Feb 14, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 weston: fix LIC_FILES_CHKSUM endline and md5sum for src/compositor.c

The license text in Weston sources was changed from "MIT X11" to "MIT Expat" in the 1.9.0 release. The new text is 3 lines longer than the previous version, so endline and md5 hash have been incorrect for the oe-core weston recipes from 1.9.0 onwards.

https://cgit.freedesktop.org/wayland/weston/diff/src/compositor.c?id=a0bbfea64b04d3cf12327d8b488b9949a4cddc99

---
 meta/recipes-graphics/wayland/weston_1.11.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/wayland/weston_1.11.1.bb +1 -1
index 2736cc1..cdfac70 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
 HOMEPAGE = "http://wayland.freedesktop.org"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
-                    file://src/compositor.c;endline=23;md5=1d535fed266cf39f6d8c0647f52ac331"
+                    file://src/compositor.c;endline=26;md5=e342df749174a8ee11065583157c7a38"
 
 SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            file://weston.png \
Signature · 1 line
1.9.1
#1 lore raw
Quoted 4 lines · Andre McCurdy

The license text in Weston sources was changed from "MIT X11" to "MIT Expat" in the 1.9.0 release. The new text is 3 lines longer than the previous version, so endline and md5 hash have been incorrect for the oe-core weston recipes from 1.9.0 onwards.

If this is the case, why the build system did not complain on >= 1.9 recipes?

Quoted 20 lines
   https://cgit.freedesktop.org/wayland/weston/diff/src/compositor.c?id=a0bbfea64b04d3cf12327d8b488b9949a4cddc99
---
  meta/recipes-graphics/wayland/weston_1.11.1.bb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/wayland/weston_1.11.1.bb +1 -1
index 2736cc1..cdfac70 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
  HOMEPAGE = "http://wayland.freedesktop.org"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
-                    file://src/compositor.c;endline=23;md5=1d535fed266cf39f6d8c0647f52ac331"
+                    file://src/compositor.c;endline=26;md5=e342df749174a8ee11065583157c7a38"
 
  SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
             file://weston.png \
#2 lore raw
Quoted 10 lines · Leonardo Sandoval
Quoted 5 lines · Andre McCurdy

The license text in Weston sources was changed from "MIT X11" to "MIT Expat" in the 1.9.0 release. The new text is 3 lines longer than the previous version, so endline and md5 hash have been incorrect for the oe-core weston recipes from 1.9.0 onwards.

If this is the case, why the build system did not complain on >= 1.9 recipes?

The current endline and hash are valid from the build system's point of view. The problem is that they only cover the first 23 lines of a 26 line block of license text.

Quoted 27 lines
Quoted 25 lines

https://cgit.freedesktop.org/wayland/weston/diff/src/compositor.c?id=a0bbfea64b04d3cf12327d8b488b9949a4cddc99

---
  meta/recipes-graphics/wayland/weston_1.11.1.bb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/wayland/weston_1.11.1.bb +0 -0
index 2736cc1..cdfac70 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "Weston is the reference implementation of a

Wayland compositor"
HOMEPAGE = "http://wayland.freedesktop.org"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70
\
- file://src/compositor.c;endline=23;md5=1d535fed266cf39f6d8c0647f52ac331" + file://src/compositor.c;endline=26;md5=e342df749174a8ee11065583157c7a38"
SRC_URI =

"https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
             file://weston.png \