[Buildroot] [PATCH] package/systemd: bump to 256.7

* [Buildroot] [PATCH] package/systemd: bump to 256.7
@ 2024-10-30 11:45 Marcus Hoffmann via buildroot
  2024-10-31 18:22 ` Thomas Petazzoni via buildroot
  2024-11-20 21:10 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Marcus Hoffmann via buildroot @ 2024-10-30 11:45 UTC (permalink / raw)
  To: buildroot; +Cc: Marcus Hoffmann, Sen Hastings, Yann E. MORIN, Norbert Lange

From: Marcus Hoffmann <marcus.hoffmann@othermo.de>

Remove patch that was applied upstream.

Signed-off-by: Marcus Hoffmann <buildroot@bubu1.eu>
---
 ...g_loop.h-fix-missing-LOOP_SET_BLOCK_.patch | 38 -------------------
 package/systemd/systemd.hash                  |  2 +-
 package/systemd/systemd.mk                    |  2 +-
 3 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch

diff --git a/package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch b/package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch
deleted file mode 100644
index 0ab5a4e98d..0000000000
--- a/package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
-
diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash
index 399ac61492..976d88c1f5 100644
--- a/package/systemd/systemd.hash
+++ b/package/systemd/systemd.hash
@@ -1,5 +1,5 @@
 # sha256 locally computed
-sha256  7861d544190f938cac1b242624d78c96fe2ebbc7b72f86166e88b50451c6fa58  systemd-256.4.tar.gz
+sha256  896d76ff65c88f5fd9e42f90d152b0579049158a163431dd77cdc57748b1d7b0  systemd-256.7.tar.gz
 sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  LICENSE.GPL2
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  LICENSE.LGPL2.1
 sha256  e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5  LICENSES/BSD-2-Clause.txt
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 5dca8681bc..87a8285b8a 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -19,7 +19,7 @@
 # - Diff sysusers.d with the previous version
 # - Diff factory/etc/nsswitch.conf with the previous version
 #   (details are often sprinkled around in README and manpages)
-SYSTEMD_VERSION = 256.4
+SYSTEMD_VERSION = 256.7
 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION))
 SYSTEMD_LICENSE = \
 	LGPL-2.1+, \
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread