Merge branch 'a9' into a9-rhel
This commit is contained in:
commit
6715bb0753
|
|
@ -224,3 +224,4 @@ enable switcheroo-control.service
|
|||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2106811
|
||||
enable clevis-luks-askpass.path
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
|
|||
metadata_expire=86400
|
||||
enabled_metadata=1
|
||||
|
||||
[appstream-debug]
|
||||
[appstream-debuginfo]
|
||||
name=AlmaLinux $releasever - AppStream - Debug
|
||||
mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-debug
|
||||
# baseurl=https://repo.almalinux.org/vault/$releasever/AppStream/debug/$basearch/
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
|
|||
metadata_expire=86400
|
||||
enabled_metadata=1
|
||||
|
||||
[baseos-debug]
|
||||
[baseos-debuginfo]
|
||||
name=AlmaLinux $releasever - BaseOS - Debug
|
||||
mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-debug
|
||||
# baseurl=https://repo.almalinux.org/vault/$releasever/BaseOS/debug/$basearch/
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
|
|||
metadata_expire=86400
|
||||
enabled_metadata=0
|
||||
|
||||
[crb-debug]
|
||||
[crb-debuginfo]
|
||||
name=AlmaLinux $releasever - CRB - Debug
|
||||
mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/crb-debug
|
||||
# baseurl=https://repo.almalinux.org/vault/$releasever/CRB/debug/$basearch/
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
|
|||
metadata_expire=86400
|
||||
enabled_metadata=0
|
||||
|
||||
[extras-debug]
|
||||
[extras-debuginfo]
|
||||
name=AlmaLinux $releasever - Extras - Debug
|
||||
mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-debug
|
||||
# baseurl=https://repo.almalinux.org/vault/$releasever/extras/debug/$basearch/
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
|
|||
metadata_expire=86400
|
||||
enabled_metadata=0
|
||||
|
||||
[highavailability-debug]
|
||||
[highavailability-debuginfo]
|
||||
name=AlmaLinux $releasever - HighAvailability - Debug
|
||||
mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/highavailability-debug
|
||||
# baseurl=https://repo.almalinux.org/vault/$releasever/HighAvailability/debug/$basearch/
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
|
|||
metadata_expire=86400
|
||||
enabled_metadata=0
|
||||
|
||||
[nfv-debug]
|
||||
[nfv-debuginfo]
|
||||
name=AlmaLinux $releasever - NFV - Debug
|
||||
mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv-debug
|
||||
# baseurl=https://repo.almalinux.org/vault/$releasever/NFV/debug/$basearch/
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
|
|||
metadata_expire=86400
|
||||
enabled_metadata=0
|
||||
|
||||
[plus-debug]
|
||||
[plus-debuginfo]
|
||||
name=AlmaLinux $releasever - Plus - Debug
|
||||
mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus-debug
|
||||
# baseurl=https://repo.almalinux.org/vault/$releasever/plus/debug/$basearch/
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
%global distro AlmaLinux
|
||||
%global release_name Lime Lynx
|
||||
%global release_name Turquoise Kodkod
|
||||
%global major 9
|
||||
%global minor 1
|
||||
%global minor 2
|
||||
|
||||
Name: almalinux-release
|
||||
Epoch: 2
|
||||
Version: %{major}.%{minor}
|
||||
Release: 1.9%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: %{distro} release files
|
||||
License: GPLv2
|
||||
URL: https://almalinux.org
|
||||
|
|
@ -39,13 +39,13 @@ Source302: 90-default-user.preset
|
|||
Source303: 99-default-disable.preset
|
||||
Source304: 50-redhat.conf
|
||||
|
||||
Source400: clsecureboot001.cer
|
||||
Source400: alsecureboot001.cer
|
||||
# kernel signing certificate
|
||||
Source401: clsecureboot001.cer
|
||||
Source401: alsecureboot001.cer
|
||||
# grub2 signing certificate
|
||||
Source402: clsecureboot001.cer
|
||||
Source402: alsecureboot001.cer
|
||||
# Fwupd signing certificate
|
||||
Source403: clsecureboot001.cer
|
||||
Source403: alsecureboot001.cer
|
||||
|
||||
Source500: almalinux-appstream.repo
|
||||
Source501: almalinux-baseos.repo
|
||||
|
|
@ -101,11 +101,34 @@ echo "%{distro} release %{major}.%{minor}%{?beta: %{beta}} (%{release_name})" >
|
|||
ln -s almalinux-release %{buildroot}%{_sysconfdir}/system-release
|
||||
ln -s almalinux-release %{buildroot}%{_sysconfdir}/redhat-release
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# Definitions for /etc/os-release and for macros in macros.dist. These
|
||||
# macros are useful for spec files where distribution-specific identifiers
|
||||
# are used to customize packages.
|
||||
|
||||
# Name of vendor / name of distribution. Typically used to identify where
|
||||
# the binary comes from in --help or --version messages of programs.
|
||||
# Examples: gdb.spec, clang.spec
|
||||
%global dist_vendor AlmaLinux OS Foundation
|
||||
%global dist_name %{distro}
|
||||
|
||||
# URL of the homepage of the distribution
|
||||
# Example: gstreamer1-plugins-base.spec
|
||||
%global dist_home_url https://almalinux.org/
|
||||
|
||||
# Bugzilla / bug reporting URLs shown to users.
|
||||
# Examples: gcc.spec
|
||||
%global dist_bug_report_url https://bugs.almalinux.org/
|
||||
|
||||
# debuginfod server, as used in elfutils.spec.
|
||||
# %global dist_debuginfod_url %{nil}
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
# Create the os-release file
|
||||
install -d -m 0755 %{buildroot}%{_prefix}/lib
|
||||
cat > %{buildroot}%{_prefix}/lib/os-release << EOF
|
||||
NAME="%{distro}"
|
||||
VERSION="%{major}.%{minor}%{?beta: %{beta}} (%{release_name})"
|
||||
VERSION="%{major}.%{minor} (%{release_name})"
|
||||
ID="rhel"
|
||||
ID_LIKE="fedora"
|
||||
VERSION_ID="%{major}.%{minor}"
|
||||
|
|
@ -114,9 +137,9 @@ PRETTY_NAME="%{distro} %{major}.%{minor}%{?beta: %{beta}} (%{release_name})"
|
|||
ANSI_COLOR="0;34"
|
||||
LOGO="fedora-logo-icon"
|
||||
CPE_NAME="cpe:/o:almalinux:almalinux:%{major}::baseos"
|
||||
HOME_URL="https://almalinux.org/"
|
||||
HOME_URL="%{dist_home_url}"
|
||||
DOCUMENTATION_URL="https://wiki.almalinux.org/"
|
||||
BUG_REPORT_URL="https://bugs.almalinux.org/"
|
||||
BUG_REPORT_URL="%{dist_bug_report_url}"
|
||||
|
||||
ALMALINUX_MANTISBT_PROJECT="AlmaLinux-%{major}"
|
||||
ALMALINUX_MANTISBT_PROJECT_VERSION="%{major}.%{minor}"
|
||||
|
|
@ -150,6 +173,10 @@ cat > %{buildroot}%{_rpmmacrodir}/macros.dist << EOF
|
|||
%%rhel %{major}
|
||||
%%dist %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.el%{major}%%{?with_bootstrap:%{__bootstrap}}
|
||||
%%el%{major} 1
|
||||
%%dist_vendor %{dist_vendor}
|
||||
%%dist_name %{dist_name}
|
||||
%%dist_home_url %{dist_home_url}
|
||||
%%dist_bug_report_url %{dist_bug_report_url}
|
||||
EOF
|
||||
|
||||
# use unbranded datadir
|
||||
|
|
@ -202,25 +229,25 @@ install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-s
|
|||
install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-s390x.cer
|
||||
|
||||
# Link x86_64 certs
|
||||
ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-ca-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-x86_64.cer
|
||||
ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-kernel-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-x86_64.cer
|
||||
ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-grub2-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-grub2-x86_64.cer
|
||||
ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-fwupd-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-fwupd-x86_64.cer
|
||||
ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-x86_64.cer
|
||||
ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-x86_64.cer
|
||||
ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-grub2-x86_64.cer
|
||||
ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-fwupd-x86_64.cer
|
||||
|
||||
# Link aarch64 certs
|
||||
ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-ca-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-aarch64.cer
|
||||
ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-kernel-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-aarch64.cer
|
||||
ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-grub2-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-grub2-aarch64.cer
|
||||
ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-fwupd-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-fwupd-aarch64.cer
|
||||
ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-aarch64.cer
|
||||
ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-aarch64.cer
|
||||
ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-grub2-aarch64.cer
|
||||
ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-fwupd-aarch64.cer
|
||||
|
||||
# Link ppc64le certs
|
||||
ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-ca-ppc64le.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-ppc64le.cer
|
||||
ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-kernel-ppc64le.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-ppc64le.cer
|
||||
ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-grub2-ppc64le.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-grub2-ppc64le.cer
|
||||
ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-ppc64le.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-ppc64le.cer
|
||||
ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-ppc64le.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-ppc64le.cer
|
||||
ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-ppc64le.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-grub2-ppc64le.cer
|
||||
|
||||
# Link s390x certs
|
||||
ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-ca-s390x.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-s390x.cer
|
||||
ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-kernel-s390x.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-s390x.cer
|
||||
ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-s390x.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-s390x.cer
|
||||
ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-s390x.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-s390x.cer
|
||||
|
||||
# copy yum repos
|
||||
install -d -m 0755 %{buildroot}%{_sysconfdir}/yum.repos.d
|
||||
|
|
@ -297,6 +324,9 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue May 02 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 9.2-1
|
||||
- 9.2 stable
|
||||
|
||||
* Tue Nov 15 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 9.1-1.9
|
||||
- 9.1 stable
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
|
|||
metadata_expire=86400
|
||||
enabled_metadata=0
|
||||
|
||||
[resilientstorage-debug]
|
||||
[resilientstorage-debuginfo]
|
||||
name=AlmaLinux $releasever - ResilientStorage - Debug
|
||||
mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage-debug
|
||||
# baseurl=https://repo.almalinux.org/vault/$releasever/ResilientStorage/debug/$basearch/
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
|
|||
metadata_expire=86400
|
||||
enabled_metadata=0
|
||||
|
||||
[rt-debug]
|
||||
[rt-debuginfo]
|
||||
name=AlmaLinux $releasever - RT - Debug
|
||||
mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt-debug
|
||||
# baseurl=https://repo.almalinux.org/vault/$releasever/RT/debug/$basearch/
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
|
|||
metadata_expire=86400
|
||||
enabled_metadata=0
|
||||
|
||||
[sap-debug]
|
||||
[sap-debuginfo]
|
||||
name=AlmaLinux $releasever - SAP - Debug
|
||||
mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/sap-debug
|
||||
# baseurl=https://repo.almalinux.org/vault/$releasever/SAP/debug/$basearch/
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
|
|||
metadata_expire=86400
|
||||
enabled_metadata=0
|
||||
|
||||
[saphana-debug]
|
||||
[saphana-debuginfo]
|
||||
name=AlmaLinux $releasever - SAPHANA - Debug
|
||||
mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/saphana-debug
|
||||
# baseurl=https://repo.almalinux.org/vault/$releasever/SAPHANA/debug/$basearch/
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue