[PATCH] cmake: Upgrade to 3.9.3 release

[PATCH] cmake: Upgrade to 3.9.3 release

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 .../cmake/{cmake-native_3.8.2.bb => cmake-native_3.9.3.bb}   |  0
 meta/recipes-devtools/cmake/cmake.inc                        | 12 ++++++++----
 .../cmake/{cmake_3.8.2.bb => cmake_3.9.3.bb}                 |  0
 3 files changed, 8 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/cmake/{cmake-native_3.8.2.bb => cmake-native_3.9.3.bb} (100%)
 rename meta/recipes-devtools/cmake/{cmake_3.8.2.bb => cmake_3.9.3.bb} (100%)

diff --git a/meta/recipes-devtools/cmake/cmake-native_3.8.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.9.3.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.8.2.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.9.3.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 6aeb25fdd5..092ac74610 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.cmake.org/"
 BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php"
 SECTION = "console/utils"
 LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://Copyright.txt;md5=8d8c7bc32f8797d23f5cf605d9339d2d \
+LIC_FILES_CHKSUM = "file://Copyright.txt;md5=24600643e5d1d2b8f7478ae5c9074949 \
                     file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14"
 
 CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
@@ -17,8 +17,8 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
            file://0001-FindCUDA-Use-find_program-if-find_host_program-is-no.patch \
            "
 
-SRC_URI[md5sum] = "b5dff61f6a7f1305271ab3f6ae261419"
-SRC_URI[sha256sum] = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d"
+SRC_URI[md5sum] = "cb0f19828461904c72ed6a1e55459d03"
+SRC_URI[sha256sum] = "8eaf75e1e932159aae98ab5e7491499545554be62a08cbcbc7c75c84b999f28a"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 
@@ -42,5 +42,9 @@ do_configure_prepend() {
 	sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt
 	sed -i 's/^  find_package(Qt5Widgets REQUIRED)/#  find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutoUicInterface/CMakeLists.txt
 	sed -i 's/^  find_package(Qt5Widgets REQUIRED)/#  find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutogen/CMakeLists.txt
-	sed -i 's/^  find_package(Qt5Core REQUIRED)/#  find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/autorcc_depends/CMakeLists.txt
+	sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake
+	sed -i 's/^  find_package(Qt5Core REQUIRED)/#  find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/mocRerun/CMakeLists.txt
+	sed -i 's/^  find_package(Qt5Core REQUIRED)/#  find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/rccDepends/CMakeLists.txt
+	sed -i 's/^  find_package(Qt5Core REQUIRED)/#  find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/mocDepends/CMakeLists.txt
+	sed -i 's/^find_package(Qt5Widgets REQUIRED)/#find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutogen/mocPlugin/CMakeLists.txt
 }
diff --git a/meta/recipes-devtools/cmake/cmake_3.8.2.bb b/meta/recipes-devtools/cmake/cmake_3.9.3.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.8.2.bb
rename to meta/recipes-devtools/cmake/cmake_3.9.3.bb
-- 
2.14.2

Re: [PATCH] cmake: Upgrade to 3.9.3 release

[Alexander Kanavin]

On 10/09/2017 05:12 PM, Otavio Salvador wrote:
>
> -LIC_FILES_CHKSUM = "file://Copyright.txt;md5=8d8c7bc32f8797d23f5cf605d9339d2d \
> +LIC_FILES_CHKSUM = "file://Copyright.txt;md5=24600643e5d1d2b8f7478ae5c9074949 \
>                       file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14"

What has changed in Copyright.txt? If it's just the copyright years, you 
can exclude the line using beginline/endline.


Alex

Re: [PATCH] cmake: Upgrade to 3.9.3 release

[Andre McCurdy]

On Mon, Oct 9, 2017 at 7:13 AM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> On 10/09/2017 05:12 PM, Otavio Salvador wrote:
>>
>> -LIC_FILES_CHKSUM =
>> "file://Copyright.txt;md5=8d8c7bc32f8797d23f5cf605d9339d2d \
>> +LIC_FILES_CHKSUM =
>> "file://Copyright.txt;md5=24600643e5d1d2b8f7478ae5c9074949 \
>>
>> file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14"
>
> What has changed in Copyright.txt? If it's just the copyright years, you can
> exclude the line using beginline/endline.

The copyright statement and copyright year(s) are part of the license.
Slicing and dicing the license text to get a consistent hash probably
isn't the right approach.

Re: [PATCH] cmake: Upgrade to 3.9.3 release

[Alexander Kanavin]

On 10/10/2017 04:01 AM, Andre McCurdy wrote:

>>> -LIC_FILES_CHKSUM =
>>> "file://Copyright.txt;md5=8d8c7bc32f8797d23f5cf605d9339d2d \
>>> +LIC_FILES_CHKSUM =
>>> "file://Copyright.txt;md5=24600643e5d1d2b8f7478ae5c9074949 \
>>>
>>> file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14"
>>
>> What has changed in Copyright.txt? If it's just the copyright years, you can
>> exclude the line using beginline/endline.
> 
> The copyright statement and copyright year(s) are part of the license.
> Slicing and dicing the license text to get a consistent hash probably
> isn't the right approach.

The purpose of LIC_FILES_CHECKSUM is to establish whether what the 
recipe claims in LICENSE matches what the upstream says in the source 
tree. For that purpose, when the code was published, who owns the code, 
or who made contributions to it are all not relevant and can be 
excluded. Also, such exclusions remove a major nuisance from recipe 
maintainers' job, and that is always a good thing.

As a technicality, the years of publication and code owners are not a 
part of the license, they a part of the copyright notice (which may also 
include the license text if it's short, or a reference to it if it's long):

https://en.wikipedia.org/wiki/Copyright_notice


Alex

Re: [PATCH] cmake: Upgrade to 3.9.3 release

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Alexander Kanavin
> Sent: den 10 oktober 2017 13:17
> To: Andre McCurdy <armccurdy@gmail.com>
> Cc: Otavio Salvador <otavio@ossystems.com.br>; OpenEmbedded Core
> Mailing List <openembedded-core@lists.openembedded.org>
> Subject: Re: [OE-core] [PATCH] cmake: Upgrade to 3.9.3 release
> 
> On 10/10/2017 04:01 AM, Andre McCurdy wrote:
> 
> >>> -LIC_FILES_CHKSUM = "file://Copyright.txt;md5=8d8c7bc32f8797d23f5cf605d9339d2d \
> >>> +LIC_FILES_CHKSUM = "file://Copyright.txt;md5=24600643e5d1d2b8f7478ae5c9074949 \
> >>>                      file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14"
> >>
> >> What has changed in Copyright.txt? If it's just the copyright 
> >> years, you can exclude the line using beginline/endline.
> >
> > The copyright statement and copyright year(s) are part of the
> > license. Slicing and dicing the license text to get a consistent 
> > hash probably isn't the right approach.
> 
> The purpose of LIC_FILES_CHECKSUM is to establish whether what the
> recipe claims in LICENSE matches what the upstream says in the source
> tree. For that purpose, when the code was published, who owns the code,
> or who made contributions to it are all not relevant and can be
> excluded. Also, such exclusions remove a major nuisance from recipe
> maintainers' job, and that is always a good thing.

That is not the entire story though. If you have COPY_LIC_MANIFEST and 
COPY_LIC_DIRS set in your configuration, the relevant licenses will be 
installed in the image, and for licenses specified with beginline and/or 
endline this only includes the specified lines.

Then, if the license requires that you include the copyright information, 
which is pretty common, e.g., BSD, leaving out that part just to avoid 
having to update the recipe once a year means that you are not really 
complying with the license... And neither will any users of the layer 
be who believe they are covered license wise by including the license 
information bitbake produces and installs in their images. 

True, you should always verify all licenses yourself for any code you 
use, but still being able to rely on all relevant parts of a license 
being copied by the build system sounds like something one should be 
able to expect.

> As a technicality, the years of publication and code owners are not a
> part of the license, they a part of the copyright notice (which may
> also include the license text if it's short, or a reference to it if 
> it's long):
> 
> https://en.wikipedia.org/wiki/Copyright_notice
> Alex

//Peter

Re: [PATCH] cmake: Upgrade to 3.9.3 release

[Alexander Kanavin]

On 10/10/2017 04:57 PM, Peter Kjellerstedt wrote:

> That is not the entire story though. If you have COPY_LIC_MANIFEST and
> COPY_LIC_DIRS set in your configuration, the relevant licenses will be
> installed in the image, and for licenses specified with beginline and/or
> endline this only includes the specified lines.

Thanks, I did not know that.

> Then, if the license requires that you include the copyright information,
> which is pretty common, e.g., BSD, leaving out that part just to avoid
> having to update the recipe once a year means that you are not really
> complying with the license... And neither will any users of the layer
> be who believe they are covered license wise by including the license
> information bitbake produces and installs in their images.

Once a year times the amount of recipes one maintains. Which, for me is 
111 oe-core recipes, plus 76 oe-core recipes that Jussi Kukkonen left 
behind. How many recipes do you guys keep up to date on a regular basis? :-)

We actually have an open bug to provide better tooling for manually 
comparing the licenses [1], but no progress has been made with that for 
a long time. Paul, how is it now?

[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=10801

Alex

Re: [PATCH] cmake: Upgrade to 3.9.3 release

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1871 bytes --]

> How many recipes do you guys keep up to date on a regular basis? :-)

If this is some kind of pissing contest, then over 700 just in our internal
layers (not counting any work on meta-oe, meta-qt5, meta-webos-ports or
meta-smartphone layers).

On Tue, Oct 10, 2017 at 4:29 PM, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:

> On 10/10/2017 04:57 PM, Peter Kjellerstedt wrote:
>
> That is not the entire story though. If you have COPY_LIC_MANIFEST and
>> COPY_LIC_DIRS set in your configuration, the relevant licenses will be
>> installed in the image, and for licenses specified with beginline and/or
>> endline this only includes the specified lines.
>>
>
> Thanks, I did not know that.
>
> Then, if the license requires that you include the copyright information,
>> which is pretty common, e.g., BSD, leaving out that part just to avoid
>> having to update the recipe once a year means that you are not really
>> complying with the license... And neither will any users of the layer
>> be who believe they are covered license wise by including the license
>> information bitbake produces and installs in their images.
>>
>
> Once a year times the amount of recipes one maintains. Which, for me is
> 111 oe-core recipes, plus 76 oe-core recipes that Jussi Kukkonen left
> behind. How many recipes do you guys keep up to date on a regular basis? :-)
>
> We actually have an open bug to provide better tooling for manually
> comparing the licenses [1], but no progress has been made with that for a
> long time. Paul, how is it now?
>
> [1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=10801
>
> Alex
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 2989 bytes --]