From b6204e053f95b3bfd038dc2abf8ee4f8b10c3048 Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Mon, 1 Jan 2024 11:54:01 +0530 Subject: [PATCH] only one kernel (kernel-mainline-sbc) and one COPR) --- includes/package-list.ksi | 11 +---------- includes/post/rpm-repos-enable.ksi | 24 ++++++++---------------- includes/repos/elrepo-tfg.ksi | 2 +- includes/repos/repos-master.ksi | 1 - 4 files changed, 10 insertions(+), 28 deletions(-) diff --git a/includes/package-list.ksi b/includes/package-list.ksi index 9fd614a..dc74883 100644 --- a/includes/package-list.ksi +++ b/includes/package-list.ksi @@ -8,16 +8,7 @@ rocky-release @standard # Kernel selection -# (coprs/prathampatel/kernel-tfg/packages) "testing" kernels with defaults -#kernel-lts-tfg -#kernel-stable-tfg -#kernel-rc-tfg -#kernel-next-tfg -# (coprs/prathampatel/kernel-elrepo) "prod" kernels -#kernel-lts -kernel-stable -#kernel-mainline -#kernel-next +kernel-mainline-sbc # Other necessary packages cloud-utils-growpart diff --git a/includes/post/rpm-repos-enable.ksi b/includes/post/rpm-repos-enable.ksi index c367b1d..a1b0829 100644 --- a/includes/post/rpm-repos-enable.ksi +++ b/includes/post/rpm-repos-enable.ksi @@ -30,25 +30,17 @@ if dnf list installed | grep '@epel' > /dev/null || dnf list installed | grep 'e fi fi -# this has kernels with defconfigs -dnf copr enable --assumeyes prathampatel/kernel-tfg "rhel-${DNF_RELEASEVER}-${MACHINE_ARCH}" -if ! dnf repolist --enabled | grep 'copr:copr.fedorainfracloud.org:prathampatel:kernel-tfg' > /dev/null; then - dnf config-manager --set-enabled 'copr:copr.fedorainfracloud.org:prathampatel:kernel-tfg' || exit 1 +# SIG/kernel's kernel-mainline-sbc +dnf copr enable --assumeyes prathampatel/kernel-rocky "rhel-${DNF_RELEASEVER}-${MACHINE_ARCH}" +if ! dnf repolist --enabled | grep 'copr:copr.fedorainfracloud.org:prathampatel:kernel-rocky' > /dev/null; then + dnf config-manager --set-enabled 'copr:copr.fedorainfracloud.org:prathampatel:kernel-rocky' || exit 1 fi -echo 'metadata_expire=1200' | tee -a '/etc/yum.repos.d/_copr:copr.fedorainfracloud.org:prathampatel:kernel-tfg.repo' - -# this has kernels with elrepo + sbc enablement -dnf copr enable --assumeyes prathampatel/kernel-elrepo "rhel-${DNF_RELEASEVER}-${MACHINE_ARCH}" -if ! dnf repolist --enabled | grep 'copr:copr.fedorainfracloud.org:prathampatel:kernel-elrepo' > /dev/null; then - dnf config-manager --set-enabled 'copr:copr.fedorainfracloud.org:prathampatel:kernel-elrepo' || exit 1 -fi -echo 'metadata_expire=2400' | tee -a '/etc/yum.repos.d/_copr:copr.fedorainfracloud.org:prathampatel:kernel-elrepo.repo' +echo 'metadata_expire=2400' | tee -a '/etc/yum.repos.d/_copr:copr.fedorainfracloud.org:prathampatel:kernel-rocky.repo' # manually import the GPG keys for my COPRs -wget 'https://download.copr.fedorainfracloud.org/results/prathampatel/kernel-tfg/pubkey.gpg' -O kernel-tfg-pubkey.gpg -wget 'https://download.copr.fedorainfracloud.org/results/prathampatel/kernel-elrepo/pubkey.gpg' -O kernel-elrepo-pubkey.gpg -rpm --import kernel-{tfg,elrepo}-pubkey.gpg -rm -vf kernel-{tfg,elrepo}-pubkey.gpg +wget 'https://download.copr.fedorainfracloud.org/results/prathampatel/kernel-rocky/pubkey.gpg' -O kernel-rocky-pubkey.gpg +rpm --import kernel-elrepo-pubkey.gpg +rm -vf kernel-elrepo-pubkey.gpg dnf clean expire-cache diff --git a/includes/repos/elrepo-tfg.ksi b/includes/repos/elrepo-tfg.ksi index 86df7ff..678df68 100644 --- a/includes/repos/elrepo-tfg.ksi +++ b/includes/repos/elrepo-tfg.ksi @@ -1,2 +1,2 @@ # Enable Pratham Patel's COPR that provides the Linux kernel -repo --install --name=COPR-elrepo-tfg --baseurl=https://download.copr.fedorainfracloud.org/results/prathampatel/kernel-elrepo/rhel-$releasever-$basearch +repo --install --name=COPR-kernel-tfg --baseurl=https://download.copr.fedorainfracloud.org/results/prathampatel/kernel-rocky/rhel-$releasever-$basearch diff --git a/includes/repos/repos-master.ksi b/includes/repos/repos-master.ksi index d2d258c..e2841dc 100644 --- a/includes/repos/repos-master.ksi +++ b/includes/repos/repos-master.ksi @@ -1,4 +1,3 @@ %include elrepo-tfg.ksi %include epel.ksi -%include kernel-tfg.ksi %include rocky.ksi