From 1e287bdc63b72cb586b4a2543da076bf349f078c Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 31 Jan 2024 15:38:18 +0100 Subject: [PATCH] spec: update rhel-net-naming-sysattrs to v0.4 Resolves: RHEL-22278 --- .gitignore | 2 +- sources | 2 +- systemd.spec | 14 ++++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a7afd79..b3e04de 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ /systemd-*.tar.xz /systemd-*.tar.gz /*.rpm -/rhel-net-naming-sysattrs-v0.2.tar.gz +/rhel-net-naming-sysattrs-*.tar.gz diff --git a/sources b/sources index 8191ed4..628c173 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rhel-net-naming-sysattrs-v0.2.tar.gz) = ec55435f129d07242ce645f26863c1200b7b433c98066f5a6dac0db75b30b0a65e20f00488287a017331cb22c651a03c46d88bc01b527b89bd30ce019fa84e89 +SHA512 (rhel-net-naming-sysattrs-v0.4.tar.gz) = 8144982596fbb220e673d94d8ab12178a801becacac10821b1c5a6007666c9f15a0ecf1cf6ac294f84ad4cd6e4bfdd5d4457bd4621d1691b828b0a5e116c7645 SHA512 (systemd-252.tar.gz) = c9a5f4e3d11cf6a73b0f0d34f7e8f380b9b39bd4e8dd540affcba2eb24b777943f90662eb6ca2bd24276eb5d502312fcc2f097ec242ed1ca79603dbbde19ec7f diff --git a/systemd.spec b/systemd.spec index 5e2119a..892d34c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: https://systemd.io Version: 252 -Release: 25%{?dist} +Release: 26%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: System and Service Manager @@ -67,7 +67,7 @@ Source25: rc.local # Download hwdb of RHEL net naming scheme; this is a temporary it will be later moved to kernel # see: https://issues.redhat.com/browse/RHELBU-2374 -%global rhel_nns_version 0.2 +%global rhel_nns_version 0.4 Source26: https://gitlab.com/mschmidt2/rhel-net-naming-sysattrs/-/archive/v%{rhel_nns_version}/rhel-net-naming-sysattrs-v%{rhel_nns_version}.tar.gz %if 0 @@ -882,6 +882,7 @@ systemd package and is meant for use in non-systemd systems. %package -n rhel-net-naming-sysattrs Summary: RHEL-specific network naming sysattrs +BuildRequires: pkgconfig(dracut) BuildArch: noarch %description -n rhel-net-naming-sysattrs @@ -1353,7 +1354,7 @@ getent passwd systemd-oom &>/dev/null || useradd -r -l -g systemd-oom -d / -s /s %systemd_postun_with_restart systemd-oomd.service %post -n rhel-net-naming-sysattrs -udevadm hwdb --update &>/dev/null || : +systemd-hwdb update &>/dev/null || : %global _docdir_fmt %{name} @@ -1408,10 +1409,15 @@ udevadm hwdb --update &>/dev/null || : %files standalone-sysusers -f .file-list-standalone-sysusers %files -n rhel-net-naming-sysattrs -%{_udevrulesdir}/74-rhel-net-naming-sysattrs.rules +%{_udevrulesdir}/70-rhel-net-naming-sysattrs.rules %{_udevhwdbdir}/50-net-naming-sysattr-allowlist.hwdb +%dir %{_prefix}/lib/dracut/modules.d/70rhel-net-naming-sysattrs +%{_prefix}/lib/dracut/modules.d/70rhel-net-naming-sysattrs/* %changelog +* Wed Jan 31 2024 systemd maintenance team - 252-26 +- spec: update rhel-net-naming-sysattrs to v0.4 (RHEL-22278) + * Tue Jan 30 2024 systemd maintenance team - 252-25 - spec: add new package with RHEL-specific network naming sysattrs (RHEL-22278)