systemd/systemd: upgrade to 261-rc4
Signed-off-by: Clayton Craft <craftyguy@postmarketos.org> Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8832>
This commit is contained in:
parent
aafecd66e7
commit
eb81a92aae
3 changed files with 6 additions and 54 deletions
|
|
@ -3,10 +3,10 @@
|
|||
# Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
|
||||
maintainer="Clayton Craft <craftyguy@postmarketos.org>"
|
||||
pkgname=systemd-stage0
|
||||
pkgver=261_rc3
|
||||
pkgver=261_rc4
|
||||
_pkgver="${pkgver/_/-}"
|
||||
# pkgrel must match systemd!
|
||||
pkgrel=3
|
||||
pkgrel=0
|
||||
pkgdesc="Minimal systemd bootstrap package"
|
||||
url="https://github.com/systemd/systemd"
|
||||
# armhf: pmb#2618
|
||||
|
|
@ -132,5 +132,5 @@ package() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
facbcb7831fb84a38eaee5804d9aa03382486006cdb559010d6d353ad9a3986b516522cde1f0e0808fb49365859f790dd1caed24875a1c9e339e892d09d2cf30 systemd-261_rc3.tar.gz
|
||||
b50c3391722bc28e5945666b4271d86926d1bdce4353c0a566a7765e1f0784ee00e6a5096f658c64917a7aeffd135acad15d7189c8e3041dce11e10d2c49d7cb systemd-261_rc4.tar.gz
|
||||
"
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
From ca0c28b968d5b5c410784c60df37beaefaa72e96 Mon Sep 17 00:00:00 2001
|
||||
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||||
Date: Mon, 15 Jun 2026 13:03:00 +0900
|
||||
Subject: [PATCH] musl: fix build on 32-bit architecture
|
||||
|
||||
```
|
||||
../src/boot/test-efi-string.c: In function 'test_xvasprintf_status':
|
||||
../src/boot/test-efi-string.c:744:34: error: format '%zi' expects argument of type 'signed size_t', but argument 4 has type 'long int' [-Werror=format=]
|
||||
744 | test_printf_one("%i %i %zi", INT_MIN, INT_MAX, SSIZE_MAX);
|
||||
| ~~^
|
||||
| |
|
||||
| int
|
||||
| %li
|
||||
cc1: some warnings being treated as errors
|
||||
ninja: subcommand failed
|
||||
```
|
||||
---
|
||||
src/include/musl/limits.h | 16 ++++++++++++++++
|
||||
1 file changed, 16 insertions(+)
|
||||
create mode 100644 src/include/musl/limits.h
|
||||
|
||||
diff --git a/src/include/musl/limits.h b/src/include/musl/limits.h
|
||||
new file mode 100644
|
||||
index 0000000000..c00934c3d3
|
||||
--- /dev/null
|
||||
+++ b/src/include/musl/limits.h
|
||||
@@ -0,0 +1,16 @@
|
||||
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
+#pragma once
|
||||
+
|
||||
+#define __NEED_ssize_t
|
||||
+#include_next <limits.h>
|
||||
+
|
||||
+#include <assert.h>
|
||||
+
|
||||
+/* musl defines SSIZE_MAX as LONG_MAX, so its type is always long. However, on 32-bit architectures, musl
|
||||
+ * defines ssize_t as int. Strictly speaking, this is not a bug in musl. POSIX only requires SSIZE_MAX to
|
||||
+ * evaluate to the maximum value representable by ssize_t; it does not require SSIZE_MAX itself to have type
|
||||
+ * ssize_t. However, our code assumes that SSIZE_MAX has type ssize_t, as is the case with glibc. Cast the
|
||||
+ * value explicitly so that SSIZE_MAX has type ssize_t. */
|
||||
+static_assert(SSIZE_MAX == LONG_MAX, "");
|
||||
+#undef SSIZE_MAX
|
||||
+#define SSIZE_MAX ((ssize_t) LONG_MAX)
|
||||
--
|
||||
2.54.0
|
||||
|
||||
|
|
@ -14,10 +14,10 @@
|
|||
|
||||
maintainer="Clayton Craft <craftyguy@postmarketos.org>"
|
||||
pkgname=systemd
|
||||
pkgver=261_rc3
|
||||
pkgver=261_rc4
|
||||
_pkgver="${pkgver/_/-}"
|
||||
# pkgrel must match systemd-stage0!
|
||||
pkgrel=3
|
||||
pkgrel=0
|
||||
pkgdesc="System and service manager"
|
||||
url="https://github.com/systemd/systemd"
|
||||
# armhf: no linux-stable
|
||||
|
|
@ -228,7 +228,6 @@ fi
|
|||
|
||||
source="
|
||||
$source
|
||||
0001-musl-fix-build-on-32-bit-architecture.patch
|
||||
wired.network
|
||||
"
|
||||
builddir=${_upstream_srcdir:-"$srcdir/$pkgname-$_pkgver"}
|
||||
|
|
@ -639,7 +638,6 @@ _resolve_packages() {
|
|||
|
||||
|
||||
sha512sums="
|
||||
facbcb7831fb84a38eaee5804d9aa03382486006cdb559010d6d353ad9a3986b516522cde1f0e0808fb49365859f790dd1caed24875a1c9e339e892d09d2cf30 systemd-261_rc3.tar.gz
|
||||
a060c2d4eca986fdb7940a5330f91fbeee5ca27ea809cb2005a2b4ea301a441c74157644638c7b17de200751cb0d94fbe6034568d3f7977969ebe510e58853f1 0001-musl-fix-build-on-32-bit-architecture.patch
|
||||
b50c3391722bc28e5945666b4271d86926d1bdce4353c0a566a7765e1f0784ee00e6a5096f658c64917a7aeffd135acad15d7189c8e3041dce11e10d2c49d7cb systemd-261_rc4.tar.gz
|
||||
81c897fed8a3fbfb67ec591b2398a5d65e4af1b3ef379376c157c98d71f085b707f8ebc896d5571a94f99f8fc84fd6b43e3b879ca9b0d57fc6c4596034c7a777 wired.network
|
||||
"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue