From b342376ad90812135d4ed821d8e56169350d54d9 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 23 Jan 2025 12:57:45 +0300 Subject: [PATCH] Update config --- config.yaml | 56 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/config.yaml b/config.yaml index ae296ef..6101cc1 100644 --- a/config.yaml +++ b/config.yaml @@ -166,7 +166,7 @@ actions: - target: "spec" find: | Source100: rheldup3.x509 - Source101: rhelkpatch1.x509 + Source101: rhelkpatch1.x509 replace: | # Source100: rheldup3.x509 # Source101: rhelkpatch1.x509 @@ -183,12 +183,6 @@ actions: find: "Red Hat Enterprise Linux" replace: "AlmaLinux" count: 2 - - target: "spec" - find: "AutoReqProv: no" - replace: | - AutoReqProv: no - BuildArch: noarch - count: 1 - target: "spec" find: | The kABI package contains information pertaining to the Red Hat Enterprise @@ -210,8 +204,15 @@ actions: replace: "This package provides kernel modules for the %{?2:%{2} }kernel package for AlmaLinux internal usage.\\" count: 1 - target: "spec" - find: "Provides: installonlypkg(kernel)\\" + find: | + Summary: %{variant_summary}\ + Group: System Environment/Kernel\ + Provides: %{name}-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\ + Provides: installonlypkg(kernel)\ replace: | + Summary: %{variant_summary}\ + Group: System Environment/Kernel\ + Provides: %{name}-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\ Provides: installonlypkg(kernel)\ %if "%{?1}" == ""\ Provides: almalinux(kernel-sig-key) = 202303\ @@ -235,6 +236,26 @@ actions: # openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem # cat rheldup3.pem rhelkpatch1.pem > ../certs/rhel.pem count: 1 + - target: "spec" + find: | + Summary: The AlmaLinux kernel ABI symbol stablelists + Group: System Environment/Kernel + AutoReqProv: no + replace: | + Summary: The AlmaLinux kernel ABI symbol stablelists + Group: System Environment/Kernel + AutoReqProv: no + BuildArch: noarch + count: 1 + - target: "spec" + find: | + Summary: Various documentation bits found in the kernel source + Group: Documentation + replace: | + Summary: Various documentation bits found in the kernel source + Group: Documentation + BuildArch: noarch + count: 1 - delete_line: - target: "spec" @@ -257,10 +278,6 @@ actions: gzip -f9 $SignImage fi - - modify_release: - - suffix: ".alma.1" - enabled: true - - changelog_entry: - name: "Andrei Lukoshko" email: "alukoshko@almalinux.org" @@ -280,6 +297,12 @@ actions: - "Debrand for AlmaLinux OS" - add_files: + - type: "patch" + name: "debrand-single-cpu.patch" + number: 1000 + - type: "patch" + name: "debrand-rh-i686-cpu.patch" + number: 1002 - type: "patch" name: "0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch" number: 2001 @@ -310,12 +333,3 @@ actions: - type: "source" name: "almalinuxsecurebootca0.cer" number: "Latest" - - type: "patch" - name: "debrand-rh-i686-cpu.patch" - number: 1002 - - type: "patch" - name: "debrand-rh_taint.patch" - number: "Latest" - - type: "patch" - name: "debrand-single-cpu.patch" - number: 1000