summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-07-24 06:43:57 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-07-25 22:59:00 +0100
commitc5bc2d2fe66ff825b523ddd5fcb159114c201964 (patch)
treeabdfc3b6974f214fd21e12eb3da8ed9a5b163475 /meta/recipes-core/systemd
parente49831d1f8e4339181658f3897be56d8b4368c72 (diff)
downloadpoky-c5bc2d2fe66ff825b523ddd5fcb159114c201964.tar.gz
systemd: Drop backported patch applied in 251.3
This was added to musl specific backport patchset so it escaped testing (From OE-Core rev: dd5f7e87b5bbde02eb50c7da6a6d3f928e0fd2f2) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd/0001-Add-sys-file.h-for-LOCK_.patch78
-rw-r--r--meta/recipes-core/systemd/systemd_251.3.bb1
2 files changed, 0 insertions, 79 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
deleted file mode 100644
index 08e8af0a5b..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-Add-sys-file.h-for-LOCK_.patch
+++ /dev/null
@@ -1,78 +0,0 @@
1From c193380a08f5adea1fd514e0a20abd1d7b50d08c Mon Sep 17 00:00:00 2001
2From: Pavel Zhukov <pavel.zhukov@huawei.com>
3Date: Mon, 20 Jun 2022 11:24:52 +0200
4Subject: [PATCH] Add sys/file.h for LOCK_
5
6Upstream-Status: Backport [19df770fe14da601d4e54e1592c11c10ffe4df5a]
7
8Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
9
10---
11 src/core/namespace.c | 1 +
12 src/dissect/dissect.c | 1 +
13 src/shared/dissect-image.c | 2 ++
14 src/sysext/sysext.c | 1 +
15 src/test/test-loop-block.c | 1 +
16 5 files changed, 6 insertions(+)
17
18diff --git a/src/core/namespace.c b/src/core/namespace.c
19index 926aa96174..39f9e21c93 100644
20--- a/src/core/namespace.c
21+++ b/src/core/namespace.c
22@@ -7,6 +7,7 @@
23 #include <sys/mount.h>
24 #include <unistd.h>
25 #include <linux/fs.h>
26+#include <sys/file.h>
27
28 #include "alloc-util.h"
29 #include "base-filesystem.h"
30diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
31index bd94a755db..a0d2a6f287 100644
32--- a/src/dissect/dissect.c
33+++ b/src/dissect/dissect.c
34@@ -6,6 +6,7 @@
35 #include <stdio.h>
36 #include <sys/ioctl.h>
37 #include <sys/mount.h>
38+#include <sys/file.h>
39
40 #include "architecture.h"
41 #include "chase-symlinks.h"
42diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
43index 1ab88839aa..a9e3fe4b44 100644
44--- a/src/shared/dissect-image.c
45+++ b/src/shared/dissect-image.c
46@@ -4,6 +4,8 @@
47 #include <valgrind/memcheck.h>
48 #endif
49
50+#include <sys/file.h>
51+
52 #include <linux/blkpg.h>
53 #include <linux/dm-ioctl.h>
54 #include <linux/loop.h>
55diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
56index 364af195e0..85686c0fab 100644
57--- a/src/sysext/sysext.c
58+++ b/src/sysext/sysext.c
59@@ -5,6 +5,7 @@
60 #include <linux/loop.h>
61 #include <sys/mount.h>
62 #include <unistd.h>
63+#include <sys/file.h>
64
65 #include "capability-util.h"
66 #include "chase-symlinks.h"
67diff --git a/src/test/test-loop-block.c b/src/test/test-loop-block.c
68index d1793222f0..6886c4cd31 100644
69--- a/src/test/test-loop-block.c
70+++ b/src/test/test-loop-block.c
71@@ -3,6 +3,7 @@
72 #include <fcntl.h>
73 #include <linux/loop.h>
74 #include <pthread.h>
75+#include <sys/file.h>
76
77 #include "alloc-util.h"
78 #include "dissect-image.h"
diff --git a/meta/recipes-core/systemd/systemd_251.3.bb b/meta/recipes-core/systemd/systemd_251.3.bb
index 326c7ba967..8497e24af9 100644
--- a/meta/recipes-core/systemd/systemd_251.3.bb
+++ b/meta/recipes-core/systemd/systemd_251.3.bb
@@ -49,7 +49,6 @@ SRC_URI_MUSL = "\
49 file://0001-pass-correct-parameters-to-getdents64.patch \ 49 file://0001-pass-correct-parameters-to-getdents64.patch \
50 file://0002-Add-sys-stat.h-for-S_IFDIR.patch \ 50 file://0002-Add-sys-stat.h-for-S_IFDIR.patch \
51 file://0001-Adjust-for-musl-headers.patch \ 51 file://0001-Adjust-for-musl-headers.patch \
52 file://0001-Add-sys-file.h-for-LOCK_.patch \
53 " 52 "
54 53
55PAM_PLUGINS = " \ 54PAM_PLUGINS = " \