Do not compare minor distro versions

This commit is contained in:
Miloš Prchlík 2023-10-11 09:53:48 +02:00
commit 347d20d5d7
2 changed files with 8 additions and 8 deletions

View file

@ -53,12 +53,12 @@ adjust+:
KERNEL: kernel-core
- because: "python-devel has different names in different distros"
when: distro == rhel-8.9.0
when: distro == rhel-8.9
require+:
- python3-devel
- because: "python-devel has different names in different distros"
when: distro != rhel-8.9.0
when: distro != rhel-8.9
require+:
- python-devel

View file

@ -19,33 +19,33 @@ require+:
# Adjust rules
adjust+:
- because: "On RHEL-9.3.0 and newer, system binutils build extra binaries for cross compilation"
when: distro == rhel-9.3.0 and collection is not defined
when: distro == rhel-9.3 and collection is not defined
test: "$WITH_SCL ./test-rhel-9.3.0.sh"
- because: "On RHEL-9.3.0 and newer, system binutils build extra binaries for cross compilation"
when: distro == rhel-9.4.0 and collection is not defined
when: distro == rhel-9.4 and collection is not defined
test: "$WITH_SCL ./test-rhel-9.3.0.sh"
- because: "On RHEL-9.3.0 and newer, gcc-toolset-13 binutils build has extra directory levels"
when: distro == rhel-9.3.0 and collection == gcc-toolset-13
when: distro == rhel-9.3 and collection == gcc-toolset-13
test: "$WITH_SCL ./test-rhel-9.3.0.sh"
environment+:
CROSS_BINUTILS: "no"
- because: "On RHEL-9.3.0 and newer, gcc-toolset-13 binutils build has extra directory levels"
when: distro == rhel-9.4.0 and collection == gcc-toolset-13
when: distro == rhel-9.4 and collection == gcc-toolset-13
test: "$WITH_SCL ./test-rhel-9.3.0.sh"
environment+:
CROSS_BINUTILS: "no"
- because: "On RHEL-8.10.0 and newer, system binutils build extra binaries for cross compilation"
when: distro == rhel-8.10.0 and collection is not defined
when: distro == rhel-8.10 and collection is not defined
test: "$WITH_SCL ./test-rhel-9.3.0.sh"
environment+:
CROSS_BINUTILS: "no"
- because: "On RHEL-8.10.0 and newer, gcc-toolset-13 binutils build has extra directory levels"
when: distro == rhel-8.10.0 and collection == gcc-toolset-13
when: distro == rhel-8.10 and collection == gcc-toolset-13
test: "$WITH_SCL ./test-rhel-9.3.0.sh"
environment+:
CROSS_BINUTILS: "no"