summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiaqing Zhao <jiaqing.zhao@linux.intel.com>2022-05-23 10:20:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-23 21:31:31 +0100
commit7961559aa93c946f3d97cb7f79311b559adad90e (patch)
tree954a5c1cacd4a8fef33281f02e38b8ee33958eac
parentc9303648f84ed515ef77df1bcaf4fee36f32eaee (diff)
downloadpoky-7961559aa93c946f3d97cb7f79311b559adad90e.tar.gz
systemd: Drop 0001-test-parse-argument-Include-signal.h.patch
This patch has already been upstreamed in commit systemd/850f0008bff7 ("test-parse-argument: Include signal.h") since v249 stable release. (From OE-Core rev: 25d8defc806ed760d371423a7ef99bd872462d1e) Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd/0001-test-parse-argument-Include-signal.h.patch27
-rw-r--r--meta/recipes-core/systemd/systemd_250.5.bb1
2 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-test-parse-argument-Include-signal.h.patch b/meta/recipes-core/systemd/systemd/0001-test-parse-argument-Include-signal.h.patch
deleted file mode 100644
index 898e8af904..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-test-parse-argument-Include-signal.h.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 93c7e482d39cf7765974b3c729d29c1b120a60e3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 24 May 2021 18:26:27 -0700
4Subject: [PATCH] test-parse-argument: Include signal.h
5
6Fixes
7src/test/test-parse-argument.c:49:29: error: use of undeclared identifier 'SIGABRT'
8
9Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/19718]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12---
13 src/test/test-parse-argument.c | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/src/test/test-parse-argument.c b/src/test/test-parse-argument.c
17index cf3d54288a..15104e5282 100644
18--- a/src/test/test-parse-argument.c
19+++ b/src/test/test-parse-argument.c
20@@ -5,6 +5,7 @@
21 #include "parse-argument.h"
22 #include "stdio-util.h"
23 #include "tests.h"
24+#include <signal.h>
25
26 TEST(parse_json_argument) {
27 JsonFormatFlags flags = JSON_FORMAT_PRETTY;
diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb
index c121fb763e..aca140d4d4 100644
--- a/meta/recipes-core/systemd/systemd_250.5.bb
+++ b/meta/recipes-core/systemd/systemd_250.5.bb
@@ -24,7 +24,6 @@ SRC_URI += "file://touchscreen.rules \
24 file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ 24 file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
25 file://0003-implment-systemd-sysv-install-for-OE.patch \ 25 file://0003-implment-systemd-sysv-install-for-OE.patch \
26 file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ 26 file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \
27 file://0001-test-parse-argument-Include-signal.h.patch \
28 file://0001-resolve-Use-sockaddr-pointer-type-for-bind.patch \ 27 file://0001-resolve-Use-sockaddr-pointer-type-for-bind.patch \
29 " 28 "
30 29