spec: add new package with RHEL-specific network naming sysattrs
Resolves: RHEL-22278
This commit is contained in:
parent
d1be2e5c92
commit
8fdd66f6a4
1
.gitignore
vendored
1
.gitignore
vendored
@ -7,3 +7,4 @@
|
|||||||
/systemd-*.tar.xz
|
/systemd-*.tar.xz
|
||||||
/systemd-*.tar.gz
|
/systemd-*.tar.gz
|
||||||
/*.rpm
|
/*.rpm
|
||||||
|
/rhel-net-naming-sysattrs-v0.2.tar.gz
|
||||||
|
1
sources
1
sources
@ -1 +1,2 @@
|
|||||||
|
SHA512 (rhel-net-naming-sysattrs-v0.2.tar.gz) = ec55435f129d07242ce645f26863c1200b7b433c98066f5a6dac0db75b30b0a65e20f00488287a017331cb22c651a03c46d88bc01b527b89bd30ce019fa84e89
|
||||||
SHA512 (systemd-252.tar.gz) = c9a5f4e3d11cf6a73b0f0d34f7e8f380b9b39bd4e8dd540affcba2eb24b777943f90662eb6ca2bd24276eb5d502312fcc2f097ec242ed1ca79603dbbde19ec7f
|
SHA512 (systemd-252.tar.gz) = c9a5f4e3d11cf6a73b0f0d34f7e8f380b9b39bd4e8dd540affcba2eb24b777943f90662eb6ca2bd24276eb5d502312fcc2f097ec242ed1ca79603dbbde19ec7f
|
||||||
|
26
systemd.spec
26
systemd.spec
@ -21,7 +21,7 @@
|
|||||||
Name: systemd
|
Name: systemd
|
||||||
Url: https://systemd.io
|
Url: https://systemd.io
|
||||||
Version: 252
|
Version: 252
|
||||||
Release: 24%{?dist}
|
Release: 25%{?dist}
|
||||||
# For a breakdown of the licensing, see README
|
# For a breakdown of the licensing, see README
|
||||||
License: LGPLv2+ and MIT and GPLv2+
|
License: LGPLv2+ and MIT and GPLv2+
|
||||||
Summary: System and Service Manager
|
Summary: System and Service Manager
|
||||||
@ -65,6 +65,11 @@ Source23: sysusers.prov
|
|||||||
Source24: sysusers.generate-pre.sh
|
Source24: sysusers.generate-pre.sh
|
||||||
Source25: rc.local
|
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
|
||||||
|
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
|
%if 0
|
||||||
GIT_DIR=../../src/systemd/.git git format-patch-ab --no-signature -M -N v235..v235-stable
|
GIT_DIR=../../src/systemd/.git git format-patch-ab --no-signature -M -N v235..v235-stable
|
||||||
i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done|xclip
|
i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done|xclip
|
||||||
@ -875,8 +880,17 @@ Standalone sysusers binary with no dependencies on the systemd-shared library
|
|||||||
or other libraries from systemd-libs. This package conflicts with the main
|
or other libraries from systemd-libs. This package conflicts with the main
|
||||||
systemd package and is meant for use in non-systemd systems.
|
systemd package and is meant for use in non-systemd systems.
|
||||||
|
|
||||||
|
%package -n rhel-net-naming-sysattrs
|
||||||
|
Summary: RHEL-specific network naming sysattrs
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description -n rhel-net-naming-sysattrs
|
||||||
|
rhel-net-naming-sysattrs package provides hwdb and udev rule needed for stable
|
||||||
|
network naming scheme acros RHEL releases.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{?commit:%{name}%{?stable:-stable}-%{commit}}%{!?commit:%{name}%{?stable:-stable}-%{version_no_tilde}} -S git_am -p1
|
%autosetup -n %{?commit:%{name}%{?stable:-stable}-%{commit}}%{!?commit:%{name}%{?stable:-stable}-%{version_no_tilde}} -S git_am -p1
|
||||||
|
%setup -T -D -a 26
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%define ntpvendor %(source /etc/os-release; echo ${ID})
|
%define ntpvendor %(source /etc/os-release; echo ${ID})
|
||||||
@ -1138,6 +1152,9 @@ python3 %{SOURCE2} %buildroot <<EOF
|
|||||||
%ghost %attr(0700,root,root) %dir /var/log/private
|
%ghost %attr(0700,root,root) %dir /var/log/private
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
# Install rhel-net-naming-sysattrs
|
||||||
|
%make_install -C rhel-net-naming-sysattrs-v%{rhel_nns_version}
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
meson test -C %{_vpath_builddir} -t 6 --print-errorlogs
|
meson test -C %{_vpath_builddir} -t 6 --print-errorlogs
|
||||||
@ -1387,7 +1404,14 @@ getent passwd systemd-oom &>/dev/null || useradd -r -l -g systemd-oom -d / -s /s
|
|||||||
|
|
||||||
%files standalone-sysusers -f .file-list-standalone-sysusers
|
%files standalone-sysusers -f .file-list-standalone-sysusers
|
||||||
|
|
||||||
|
%files -n rhel-net-naming-sysattrs
|
||||||
|
%{_udevrulesdir}/74-rhel-net-naming-sysattrs.rules
|
||||||
|
%{_udevhwdbdir}/50-net-naming-sysattr-allowlist.hwdb
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 30 2024 systemd maintenance team <systemd-maint@redhat.com> - 252-25
|
||||||
|
- spec: add new package with RHEL-specific network naming sysattrs (RHEL-22278)
|
||||||
|
|
||||||
* Wed Jan 24 2024 systemd maintenance team <systemd-maint@redhat.com> - 252-24
|
* Wed Jan 24 2024 systemd maintenance team <systemd-maint@redhat.com> - 252-24
|
||||||
- ci: use source-git-automation composite Action (RHEL-1086)
|
- ci: use source-git-automation composite Action (RHEL-1086)
|
||||||
- ci: increase the cron interval to 45 minutes (RHEL-1086)
|
- ci: increase the cron interval to 45 minutes (RHEL-1086)
|
||||||
|
Loading…
Reference in New Issue
Block a user