mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-30 11:11:08 -09:00
127c420335
Remove patch which is now upstream
Rebase fix missing LOOP_SET_BLOCK_SIZE patch.
Update config options to match new expected format.
Add new nsresourced, mountfsd and vmspawn config options.
Add new systemd-journal-upload user for journald-remote.
Add new kernel config enable/disable options from systemd readme.
Add new optional dependencies and config options as appropriate.
LICENSES/README.md hash changed due to additional details added:
fb747bd8cd
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From 56ab1c54497d9fac74380ff9e11aaf931a917d2b Mon Sep 17 00:00:00 2001
|
||
From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= <raphael.melotte@mind.be>
|
||
Date: Fri, 14 Jun 2024 14:37:29 +0200
|
||
Subject: [PATCH] src/basic/missing_loop.h: fix missing LOOP_SET_BLOCK_SIZE
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Builds with kernels headers < 4.14 fail with:
|
||
|
||
../src/shared/loop-util.c: In function ‘loop_configure_fallback’:
|
||
../src/shared/loop-util.c:237:31: error: ‘LOOP_SET_BLOCK_SIZE’ undeclared (first use in this function); did you mean ‘LOOP_SET_DIRECT_IO’?
|
||
if (ioctl(fd, LOOP_SET_BLOCK_SIZE, (unsigned long) c->block_size) < 0)
|
||
^~~~~~~~~~~~~~~~~~~
|
||
LOOP_SET_DIRECT_IO
|
||
|
||
Fixes: https://github.com/systemd/systemd/issues/33341
|
||
Upstream: https://github.com/systemd/systemd/commit/56ab1c54497d9fac74380ff9e11aaf931a917d2b
|
||
Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
|
||
---
|
||
src/basic/missing_loop.h | 4 ++++
|
||
1 file changed, 4 insertions(+)
|
||
|
||
diff --git a/src/basic/missing_loop.h b/src/basic/missing_loop.h
|
||
index b88501d78b..f83a14c914 100644
|
||
--- a/src/basic/missing_loop.h
|
||
+++ b/src/basic/missing_loop.h
|
||
@@ -29,3 +29,7 @@ assert_cc(LOOP_SET_DIRECT_IO == 0x4C08);
|
||
#ifndef LOOP_SET_STATUS_SETTABLE_FLAGS
|
||
# define LOOP_SET_STATUS_SETTABLE_FLAGS (LO_FLAGS_AUTOCLEAR | LO_FLAGS_PARTSCAN)
|
||
#endif
|
||
+
|
||
+#ifndef LOOP_SET_BLOCK_SIZE
|
||
+# define LOOP_SET_BLOCK_SIZE 0x4C09
|
||
+#endif
|
||
--
|
||
2.34.1
|
||
|