Merge branch 'update-kirkstone' into 'kirkstone'

Kirkstone update

See merge request !370

manifests/default.xml

@@ -26,20 +26,20 @@ SPDX-FileCopyrightText: Huawei Inc.
 	<remote name="openembedded" fetch="git://git.openembedded.org" />
 	<remote name="seco" fetch="https://git.seco.com" />
 
-	<project name="bitbake" remote="openembedded" revision="6603c3e39f1cf746669ec6c9f0be8c6e6ece426e" path="bitbake" />
-	<project name="openembedded-core" remote="openembedded" revision="4781fee6aea9512b7cb390b76e6f9f0a86a5bd11" path="oe-core" />
-	<project name="meta-openembedded" remote="openembedded" revision="744a4b6eda88b9a9ca1cf0df6e18be384d9054e3" path="meta-openembedded" />
+	<project name="bitbake" remote="openembedded" revision="72a3afd99e8b785cb2a2f687e71a58e08cdd9c74" path="bitbake" />
+	<project name="openembedded-core" remote="openembedded" revision="da2c64b3158c58eb0a484d3acbdf0419df2d34e8" path="oe-core" />
+	<project name="meta-openembedded" remote="openembedded" revision="50d4a8d2a983a68383ef1ffec2c8e21adf0c1a79" path="meta-openembedded" />
 	<project name="aehs29/meta-freertos" remote="github" revision="0d0f168b1bbcdfa8d88d97eefc206a18802a66eb" path="meta-freertos" />
-	<project name="meta-intel" remote="yocto" revision="01ad1a73aaab49d377d14bad8a7dec48f86cba83" path="meta-intel" />
+	<project name="meta-intel" remote="yocto" revision="f529e0594a784546926e89ce8e78385e00d0b0a9" path="meta-intel" />
 	<project name="pub/intel/yocto/meta-seco-intel" remote="seco" revision="65a673560211b11986db5785c70254fad190785f" path="meta-seco-intel" />
-	<project name="meta-freescale" remote="yocto" revision="3747641f1e71d8e4edd5b587b49d09dc2d243942" path="meta-freescale" />
+	<project name="meta-freescale" remote="yocto" revision="5d5d2822c3381b3a337b267ce1ec92c87e1b87a3" path="meta-freescale" />
 	<project name="pub/i.mx/yocto/5.x/meta-seco-imx" remote="seco" revision="f2cb750471dc263bc7c94ca6921cbaf25c37ccba" path="meta-seco-imx" />
 	<project name="meta-raspberrypi" remote="yocto" revision="dacad9302a92b0b7edf8546cdcad1f8ef753e462" path="meta-raspberrypi" />
 	<project name="meta-security" remote="yocto" revision="c79262a30bd385f5dbb009ef8704a1a01644528e" path="meta-security" />
-	<project name="rauc/meta-rauc" remote="github" revision="3796f982df039451f813ec979c431676965263f9" path="meta-rauc" />
+	<project name="rauc/meta-rauc" remote="github" revision="e2a60ded9c08118c17c23aa07cca21df77fb6628" path="meta-rauc" />
 	<project name="riscv/meta-riscv" remote="github" revision="70e099d7ceca52a1dde2c978713012f6b20a9891" path="meta-riscv" />
-	<project name="meta-arm" remote="yocto" revision="bafd1d013c2470bcec123ba4eb8232ab879b2660" path="meta-arm" />
-	<project name="jiazhang0/meta-secure-core" remote="github" revision="1a74be5b363ee61256093e0a3efaa78fd370a27c" path="meta-secure-core" />
+	<project name="meta-arm" remote="yocto" revision="67578fcfcd8ee8efcaef67ed7db1dfd55105872e" path="meta-arm" />
+	<project name="jiazhang0/meta-secure-core" remote="github" revision="fa438247c3e61d7f746687d85ef3b0dd66dc6b3f" path="meta-secure-core" />
 	<project name="pub/rockchip/meta-seco-rockchip" remote="seco" revision="4e7071800b79fe1ace7c7e0b0f15e581bc79cf8c" path="meta-seco-rockchip" />
 	<project name="meta-virtualization" remote="yocto" revision="9a487c1851aa2021cf24f951957e22fd429c8025" path="meta-virtualization" />
 

meta-oniro-core/recipes-support/rauc-hawkbit-updater/rauc-hawkbit-updater/0001-Do-not-include-glibc-specific-bits-types-struct_tm.h.patch

-From 869ef9023085ffcb0f01011de1e74d5379d56d7a Mon Sep 17 00:00:00 2001
-From: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
-Date: Mon, 21 Mar 2022 11:52:41 +0100
-Subject: [PATCH] Do not include glibc-specific bits/types/struct_tm.h
-
-This fails to compile against musl. The time.h include is sufficient.
-
-Upstream-Status: Accepted
-
-Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
----
- src/hawkbit-client.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/hawkbit-client.c b/src/hawkbit-client.c
-index f7a8886..1bd56e1 100644
---- a/src/hawkbit-client.c
-+++ b/src/hawkbit-client.c
-@@ -26,7 +26,6 @@
- #include <glib/gstdio.h>
- #include <json-glib/json-glib.h>
- #include <libgen.h>
--#include <bits/types/struct_tm.h>
- #include <gio/gio.h>
- #include <sys/reboot.h>
- 

meta-oniro-core/recipes-support/rauc-hawkbit-updater/rauc-hawkbit-updater/0001-hawkbit-client-do-not-pass-NULL-format-to-g_strdup_v.patch

-From 439feeeb0080b4fdc93cc41adfbebc2f85aa8317 Mon Sep 17 00:00:00 2001
-From: Bastian Krause <bst@pengutronix.de>
-Date: Tue, 16 Nov 2021 21:08:01 +0100
-Subject: [PATCH] hawkbit-client: do not pass NULL format to g_strdup_vprintf()
- in build_api_url()
-
-build_api_url() can be called with NULL to get the base deployment URL.
-Passing NULL as a format argument to g_strdup_vprintf() returns NULL if
-GLIB_USING_SYSTEM_PRINTF is defined, otherwise it leads to a segmentation
-fault. The format argument is explicitly documented as "not nullable",
-so we rely on undefined behavior here.
-
-Skip over va_start(), g_strdup_vprintf(), va_end() for path=NULL to fix
-that.
-
-Upstream-Status: Backport
-
-Signed-off-by: Bastian Krause <bst@pengutronix.de>
----
- src/hawkbit-client.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/hawkbit-client.c b/src/hawkbit-client.c
-index f7a8886..67fd7bc 100644
---- a/src/hawkbit-client.c
-+++ b/src/hawkbit-client.c
-@@ -702,9 +702,11 @@ static gchar* build_api_url(const gchar *path, ...)
-         g_autofree gchar *buffer = NULL;
-         va_list args;
- 
--        va_start(args, path);
--        buffer = g_strdup_vprintf(path, args);
--        va_end(args);
-+        if (path) {
-+                va_start(args, path);
-+                buffer = g_strdup_vprintf(path, args);
-+                va_end(args);
-+        }
- 
-         return g_strdup_printf(
-                 "%s://%s/%s/controller/v1/%s%s%s",
--- 
-2.25.1
-

meta-oniro-core/recipes-support/rauc-hawkbit-updater/rauc-hawkbit-updater_%.bbappend

@@ -4,10 +4,6 @@
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI += " \
-    file://0001-Do-not-include-glibc-specific-bits-types-struct_tm.h.patch \
-    file://0001-hawkbit-client-do-not-pass-NULL-format-to-g_strdup_v.patch"
-
 # Stash the default configuration file as an example. The configuration
 # directory must be an empty mount point for persistent state. This is
 # simplistic, in a real-world-scenario we would need to have a provisioning