diff options
| author |   Ross Burton <ross.burton@arm.com> | 2021-11-15 15:01:42 +0000 |
|---|---|---|
| committer |   Naveen Saini <naveen.kumar.saini@intel.com> | 2021-11-16 20:08:34 +0800 |
| commit | fd8bf397792d58280928d23686313a8da810485a (patch) | |
| tree | 113dca9159d6cae2e85bd9c76aa4437d081e8da6 | |
| parent | 2e67c62084adb818f590b5f903e10a35c020ec7a (diff) | |
| download | meta-zephyr-fd8bf397792d58280928d23686313a8da810485a.tar.gz meta-zephyr-fd8bf397792d58280928d23686313a8da810485a.tar.bz2 meta-zephyr-fd8bf397792d58280928d23686313a8da810485a.zip | |
zephyr-kernel-src: fix build with latest dtc
dtc is now built with Meson, which changes the version string in the
--version output. Zephyr matches this in a regular expression which now
fails, so update it to match both Make and Meson formats.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
| -rw-r--r-- | recipes-kernel/zephyr-kernel/files/dtc.patch | 43 | ||||
| -rw-r--r-- | recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.0.inc | 1 |
2 files changed, 44 insertions, 0 deletions
diff --git a/recipes-kernel/zephyr-kernel/files/dtc.patch b/recipes-kernel/zephyr-kernel/files/dtc.patch new file mode 100644 index 0000000..f23a438 --- /dev/null +++ b/recipes-kernel/zephyr-kernel/files/dtc.patch @@ -0,0 +1,43 @@ +Upstream-Status: Submitted [https://github.com/zephyrproject-rtos/zephyr/pull/40364] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From deb6e9b29d77f0d86eb188fb3c5fc6f470277d3d Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Mon, 15 Nov 2021 14:01:47 +0000 +Subject: [PATCH] cmake: expand DTC version regex + +DTC can be built with both traditional Makefiles or Meson. When built +with Makefiles the --version output looks like 'Version: DTC +1.6.1-dirty' but when built with Meson the output is 'Version: DTC +v1.6.1+. + +This fails to match the version regex and the cmake then fails: + +CMake Error at cmake/host-tools.cmake:28 (if): + if given arguments: + "VERSION_GREATER" "1.4.6" + Unknown arguments specified + +Expanding the regex with an optional 'v' covers both cases and the build +succeeds. + +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + cmake/host-tools.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/host-tools.cmake b/cmake/host-tools.cmake +index cb7bf2e281..93d33d6390 100644 +--- a/cmake/host-tools.cmake ++++ b/cmake/host-tools.cmake +@@ -20,7 +20,7 @@ if(DTC) + ) + + if(${dtc_status} EQUAL 0) +- string(REGEX MATCH "Version: DTC ([0-9]+[.][0-9]+[.][0-9]+).*" out_var ${dtc_version_output}) ++ string(REGEX MATCH "Version: DTC v?([0-9]+[.][0-9]+[.][0-9]+).*" out_var ${dtc_version_output}) + + # Since it is optional, an outdated version is not an error. If an + # outdated version is discovered, print a warning and proceed as if +-- +2.25.1 diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.0.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.0.inc index a1619a7..db42418 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.0.inc +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.0.inc @@ -14,4 +14,5 @@ PV = "2.7.0+git${SRCPV}" SRC_URI:append = " file://0001-cmake-add-yocto-toolchain.patch \ file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \ + file://dtc.patch \ " |