From e973ac70e0d5cb0f2feff6a5df25744cc6916f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= <mprchlik@redhat.com>
Date: Thu, 19 Oct 2023 13:08:44 +0200
Subject: [PATCH] Tweak requires of kernel rebuild for RHEL-8

---
 tests/rebuilds/kernel/main.fmf | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/rebuilds/kernel/main.fmf b/tests/rebuilds/kernel/main.fmf
index 7f590c4..1e47cb7 100644
--- a/tests/rebuilds/kernel/main.fmf
+++ b/tests/rebuilds/kernel/main.fmf
@@ -29,7 +29,6 @@ require+:
   - rng-tools
   - newt-devel
   - perl-ExtUtils-Embed
-  - unifdef
   - elfutils-libelf-devel
   - elfutils-devel
   - pciutils-devel
@@ -39,7 +38,6 @@ require+:
   - glibc-static
   - texinfo
   - gdb
-  - ecj
   - graphviz
   - gmp-devel
   - mpfr-devel
@@ -54,12 +52,12 @@ adjust+:
         KERNEL: kernel-core
 
   - because: "python-devel has different names in different distros"
-    when: distro == rhel-8.9
+    when: distro >= rhel-8.6 and distro <= rhel-8.9
     require+:
       - python3-devel
 
   - because: "python-devel has different names in different distros"
-    when: distro != rhel-8.9
+    when: distro < rhel-8.6 and distro > rhel-8.9
     require+:
       - python-devel
 
@@ -68,6 +66,16 @@ adjust+:
     require+:
       - pesign
 
+  - because: "unifdef is available with RHEL-8.9 and newer"
+    when: distro >= rhel-8.9
+    require+:
+      - unifdef
+
+  - because: "ecj is available with RHEL-8.8 and newer"
+    when: distro >= rhel-8.8
+    require+:
+      - ecj
+
   - because: "kernel rebuild fails because of discovering build issues"
     when: collection == gcc-toolset-13
     enabled: false