From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1AF6115800A for ; Thu, 27 Jul 2023 22:55:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3662FE09DC; Thu, 27 Jul 2023 22:55:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 12B42E09DC for ; Thu, 27 Jul 2023 22:55:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C657D335DC1 for ; Thu, 27 Jul 2023 22:55:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8A9EDDC for ; Thu, 27 Jul 2023 22:55:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1690498488.0d124f17782d4b6a9e07a2a1bebc5f723e2efac6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/, sys-apps/systemd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/files/systemd-254-dt_relr.patch sys-apps/systemd/systemd-254_rc3.ebuild X-VCS-Directories: sys-apps/systemd/ sys-apps/systemd/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0d124f17782d4b6a9e07a2a1bebc5f723e2efac6 X-VCS-Branch: master Date: Thu, 27 Jul 2023 22:55:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5ecbb8aa-9b89-4369-ab55-1cf515c25c11 X-Archives-Hash: 7b5e06e09e289e396051c7d412c11cab commit: 0d124f17782d4b6a9e07a2a1bebc5f723e2efac6 Author: Sam James gentoo org> AuthorDate: Thu Jul 27 22:53:10 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jul 27 22:54:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d124f17 sys-apps/systemd: fix DT_RELR build w/ USE=boot Closes: https://bugs.gentoo.org/910570 Signed-off-by: Sam James gentoo.org> sys-apps/systemd/files/systemd-254-dt_relr.patch | 26 ++++++++++++++++++++++++ sys-apps/systemd/systemd-254_rc3.ebuild | 1 + 2 files changed, 27 insertions(+) diff --git a/sys-apps/systemd/files/systemd-254-dt_relr.patch b/sys-apps/systemd/files/systemd-254-dt_relr.patch new file mode 100644 index 000000000000..9adfc11c1dd3 --- /dev/null +++ b/sys-apps/systemd/files/systemd-254-dt_relr.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/910570 +https://github.com/systemd/systemd/issues/28520 +https://github.com/systemd/systemd/commit/eff91e2f3863f9e176b383e5c54741c64ca7a636 + +From eff91e2f3863f9e176b383e5c54741c64ca7a636 Mon Sep 17 00:00:00 2001 +From: Luca Boccassi +Date: Wed, 26 Jul 2023 11:29:57 +0100 +Subject: [PATCH] efi: link with -z nopack-relative-relocs + +elf2efi.py cannot handle DT_RELR relocations, so disable it +if we can + +Fixes https://github.com/systemd/systemd/issues/28520 +--- a/src/boot/efi/meson.build ++++ b/src/boot/efi/meson.build +@@ -174,6 +174,10 @@ efi_c_ld_args = [ + '-T' + elf2efi_lds, + ] + ++# On CentOS 8 the nopack-relative-relocs linker flag is not supported, and we get: ++# /usr/bin/ld.bfd: warning: -z nopack-relative-relocs ignored ++efi_c_ld_args += cc.get_supported_link_arguments('-Wl,-z,nopack-relative-relocs') ++ + # efi_c_args is explicitly passed to targets so that they can override distro-provided flags + # that should not be used for EFI binaries. + efi_disabled_c_args = cc.get_supported_arguments( diff --git a/sys-apps/systemd/systemd-254_rc3.ebuild b/sys-apps/systemd/systemd-254_rc3.ebuild index 494249a2edd6..1333d2cd88f7 100644 --- a/sys-apps/systemd/systemd-254_rc3.ebuild +++ b/sys-apps/systemd/systemd-254_rc3.ebuild @@ -241,6 +241,7 @@ src_unpack() { src_prepare() { local PATCHES=( "${FILESDIR}/systemd-253-initrd-generators.patch" + "${FILESDIR}/systemd-254-dt_relr.patch" ) if ! use vanilla; then