From 97d81c81c95633ecbed68408e4f84a6b4fc77dc8 Mon Sep 17 00:00:00 2001
From: Julian Wiedmann <jwi@isovalent.com>
Date: Mon, 4 Nov 2024 08:11:07 +0200
Subject: [PATCH] rhel8: also build RHEL 8.10 images

RHEL 8.9 is end-of-life already [0], let's provide images with the latest
+ final RHEL8 minor version.

[0] https://access.redhat.com/support/policy/updates/errata#RHEL8_Planning_Guide

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
---
 .github/workflows/buildx.yaml   | 14 +++++++++++++-
 _data/kernels.json              |  4 +++-
 dockerfiles/kernel-images-rhel8 |  3 ++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/buildx.yaml b/.github/workflows/buildx.yaml
index 24dd2869..59d7ec6f 100644
--- a/.github/workflows/buildx.yaml
+++ b/.github/workflows/buildx.yaml
@@ -57,7 +57,7 @@ jobs:
         name: kernel versions
         with:
           script: |
-              var all_kernels = ['4.19', '5.4', '5.10', '5.15', '6.1', '6.6', 'bpf', 'bpf-net', 'bpf-next', 'rhel8.6', 'rhel8.9' ]
+              var all_kernels = ['4.19', '5.4', '5.10', '5.15', '6.1', '6.6', 'bpf', 'bpf-net', 'bpf-next', 'rhel8.6', 'rhel8.9', 'rhel8.10' ]
               var kernels = []
               const kernel_label_prefix = 'gha-builds/kernel/'
               res = await github.rest.issues.listLabelsOnIssue({
@@ -85,15 +85,24 @@ jobs:
                       case 'rhel8.6':
                           options.dockerfile = "dockerfiles/kernel-images-rhel8"
                           options.platforms = 'linux/amd64'
+                          options.rhel_repo = 'vault'
                           options.rhel_ver = '8.6'
                           options.rhel_kver = '4.18.0-372.32.1.el8_6'
                           break
                       case 'rhel8.9':
                           options.dockerfile = "dockerfiles/kernel-images-rhel8"
                           options.platforms = 'linux/amd64'
+                          options.rhel_repo = 'vault'
                           options.rhel_ver = '8.9'
                           options.rhel_kver = '4.18.0-513.24.1.el8_9'
                           break
+                      case 'rhel8.10':
+                          options.dockerfile = "dockerfiles/kernel-images-rhel8"
+                          options.platforms = 'linux/amd64'
+                          options.rhel_repo = 'pub'
+                          options.rhel_ver = '8.10'
+                          options.rhel_kver = '4.18.0-553.22.1.el8_10'
+                          break
                       default:
                           options.dockerfile = "dockerfiles/kernel-images"
                           options.platforms = 'linux/amd64,linux/arm64'
@@ -140,6 +149,7 @@ jobs:
      build-tag: quay.io/lvh-images/kernel-images-ci:${{ matrix.kernel.ver }}-${{ needs.conf.outputs.tag }}
      build-args: |
           "KERNEL_VER=${{ matrix.kernel.ver }}"
+          "RHEL_REPO=${{ matrix.kernel.rhel_repo }}"
           "RHEL_VER=${{ matrix.kernel.rhel_ver }}"
           "RHEL_KVER=${{ matrix.kernel.rhel_kver }}"
      check-files: '.'
@@ -212,6 +222,8 @@ jobs:
             kernel: {ver: "rhel8.6"}
           - runner: {name: "ubuntu-22.04-arm64", arch: "arm64"}
             kernel: {ver: "rhel8.9"}
+          - runner: {name: "ubuntu-22.04-arm64", arch: "arm64"}
+            kernel: {ver: "rhel8.10"}
     uses: ./.github/workflows/buildx-stage.yaml
     secrets: inherit
     with:
diff --git a/_data/kernels.json b/_data/kernels.json
index e246aa6b..d7b236fa 100644
--- a/_data/kernels.json
+++ b/_data/kernels.json
@@ -54,7 +54,9 @@
                  [ "--disable", "CONFIG_MODULE_SIG_ALL"],
                  [ "--disable", "CONFIG_IPV6_SEG6_LWTUNNEL" ],
                  [ "--enable", "CONFIG_RANDOMIZE_BASE" ],
-                 [ "--enable", "CONFIG_RELOCATABLE" ]
+                 [ "--enable", "CONFIG_RELOCATABLE" ],
+                 [ "--enable", "CONFIG_X86_64" ],
+                 [ "--disable", "CONFIG_EFI_MIXED" ]
             ]
         }
     ],
diff --git a/dockerfiles/kernel-images-rhel8 b/dockerfiles/kernel-images-rhel8
index 9e78ee04..6a20e52a 100644
--- a/dockerfiles/kernel-images-rhel8
+++ b/dockerfiles/kernel-images-rhel8
@@ -12,11 +12,12 @@ RUN dnf config-manager --set-enabled powertools
 
 FROM builder AS prepare
 
+ARG RHEL_REPO=vault
 ARG RHEL_VER=8.6
 ARG RHEL_KVER=4.18.0-372.32.1.el8_6
 
 WORKDIR /tmp
-RUN curl -LO "https://dl.rockylinux.org/vault/rocky/${RHEL_VER}/BaseOS/source/tree/Packages/k/kernel-${RHEL_KVER}.src.rpm"
+RUN curl -LO "https://dl.rockylinux.org/${RHEL_REPO}/rocky/${RHEL_VER}/BaseOS/source/tree/Packages/k/kernel-${RHEL_KVER}.src.rpm"
 RUN rpm -ivh kernel*.src.rpm
 
 WORKDIR /root/rpmbuild/SPECS