* [ptxdist] [PATCH] dt-utils: version bump 2021.03.0 -> 2023.08.0
@ 2023-08-03 11:56 Roland Hieber
2023-08-07 6:50 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Roland Hieber @ 2023-08-03 11:56 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Change to the meson build system, and update license information
(COPYING is now LICENSES/GPL-2.0-only.txt, and the implicit information
from src/barebox-state.c is also given explicitely in the README).
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/dt-utils.in | 1 +
rules/dt-utils.make | 28 +++++++++++++++++++---------
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/rules/dt-utils.in b/rules/dt-utils.in
index 2ac7383f2ab8..e342cbe92be1 100644
--- a/rules/dt-utils.in
+++ b/rules/dt-utils.in
@@ -3,6 +3,7 @@
menuconfig DT_UTILS
tristate
prompt "dt-utils "
+ select HOST_MESON
select UDEV
help
Utilities to work with device trees in Linux userspace:
diff --git a/rules/dt-utils.make b/rules/dt-utils.make
index 0c2fe87cddb7..78c251b4f5a3 100644
--- a/rules/dt-utils.make
+++ b/rules/dt-utils.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2013 by Sascha Hauer <s.hauer@pengutronix.de>
+# Copyright (C) 2023 Roland Hieber, Pengutronix <rhi@pengutronix.de>
#
# For further information about the PTXdist project and license conditions
# see the README file.
@@ -14,27 +15,36 @@ PACKAGES-$(PTXCONF_DT_UTILS) += dt-utils
#
# Paths and names
#
-DT_UTILS_VERSION := 2021.03.0
-DT_UTILS_MD5 := acf0b5e3b18e40e6172b67fbad2e52fb
+DT_UTILS_VERSION := 2023.08.0
+DT_UTILS_MD5 := ba7ed63c6e9bfc9c39e090c3bc1fb8c2
DT_UTILS := dt-utils-$(DT_UTILS_VERSION)
DT_UTILS_SUFFIX := tar.xz
DT_UTILS_URL := https://public.pengutronix.de/software/dt-utils/$(DT_UTILS).$(DT_UTILS_SUFFIX)
DT_UTILS_SOURCE := $(SRCDIR)/$(DT_UTILS).$(DT_UTILS_SUFFIX)
DT_UTILS_DIR := $(BUILDDIR)/$(DT_UTILS)
-DT_UTILS_LICENSE := GPL-2.0-only
+
+# Note: the source tarball includes files under GPL-3.0-or-later, CC0-1.0 and
+# LicenseRef-DCO too, which don't make it into the compiled code.
+DT_UTILS_LICENSE := GPL-2.0-only AND GPL-2.0-or-later AND Zlib
DT_UTILS_LICENSE_FILES := \
- file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \
- file://src/barebox-state.c;startline=6;endline=13;md5=d2a3fab9d93cf1e5a939e59f75cfc921
+ file://README;startline=65;endline=81;md5=ac976dc9413ba8aee0286c950eca0374 \
+ file://LICENSES/GPL-2.0-only.txt;md5=18d902a0242c37a4604224b47d02f802 \
+ file://src/barebox-state/state_variables.c;startline=1;endline=5;md5=48db6eca86398f8f9806370f78598bf4 \
+ file://LICENSES/GPL-2.0-or-later.txt;md5=df0715377b556699ce0837d45cb8bec9 \
+ file://src/crc32.c;startline=1;endline=9;md5=ea2a8d555d3a705de4bdff531a08e257 \
+ file://LICENSES/Zlib.txt;md5=48d37249fc5889f9a914aabb29781276
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
-DT_UTILS_CONF_TOOL := autoconf
+DT_UTILS_CONF_TOOL := meson
DT_UTILS_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- $(GLOBAL_LARGE_FILE_OPTION) \
- --$(call ptx/endis, PTXCONF_DT_UTILS_STATE_COMPAT)-state-backward-compatibility
+ $(CROSS_MESON_USR) \
+ -Dbarebox-state=true \
+ -Dlock-device=true \
+ -Dstate-backward-compatibility=$(call ptx/truefalse, PTXCONF_DT_UTILS_STATE_COMPAT) \
+ -Dtests=false
# ----------------------------------------------------------------------------
# Target-Install
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] dt-utils: version bump 2021.03.0 -> 2023.08.0
2023-08-03 11:56 [ptxdist] [PATCH] dt-utils: version bump 2021.03.0 -> 2023.08.0 Roland Hieber
@ 2023-08-07 6:50 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2023-08-07 6:50 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as aacca6c693d64b8e6047ad815029258f16d6144a.
Michael
[sent from post-receive hook]
On Mon, 07 Aug 2023 08:50:36 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Change to the meson build system, and update license information
> (COPYING is now LICENSES/GPL-2.0-only.txt, and the implicit information
> from src/barebox-state.c is also given explicitely in the README).
>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230803115625.1765751-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/dt-utils.in b/rules/dt-utils.in
> index 2ac7383f2ab8..e342cbe92be1 100644
> --- a/rules/dt-utils.in
> +++ b/rules/dt-utils.in
> @@ -3,6 +3,7 @@
> menuconfig DT_UTILS
> tristate
> prompt "dt-utils "
> + select HOST_MESON
> select UDEV
> help
> Utilities to work with device trees in Linux userspace:
> diff --git a/rules/dt-utils.make b/rules/dt-utils.make
> index 0c2fe87cddb7..78c251b4f5a3 100644
> --- a/rules/dt-utils.make
> +++ b/rules/dt-utils.make
> @@ -1,6 +1,7 @@
> # -*-makefile-*-
> #
> # Copyright (C) 2013 by Sascha Hauer <s.hauer@pengutronix.de>
> +# Copyright (C) 2023 Roland Hieber, Pengutronix <rhi@pengutronix.de>
> #
> # For further information about the PTXdist project and license conditions
> # see the README file.
> @@ -14,27 +15,36 @@ PACKAGES-$(PTXCONF_DT_UTILS) += dt-utils
> #
> # Paths and names
> #
> -DT_UTILS_VERSION := 2021.03.0
> -DT_UTILS_MD5 := acf0b5e3b18e40e6172b67fbad2e52fb
> +DT_UTILS_VERSION := 2023.08.0
> +DT_UTILS_MD5 := ba7ed63c6e9bfc9c39e090c3bc1fb8c2
> DT_UTILS := dt-utils-$(DT_UTILS_VERSION)
> DT_UTILS_SUFFIX := tar.xz
> DT_UTILS_URL := https://public.pengutronix.de/software/dt-utils/$(DT_UTILS).$(DT_UTILS_SUFFIX)
> DT_UTILS_SOURCE := $(SRCDIR)/$(DT_UTILS).$(DT_UTILS_SUFFIX)
> DT_UTILS_DIR := $(BUILDDIR)/$(DT_UTILS)
> -DT_UTILS_LICENSE := GPL-2.0-only
> +
> +# Note: the source tarball includes files under GPL-3.0-or-later, CC0-1.0 and
> +# LicenseRef-DCO too, which don't make it into the compiled code.
> +DT_UTILS_LICENSE := GPL-2.0-only AND GPL-2.0-or-later AND Zlib
> DT_UTILS_LICENSE_FILES := \
> - file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \
> - file://src/barebox-state.c;startline=6;endline=13;md5=d2a3fab9d93cf1e5a939e59f75cfc921
> + file://README;startline=65;endline=81;md5=ac976dc9413ba8aee0286c950eca0374 \
> + file://LICENSES/GPL-2.0-only.txt;md5=18d902a0242c37a4604224b47d02f802 \
> + file://src/barebox-state/state_variables.c;startline=1;endline=5;md5=48db6eca86398f8f9806370f78598bf4 \
> + file://LICENSES/GPL-2.0-or-later.txt;md5=df0715377b556699ce0837d45cb8bec9 \
> + file://src/crc32.c;startline=1;endline=9;md5=ea2a8d555d3a705de4bdff531a08e257 \
> + file://LICENSES/Zlib.txt;md5=48d37249fc5889f9a914aabb29781276
>
> # ----------------------------------------------------------------------------
> # Prepare
> # ----------------------------------------------------------------------------
>
> -DT_UTILS_CONF_TOOL := autoconf
> +DT_UTILS_CONF_TOOL := meson
> DT_UTILS_CONF_OPT := \
> - $(CROSS_AUTOCONF_USR) \
> - $(GLOBAL_LARGE_FILE_OPTION) \
> - --$(call ptx/endis, PTXCONF_DT_UTILS_STATE_COMPAT)-state-backward-compatibility
> + $(CROSS_MESON_USR) \
> + -Dbarebox-state=true \
> + -Dlock-device=true \
> + -Dstate-backward-compatibility=$(call ptx/truefalse, PTXCONF_DT_UTILS_STATE_COMPAT) \
> + -Dtests=false
>
> # ----------------------------------------------------------------------------
> # Target-Install
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-08-07 6:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-03 11:56 [ptxdist] [PATCH] dt-utils: version bump 2021.03.0 -> 2023.08.0 Roland Hieber
2023-08-07 6:50 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox