[ptxdist] [PATCH v2 1/2] rauc: fix license and add license files checksums

[ptxdist] [PATCH v2 1/2] rauc: fix license and add license files checksums

[Roland Hieber]

Until recently, RAUC's license was only given implicitly in the
meson.build file. Backport the unreleased upstream patch making the
license explicit, so we can pin down that information with a checksum.

The license identifier was previously ported from "LGPL-2.1" to
"LGPL-2.1-only" in PTXdist commit 4850f7aac30aebf4ef64 (2018-02-12,
Michael Olbrich: "update all spdx license identifier to the new
version") without adding any license file checksum as source, which
turned out to be slightly incorrect. Fix the identifier based on the
newly added patch.

Link: https://github.com/rauc/rauc/pull/1211
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
v2: correctly rebase to master (thanks to Alexander Dahl)
v1: https://lore.ptxdist.org/ptxdist/20230810110256.2242386-1-rhi@pengutronix.de

 .../0001-README-clarify-license.patch         | 59 +++++++++++++++++++
 patches/rauc-1.10.1/series                    |  4 ++
 rules/rauc.make                               |  5 +-
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 patches/rauc-1.10.1/0001-README-clarify-license.patch
 create mode 100644 patches/rauc-1.10.1/series

diff --git a/patches/rauc-1.10.1/0001-README-clarify-license.patch b/patches/rauc-1.10.1/0001-README-clarify-license.patch
new file mode 100644
index 000000000000..3154228602bd
--- /dev/null
+++ b/patches/rauc-1.10.1/0001-README-clarify-license.patch
@@ -0,0 +1,59 @@
+From: Roland Hieber <rhi@pengutronix.de>
+Date: Tue, 8 Aug 2023 14:32:05 +0200
+Subject: [PATCH] README: clarify license
+
+Simply including the LGPL license text is not enough information to
+determine the license of a software project, as Section 13 of the LGPL
+allows licensees to choose the terms of "any later version of the
+license" if specified so by the copyright holders.
+
+The information in meson.build implies "LGPL-2.1-or-later" as project
+license. As a minimal measure to make this information explicit, add the
+usual license notice and warranty disclaimer as recommended in the GNU
+GPL How-To to the README file, and also add a minimal copyright notice
+as required by Section 1 of the LGPL.
+
+Let the LGPL badge at the start of the README point to the relevant
+section further down.
+
+Link: https://www.gnu.org/licenses/gpl-howto.html#why-license-notices
+Link: https://www.gnu.org/licenses/identify-licenses-clearly.html
+Signed-off-by: Roland Hieber <rhi@pengutronix.de>
+Upstream-Status: Backport https://github.com/rauc/rauc/commit/b20002582f6c7
+---
+ README.rst | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/README.rst b/README.rst
+index aa01720effeb..18f9f44413e0 100644
+--- a/README.rst
++++ b/README.rst
+@@ -280,8 +280,27 @@ Please read the Documentation's
+ `Contributing <http://rauc.readthedocs.io/en/latest/contributing.html>`_
+ section for more details.
+ 
++License
++-------
++
++Copyright (C) 2015–2023 RAUC project
++
++RAUC is free software; you can redistribute it and/or modify it under the terms
++of the GNU Lesser General Public License as published by the Free Software
++Foundation; either version 2.1 of the License, or (at your option) any later
++version.
++
++This library is distributed in the hope that it will be useful, but WITHOUT ANY
++WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
++
++You should have received a copy of the GNU Lesser General Public License along
++with this source code, see the file named `COPYING`_. If not, see
++https://www.gnu.org/licenses/.
++
+ .. |LGPLv2.1| image:: https://img.shields.io/badge/license-LGPLv2.1-blue.svg
+-   :target: https://raw.githubusercontent.com/rauc/rauc/master/COPYING
++   :target: #license
++.. _COPYING: https://raw.githubusercontent.com/rauc/rauc/master/COPYING
+ .. |CI_branch| image:: https://github.com/rauc/rauc/workflows/tests/badge.svg
+    :target: https://github.com/rauc/rauc/actions?query=workflow%3Atests
+ .. |Codecov_branch| image:: https://codecov.io/gh/rauc/rauc/branch/master/graph/badge.svg
diff --git a/patches/rauc-1.10.1/series b/patches/rauc-1.10.1/series
new file mode 100644
index 000000000000..cd19ad51f19b
--- /dev/null
+++ b/patches/rauc-1.10.1/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-README-clarify-license.patch
+# db9f69fcb4d731f1af20ab33abdd2fca  - git-ptx-patches magic
diff --git a/rules/rauc.make b/rules/rauc.make
index 0f71f12edef0..2f2351b90ac8 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -21,7 +21,10 @@ RAUC_SUFFIX	:= tar.xz
 RAUC_URL	:= https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
 RAUC_SOURCE	:= $(SRCDIR)/$(RAUC)-meson.$(RAUC_SUFFIX)
 RAUC_DIR	:= $(BUILDDIR)/$(RAUC)
-RAUC_LICENSE	:= LGPL-2.1-only
+RAUC_LICENSE	:= LGPL-2.1-or-later
+RAUC_LICENSE_FILES := \
+	file://README.rst;startline=286;endline=299;md5=d98e15259a1a004b59d4701b3d49cf44 \
+	file://COPYING;md5=4fbd65380cdd255951079008b364516c
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.39.2

[ptxdist] [PATCH v2 2/2] rauc: select HOST_MESON

[Roland Hieber]

RAUC has been using meson since commit 6e72460fe79714249b81 (2023-06-30,
Enrico Jorns: "rauc: migrate to meson"), but now PTXdist warns about the
missing HOST_MESON dependency in the prepare stage.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
v2: no change in this version
v1: https://lore.ptxdist.org/ptxdist/20230810110256.2242386-2-rhi@pengutronix.de

 rules/rauc.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/rauc.in b/rules/rauc.in
index e67f5131c615..94a7859d89f5 100644
--- a/rules/rauc.in
+++ b/rules/rauc.in
@@ -8,6 +8,7 @@ menuconfig RAUC
 	select GLIB
 	select GLIB_LIBMOUNT
 	select HOST_GLIB
+	select HOST_MESON
 	select CODE_SIGNING
 	select BUSYBOX_FEATURE_TAR_LONG_OPTIONS	if BUSYBOX_TAR
 	select BUSYBOX_FEATURE_TAR_AUTODETECT	if BUSYBOX_TAR
-- 
2.39.2

Re: [ptxdist] [PATCH v2 2/2] rauc: select HOST_MESON

[Roland Hieber]

On Sun, Aug 13, 2023 at 09:48:44PM +0200, Roland Hieber wrote:
> RAUC has been using meson since commit 6e72460fe79714249b81 (2023-06-30,
> Enrico Jorns: "rauc: migrate to meson"), but now PTXdist warns about the
> missing HOST_MESON dependency in the prepare stage.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> v2: no change in this version
> v1: https://lore.ptxdist.org/ptxdist/20230810110256.2242386-2-rhi@pengutronix.de

… yes, the rebased patch still applies, but now there are two HOST_MESON
selects in this file. Nothing to do here, please disregard. First patch
still applies.

 - Roland

> 
>  rules/rauc.in | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/rules/rauc.in b/rules/rauc.in
> index e67f5131c615..94a7859d89f5 100644
> --- a/rules/rauc.in
> +++ b/rules/rauc.in
> @@ -8,6 +8,7 @@ menuconfig RAUC
>  	select GLIB
>  	select GLIB_LIBMOUNT
>  	select HOST_GLIB
> +	select HOST_MESON
>  	select CODE_SIGNING
>  	select BUSYBOX_FEATURE_TAR_LONG_OPTIONS	if BUSYBOX_TAR
>  	select BUSYBOX_FEATURE_TAR_AUTODETECT	if BUSYBOX_TAR
> -- 
> 2.39.2
> 
> 
> 

-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |