[packages/systemd] up to 251.5
atler
atler at pld-linux.org
Sun Oct 2 18:17:11 CEST 2022
commit ec7c02587602b7f28d75789c3425a4ab90b8f575
Author: Jan Palus <atler at pld-linux.org>
Date: Sun Oct 2 18:16:04 2022 +0200
up to 251.5
efi-linker-flags.patch | 39 ---------------------------------------
systemd.spec | 8 +++-----
2 files changed, 3 insertions(+), 44 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index ded2828..fe2c6c3 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -29,14 +29,14 @@ Summary: A System and Service Manager
Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa
Name: systemd
# Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version: 251.4
-Release: 2
+Version: 251.5
+Release: 1
Epoch: 1
License: GPL v2+ (udev), LGPL v2.1+ (the rest)
Group: Base
#Source0Download: https://github.com/systemd/systemd/releases
Source0: https://github.com/systemd/systemd-stable/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: b41f13dff0c56746507d86fab06a4488
+# Source0-md5: d26d9f41600e4d5f7142eccf079b8044
Source1: %{name}-sysv-convert
Source2: %{name}_booted.c
Source3: network.service
@@ -80,7 +80,6 @@ Patch14: pld-pam-%{name}-user.patch
Patch15: %{name}-x32.patch
Patch16: rpm-macros.patch
Patch17: %{name}-include.patch
-Patch18: efi-linker-flags.patch
URL: https://www.freedesktop.org/wiki/Software/systemd/
BuildRequires: acl-devel
%{?with_audit:BuildRequires: audit-libs-devel}
@@ -803,7 +802,6 @@ Makra RPM-a definiujące ścieżki i skryptlety związane z systemd.
%patch15 -p1
%patch16 -p1
%patch17 -p1
-%patch18 -p1
cp -p %{SOURCE2} src/systemd_booted.c
diff --git a/efi-linker-flags.patch b/efi-linker-flags.patch
deleted file mode 100644
index 267d8b2..0000000
--- a/efi-linker-flags.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bddad6089e7d1a19ccf56b612b748232f46461b6 Mon Sep 17 00:00:00 2001
-From: Jan Janssen <medhefgo at web.de>
-Date: Tue, 9 Aug 2022 10:32:41 +0200
-Subject: [PATCH] meson: Test correct efi linker for supported args
-
-Fixes: #24241
----
- src/boot/efi/meson.build | 18 +++++++++++++-----
- 1 file changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
-index 127b4e17a3a7..95785dfd5d83 100644
---- a/src/boot/efi/meson.build
-+++ b/src/boot/efi/meson.build
-@@ -266,11 +266,19 @@ efi_ldflags = [
- efi_crt0,
- ]
-
--possible_link_flags = [
-- '-Wl,--no-warn-execstack',
-- '-Wl,--no-warn-rwx-segments',
--]
--efi_ldflags += cc.get_supported_link_arguments(possible_link_flags)
-+foreach arg : ['-Wl,--no-warn-execstack',
-+ '-Wl,--no-warn-rwx-segments']
-+ # We need to check the correct linker for supported args. This is what
-+ # cc.has_multi_link_arguments() is for, but it helpfully overrides our
-+ # choice of linker by putting its own -fuse-ld= arg after ours.
-+ if run_command('bash', '-c',
-+ 'exec "$@" -x c -o/dev/null <(echo "int main(void){return 0;}")' +
-+ ' -fuse-ld=' + efi_ld + ' -Wl,--fatal-warnings ' + arg,
-+ 'bash', cc.cmd_array(),
-+ check : false).returncode() == 0
-+ efi_ldflags += arg
-+ endif
-+endforeach
-
- if efi_arch[1] in ['aarch64', 'arm', 'riscv64']
- efi_ldflags += ['-shared']
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/ec7c02587602b7f28d75789c3425a4ab90b8f575
More information about the pld-cvs-commit
mailing list