summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Zhukov <pavel@zhukoff.net>2022-06-22 12:26:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-06-25 00:00:24 +0100
commit6370bce5b0e14c9384b61c215eb6a56ed65a3feb (patch)
tree9602d3bc54b898cc679ada25e25b8ce7e72edd6a
parent78b6a08db4e8eb3b4e1d52fcdb39a5b3415f5a3f (diff)
downloadopenembedded-core-6370bce5b0e14c9384b61c215eb6a56ed65a3feb.tar.gz
systemd: update upstream status of merged patches
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
-rw-r--r--meta/recipes-core/systemd/systemd/0001-Add-sys-file.h-for-LOCK_.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-Add-sys-file.h-for-LOCK_.patch b/meta/recipes-core/systemd/systemd/0001-Add-sys-file.h-for-LOCK_.patch
index a3e148ec3b..08e8af0a5b 100644
--- a/meta/recipes-core/systemd/systemd/0001-Add-sys-file.h-for-LOCK_.patch
+++ b/meta/recipes-core/systemd/systemd/0001-Add-sys-file.h-for-LOCK_.patch
@@ -3,7 +3,7 @@ From: Pavel Zhukov <pavel.zhukov@huawei.com>
Date: Mon, 20 Jun 2022 11:24:52 +0200
Subject: [PATCH] Add sys/file.h for LOCK_
-Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/23790]
+Upstream-Status: Backport [19df770fe14da601d4e54e1592c11c10ffe4df5a]
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
diff --git a/meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch b/meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch
index 4db5d6d97f..58767c7c35 100644
--- a/meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch
+++ b/meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add sys/stat.h for S_IFDIR
../git/src/shared/mkdir-label.c:13:61: error: use of undeclared identifier 'S_IFDIR'
r = mac_selinux_create_file_prepare_at(dirfd, path, S_IFDIR);
-Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/23441]
+Upstream-Status: Backport [29b7114c5d9624002aa7c17748d960cd1e45362d]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---