diff options
Diffstat (limited to 'meta/recipes-kernel/dtc')
| -rw-r--r-- | meta/recipes-kernel/dtc/dtc/0001-fdtdump-fix-Werror-int-to-pointer-cast.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-kernel/dtc/dtc_1.7.0.bb (renamed from meta/recipes-kernel/dtc/dtc_1.6.1.bb) | 16 | ||||
| -rw-r--r-- | meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb | 11 |
5 files changed, 84 insertions, 50 deletions
diff --git a/meta/recipes-kernel/dtc/dtc/0001-fdtdump-fix-Werror-int-to-pointer-cast.patch b/meta/recipes-kernel/dtc/dtc/0001-fdtdump-fix-Werror-int-to-pointer-cast.patch deleted file mode 100644 index 4c3e34b1ff..0000000000 --- a/meta/recipes-kernel/dtc/dtc/0001-fdtdump-fix-Werror-int-to-pointer-cast.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix the build of fdtdump with mingw. - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From ae0ce1fa7f4d679b5f8df1fc0e797246e43547fe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com> -Date: Wed, 25 Aug 2021 16:13:50 +0400 -Subject: [PATCH] fdtdump: fix -Werror=int-to-pointer-cast -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With mingw64-gcc, the compiler complains with various warnings: -error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] - -Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> -Message-Id: <20210825121350.213551-1-marcandre.lureau@redhat.com> -Acked-by: Rob Herring <robh@kernel.org> -Signed-off-by: David Gibson <david@gibson.dropbear.id.au> ---- - fdtdump.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fdtdump.c b/fdtdump.c -index d9fb374..483f367 100644 ---- a/fdtdump.c -+++ b/fdtdump.c -@@ -21,7 +21,7 @@ - #define MAX_VERSION 17 - - #define ALIGN(x, a) (((x) + ((a) - 1)) & ~((a) - 1)) --#define PALIGN(p, a) ((void *)(ALIGN((unsigned long)(p), (a)))) -+#define PALIGN(p, a) ((void *)(ALIGN((uintptr_t)(p), (a)))) - #define GET_CELL(p) (p += 4, *((const fdt32_t *)(p-4))) - - static const char *tagname(uint32_t tag) --- -2.25.1 - diff --git a/meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch b/meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch new file mode 100644 index 0000000000..79a3b92b44 --- /dev/null +++ b/meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch @@ -0,0 +1,29 @@ +From 9153522103bd4ed7e3299c4d073f66bb37cb2d42 Mon Sep 17 00:00:00 2001 +From: Nikolay Letov <letov.nikolay@gmail.com> +Date: Wed, 22 Feb 2023 13:36:07 +0300 +Subject: [PATCH 1/2] meson.build: bump version to 1.7.0 + +[This was botched in the actual 1.7.0 release :( - David Gibson] + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=64a907f08b9bedd89833c1eee674148cff2343c6] + +Signed-off-by: Nikolay Letov <letov.nikolay@gmail.com> +Signed-off-by: Peter Marko <peter.marko@siemens.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 78251eb..d88cd9f 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,5 +1,5 @@ + project('dtc', 'c', +- version: '1.6.0', ++ version: '1.7.0', + license: ['GPL2+', 'BSD-2'], + default_options: 'werror=true', + ) +-- +2.30.2 + diff --git a/meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch b/meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch new file mode 100644 index 0000000000..0284905913 --- /dev/null +++ b/meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch @@ -0,0 +1,38 @@ +From 4415b0baece3c4351a6d3637c2754abbefd4795d Mon Sep 17 00:00:00 2001 +From: Peter Marko <peter.marko@siemens.com> +Date: Sat, 16 Dec 2023 18:58:31 +0100 +Subject: [PATCH 2/2] meson: allow building from shallow clones + +When building from shallow clone, tag is not available +and version defaults to git hash. +Problem is that some builds check DTC version and fail the comparison. +Example is https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git +Which fails to build with following error: +dtc version too old (039a994), you need at least version 1.4.4 + +Drop --always from git describe command, see +https://github.com/mesonbuild/meson/blob/1.3.0/mesonbuild/utils/universal.py#L773 +This will make it more closer to build via Makefile. + +Upstream-Status: Submitted [https://github.com/dgibson/dtc/pull/122] + +Signed-off-by: Peter Marko <peter.marko@siemens.com> +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index 78251eb..fc0c92a 100644 +--- a/meson.build ++++ b/meson.build +@@ -56,6 +56,7 @@ py = py.find_installation(required: get_option('python')) + swig = find_program('swig', required: get_option('python')) + + version_gen_h = vcs_tag( ++ command: ['git', 'describe', '--dirty=+'], + input: 'version_gen.h.in', + output: 'version_gen.h', + ) +-- +2.30.2 + diff --git a/meta/recipes-kernel/dtc/dtc_1.6.1.bb b/meta/recipes-kernel/dtc/dtc_1.7.0.bb index 2a6ac089a3..0702fc16df 100644 --- a/meta/recipes-kernel/dtc/dtc_1.6.1.bb +++ b/meta/recipes-kernel/dtc/dtc_1.7.0.bb @@ -1,15 +1,19 @@ SUMMARY = "Device Tree Compiler" HOMEPAGE = "https://devicetree.org/" -DESCRIPTION = "The Device Tree Compiler is a tool used to manipulate the Open-Firmware-like device tree used by PowerPC kernels." +DESCRIPTION = "The Device Tree Compiler is a toolchain for working with device tree source and binary files." SECTION = "bootloader" LICENSE = "GPL-2.0-only | BSD-2-Clause" LIC_FILES_CHKSUM = "file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://libfdt/libfdt.h;beginline=4;endline=7;md5=05bb357cfb75cae7d2b01d2ee8d76407" - -SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \ - file://0001-fdtdump-fix-Werror-int-to-pointer-cast.patch" -SRCREV = "b6910bec11614980a21e46fbccc35934b671bd81" + file://BSD-2-Clause;md5=5d6306d1b08f8df623178dfd81880927 \ + file://README.license;md5=a1eb22e37f09df5b5511b8a278992d0e" + +SRC_URI = " \ + git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=main;protocol=https \ + file://0001-meson.build-bump-version-to-1.7.0.patch \ + file://0002-meson-allow-building-from-shallow-clones.patch \ +" +SRCREV = "039a99414e778332d8f9c04cbd3072e1dcc62798" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" diff --git a/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb b/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb index c869274d09..a766b00bef 100644 --- a/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb +++ b/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Wrapper for tooling for devicetree validation using YAML and jsonschema" +SUMMARY = "Wrapper for tooling for devicetree validation using YAML and jsonschema" HOMEPAGE = "https://yoctoproject.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" @@ -7,11 +7,14 @@ SRC_URI = "file://dt-doc-validate \ file://dt-mk-schema \ file://dt-validate" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { install -d ${D}${bindir}/ - install -m 755 ${WORKDIR}/dt-doc-validate ${D}${bindir}/ - install -m 755 ${WORKDIR}/dt-mk-schema ${D}${bindir}/ - install -m 755 ${WORKDIR}/dt-validate ${D}${bindir}/ + install -m 755 ${UNPACKDIR}/dt-doc-validate ${D}${bindir}/ + install -m 755 ${UNPACKDIR}/dt-mk-schema ${D}${bindir}/ + install -m 755 ${UNPACKDIR}/dt-validate ${D}${bindir}/ } BBCLASSEXTEND = "native nativesdk" |