From c5c7de65668ccfa93cbf36792852b7c0006f1cbc Mon Sep 17 00:00:00 2001 From: nazunalika Date: Mon, 29 Nov 2021 21:10:39 -0700 Subject: [PATCH] lookahead testing --- SPECS/rocky-release_with_lh.spec | 34 ++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/SPECS/rocky-release_with_lh.spec b/SPECS/rocky-release_with_lh.spec index 81806ca..ffd7690 100644 --- a/SPECS/rocky-release_with_lh.spec +++ b/SPECS/rocky-release_with_lh.spec @@ -20,7 +20,9 @@ # Rocky LookAhead Section # # Note to Packagers/Builders: If you wish to enable this, rllh should be -# defined as "lookahead" +# set to a number greater than 0. There is a chance +# that rllh could be used as a way to define what +# the "internal" version of lookahead is. # Check for lookahead and reset defines - This ensures a "lookahead" system # will contact the mirrors or set the baseurl to properly use Rocky LookAhead, # otherwise, the default is "stable" @@ -28,7 +30,8 @@ %define minor 1 %define contentdir pub/rocky-lh %define rltype lookahead -%define rlstatement " (LookAhead) " +%define rlpkg -lookahead +%define rlstatement (LookAhead) %endif # End Rocky LookAhead Section ################################################################################ @@ -46,7 +49,7 @@ # conditional section for future use -Name: rocky-release%{?rllh:-lookahead} +Name: rocky-release%{?rlpkg} Version: %{major}.%{minor} Release: %{rocky_rel}.el%{major} Summary: %{distro_name} release files @@ -117,7 +120,7 @@ Source1300: rocky.1.gz %description %{distro_name} release files. -%package -n rocky-repos%{?rllh:-lookahead} +%package -n rocky-repos%{?rlpkg} Summary: %{distro_name} Package Repositories License: %{rpm_license} Provides: rocky-repos(%{major}) = %{full_release_version} @@ -125,22 +128,22 @@ Requires: system-release = %{full_release_version} Requires: rocky-gpg-keys Conflicts: %{name} < 8.0 -%description -n rocky-repos%{?rllh:-lookahead} +%description -n rocky-repos%{?rlpkg} %{distro_name} package repository files for yum/dnf -%package -n rocky-gpg-keys%{?rllh:-lookahead} +%package -n rocky-gpg-keys%{?rlpkg} Summary: Rocky RPM GPG Keys Conflicts: %{name} < 8.0 -%description -n rocky-gpg-keys%{?rllh:-lookahead} +%description -n rocky-gpg-keys%{?rlpkg} This package provides the RPM signature keys for Rocky. -%package -n rocky-sb-certs%{?rllh:-lookahead} +%package -n rocky-sb-certs%{?rlpkg} Summary: %{distro_name} public secureboot certificates Group: System Environment/Base Provides: system-sb-certs = %{version}-%{release} -%description -n rocky-sb-certs%{?rllh:-lookahead} +%description -n rocky-sb-certs%{?rlpkg} This package contains the %{distro_name} secureboot public certificates. %prep @@ -157,7 +160,7 @@ cp %{SOURCE201} %{SOURCE202} %{SOURCE203} ./docs ################################################################################ # system-release data install -d -m 0755 %{buildroot}%{_sysconfdir} -echo "%{distro_name} release %{version} (%{distro_code})%{?rlstatement}" > %{buildroot}%{_sysconfdir}/rocky-release +echo "%{distro_name} release %{version} (%{distro_code})%{?rlstatement: %{rlstatement}}" > %{buildroot}%{_sysconfdir}/rocky-release echo "Derived from Red Hat Enterprise Linux %{version}" > %{buildroot}%{_sysconfdir}/rocky-release-upstream ln -s rocky-release %{buildroot}%{_sysconfdir}/system-release ln -s rocky-release %{buildroot}%{_sysconfdir}/redhat-release @@ -174,7 +177,7 @@ ID="rocky" ID_LIKE="rhel centos fedora" VERSION_ID="%{full_release_version}" PLATFORM_ID="platform:el%{major}" -PRETTY_NAME="%{distro_name} %{full_release_version} (%{distro_code})%{?rlstatement}" +PRETTY_NAME="%{distro_name} %{full_release_version} (%{distro_code})%{?rlstatement: %{rlstatement}}" ANSI_COLOR="0;32" CPE_NAME="cpe:/o:rocky:rocky:%{full_release_version}:GA" HOME_URL="https://rockylinux.org/" @@ -316,16 +319,16 @@ install -p -m 0644 %{SOURCE102} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %{_prefix}/lib/sysctl.d/50-redhat.conf %{_mandir}/man1/rocky.1.gz -%files -n rocky-repos +%files -n rocky-repos%{?rlpkg} %license docs/LICENSE %config(noreplace) %{_sysconfdir}/yum.repos.d/Rocky-*.repo %config(noreplace) %{_sysconfdir}/dnf/vars/contentdir %config(noreplace) %{_sysconfdir}/dnf/vars/rltype -%files -n rocky-gpg-keys +%files -n rocky-gpg-keys%{?rlpkg} %{_sysconfdir}/pki/rpm-gpg/ -%files -n rocky-sb-certs +%files -n rocky-sb-certs%{?rlpkg} # care: resetting symlinks is intended %dir %{_sysconfdir}/pki/sb-certs %dir %{_datadir}/pki/sb-certs @@ -333,9 +336,10 @@ install -p -m 0644 %{SOURCE102} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %{_datadir}/pki/sb-certs/*.crt %changelog -* Sun Nov 28 2021 Louis Abel - 9.0-1.2 +* Mon Nov 29 2021 Louis Abel - 9.0-1.2 - Sync with upstream - Adding conditionals section for future use +- Add direct LookAhead support * Mon Nov 01 2021 Louis Abel - 9.0-1.1 - Change everything to baseurl for now