systemd: Add missed sys/file.h includes for musl

(From OE-Core rev: 526e0ab4275a130b354090ac42a6147f5660e169)

Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Pavel Zhukov
2022-06-21 09:07:58 +02:00
committed by Richard Purdie
parent ffc3051d09
commit 081d1410a0
2 changed files with 79 additions and 0 deletions

View File

@@ -0,0 +1,78 @@
From c193380a08f5adea1fd514e0a20abd1d7b50d08c Mon Sep 17 00:00:00 2001
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]
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
---
src/core/namespace.c | 1 +
src/dissect/dissect.c | 1 +
src/shared/dissect-image.c | 2 ++
src/sysext/sysext.c | 1 +
src/test/test-loop-block.c | 1 +
5 files changed, 6 insertions(+)
diff --git a/src/core/namespace.c b/src/core/namespace.c
index 926aa96174..39f9e21c93 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -7,6 +7,7 @@
#include <sys/mount.h>
#include <unistd.h>
#include <linux/fs.h>
+#include <sys/file.h>
#include "alloc-util.h"
#include "base-filesystem.h"
diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index bd94a755db..a0d2a6f287 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -6,6 +6,7 @@
#include <stdio.h>
#include <sys/ioctl.h>
#include <sys/mount.h>
+#include <sys/file.h>
#include "architecture.h"
#include "chase-symlinks.h"
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 1ab88839aa..a9e3fe4b44 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -4,6 +4,8 @@
#include <valgrind/memcheck.h>
#endif
+#include <sys/file.h>
+
#include <linux/blkpg.h>
#include <linux/dm-ioctl.h>
#include <linux/loop.h>
diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 364af195e0..85686c0fab 100644
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -5,6 +5,7 @@
#include <linux/loop.h>
#include <sys/mount.h>
#include <unistd.h>
+#include <sys/file.h>
#include "capability-util.h"
#include "chase-symlinks.h"
diff --git a/src/test/test-loop-block.c b/src/test/test-loop-block.c
index d1793222f0..6886c4cd31 100644
--- a/src/test/test-loop-block.c
+++ b/src/test/test-loop-block.c
@@ -3,6 +3,7 @@
#include <fcntl.h>
#include <linux/loop.h>
#include <pthread.h>
+#include <sys/file.h>
#include "alloc-util.h"
#include "dissect-image.h"

View File

@@ -51,6 +51,7 @@ SRC_URI_MUSL = "\
file://0001-pass-correct-parameters-to-getdents64.patch \
file://0002-Add-sys-stat.h-for-S_IFDIR.patch \
file://0001-Adjust-for-musl-headers.patch \
file://0001-Add-sys-file.h-for-LOCK_.patch \
"
PAM_PLUGINS = " \