The package rpms/systemd.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/systemd.git/commit/?id=b6f8f82d8bb1b... https://src.fedoraproject.org/cgit/rpms/systemd.git/commit/?id=e3e9477031d88... https://src.fedoraproject.org/cgit/rpms/systemd.git/commit/?id=ec5f3a94bce24....
Change: +%ifarch riscv64 +%ifarch %{valgrind_arches} +%ifarch riscv64
Thanks.
Full change: ============
commit b6f8f82d8bb1b153b7ed2518b0ad7704ce480feb Author: Zbigniew Jędrzejewski-Szmek zbyszek@in.waw.pl Date: Fri Mar 22 13:01:02 2024 +0100
Adjust release tag for riscv64
If it is specified externally, we hounour that. Otherwise, default to "1.0.riscv64" on riscv.
diff --git a/systemd.spec b/systemd.spec index 63974f2..d794e11 100644 --- a/systemd.spec +++ b/systemd.spec @@ -31,6 +31,12 @@ # Build from git main %bcond upstream 0
+%ifarch riscv64 +%if !%{defined release_override} +%global release_override 1.0.riscv64 +%endif +%endif + Name: systemd Url: https://systemd.io # Allow users to specify the version and release when building the rpm by
commit 58b044d8e9ccf7be153a4b3e8259b9cc51034f8e Author: Zbigniew Jędrzejewski-Szmek zbyszek@in.waw.pl Date: Fri Mar 22 13:00:11 2024 +0100
Adjust indentation
[skip changelog]
diff --git a/systemd.spec b/systemd.spec index 6ada273..63974f2 100644 --- a/systemd.spec +++ b/systemd.spec @@ -15,12 +15,12 @@ %global elf_suffix ()%{elf_bits} %endif
-%bcond bzip2 1 -%bcond gnutls 1 -%bcond lz4 1 -%bcond xz 1 -%bcond zlib 1 -%bcond zstd 1 +%bcond bzip2 1 +%bcond gnutls 1 +%bcond lz4 1 +%bcond xz 1 +%bcond zlib 1 +%bcond zstd 1
# Bootstrap may be needed to break circular dependencies with cryptsetup, # e.g. when re-building cryptsetup on a json-c SONAME-bump. @@ -29,7 +29,7 @@ %bcond lto 1
# Build from git main -%bcond upstream 0 +%bcond upstream 0
Name: systemd Url: https://systemd.io
commit e3e9477031d88374d2c2796ce765401f68b1653e Author: Zbigniew Jędrzejewski-Szmek zbyszek@in.waw.pl Date: Fri Mar 22 12:57:04 2024 +0100
BR: valgrind is not available on riscv64
[skip changelog]
diff --git a/systemd.spec b/systemd.spec index a7bce17..6ada273 100644 --- a/systemd.spec +++ b/systemd.spec @@ -201,7 +201,9 @@ BuildRequires: libseccomp-devel BuildRequires: meson >= 0.43 BuildRequires: gettext # We use RUNNING_ON_VALGRIND in tests, so the headers need to be available +%ifarch %{valgrind_arches} BuildRequires: valgrind-devel +%endif BuildRequires: pkgconfig(bash-completion) BuildRequires: perl BuildRequires: perl(IPC::SysV)
commit ec5f3a94bce2474ea250e02ef8b2bd0b57b8727c Author: Zbigniew Jędrzejewski-Szmek zbyszek@in.waw.pl Date: Thu Mar 21 11:05:08 2024 +0100
BR: add versioned dependency on binutils for ukify tests
[skip changelog]
diff --git a/systemd.spec b/systemd.spec index 2bebda2..a7bce17 100644 --- a/systemd.spec +++ b/systemd.spec @@ -437,6 +437,13 @@ Requires: python3dist(zstd) Requires: python3dist(cryptography) Recommends: python3dist(pillow)
+# for tests +%ifarch riscv64 +# 2.42 received support for riscv64 + efi targets +%global binutils_version_req >= 2.42 +%endif +BuildRequires: binutils %{?binutils_version_req} + BuildArch: noarch
%description ukify
commit 2e32a339a10caad9392a7049bccfd1c4cd7c24cc Author: David Tardon dtardon@redhat.com Date: Wed Mar 20 10:50:38 2024 +0100
Make Requires(*) on systemd versioned
Most systemd tools run from scriptlets need libsystemd-shared-X.so (from systemd package), which contains version and release in it's name. Therefore, the same version of systemd package must be already installed when they run.
Resolves: #2282821
diff --git a/systemd.spec b/systemd.spec index 159b38c..2bebda2 100644 --- a/systemd.spec +++ b/systemd.spec @@ -364,9 +364,9 @@ Summary: Rule-based device node and kernel event manager License: LGPL-2.1-or-later
Requires: systemd%{_isa} = %{version}-%{release} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +Requires(post): systemd%{_isa} = %{version}-%{release} +Requires(preun): systemd%{_isa} = %{version}-%{release} +Requires(postun): systemd%{_isa} = %{version}-%{release} Requires(post): grep Requires: kmod >= 18-4 # https://bodhi.fedoraproject.org/updates/FEDORA-2020-dd43dd05b1 @@ -470,9 +470,9 @@ the version that works with Secure Boot. # Name is the same as in Debian Summary: Tools for containers and VMs Requires: %{name}%{_isa} = %{version}-%{release} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +Requires(post): systemd%{_isa} = %{version}-%{release} +Requires(preun): systemd%{_isa} = %{version}-%{release} +Requires(postun): systemd%{_isa} = %{version}-%{release} # obsolete parent package so that dnf will install new subpackage on upgrade (#1260394) Obsoletes: %{name} < 229-5 # Bias the system towards libcurl-minimal if nothing pulls in full libcurl (#1997040)
arch-excludes@lists.fedoraproject.org