From 85035160a33d0fcae37aa5c2f2dcba3ca71c10f9 Mon Sep 17 00:00:00 2001 From: Ben Morrice <ben.morrice@cern.ch> Date: Tue, 22 Apr 2025 11:34:40 +0200 Subject: [PATCH] Update ELS documentation --- docs/distributions/els7.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/distributions/els7.md b/docs/distributions/els7.md index 87edb00..47017e4 100644 --- a/docs/distributions/els7.md +++ b/docs/distributions/els7.md @@ -70,14 +70,14 @@ The disttag is determined from the source rpm. Whilst most packages will be `.el | tag | disttag | buildsys_package | external repos (in order of priority) | |--------------|-----------|---------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------| -| els7 | `.el7` | `buildsys-macros-el7` | rhel7-os, rhel7-optional, rhel7-devtools, rhel7-sclo, linuxsupport7-stable, epel7, buildsys7 | -| els7_9 | `.el7_9` | `buildsys-macros-el7_9` | rhel7-os, rhel7-optional, rhel7-devtools, rhel7-sclo, linuxsupport7-stable, epel7, buildsys7 | -| els7_i386 | `.el7` | `buildsys-macros-el7` | centos7-dependency-fixes-i386, centos7-base-i386, centos7-updates-i386, rhel7-os, rhel7-optional, rhel7-devtools, rhel7-sclo, linuxsupport7-stable, epel7, buildsys7 | -| els7_9_i386 | `.el7_9` | `buildsys-macros-el7_9` | centos7-dependency-fixes-i386, centos7-base-i386, centos7-updates-i386, rhel7-os, rhel7-optional, rhel7-devtools, rhel7-sclo, linuxsupport7-stable, epel7, buildsys7 | +| els7 | `.el7` | `buildsys-macros-el7` | centos7-dependency-fixes, rhel7-os, rhel7-optional, rhel7-devtools, rhel7-sclo, linuxsupport7-stable, epel7, buildsys7 | +| els7_9 | `.el7_9` | `buildsys-macros-el7_9` | centos7-dependency-fixes, rhel7-os, rhel7-optional, rhel7-devtools, rhel7-sclo, linuxsupport7-stable, epel7, buildsys7 | +| els7_i386 | `.el7` | `buildsys-macros-el7` | centos7-dependency-fixes, centos7-base-i386, centos7-updates-i386, rhel7-os, rhel7-optional, rhel7-devtools, rhel7-sclo, linuxsupport7-stable, epel7, buildsys7 | +| els7_9_i386 | `.el7_9` | `buildsys-macros-el7_9` | centos7-dependency-fixes, centos7-base-i386, centos7-updates-i386, rhel7-os, rhel7-optional, rhel7-devtools, rhel7-sclo, linuxsupport7-stable, epel7, buildsys7 | Some of the above external repos may not be completely intuitive, thus the outliers are documented here: -* [centos7-dependency-fixes-i386](https://linuxsoft.cern.ch/enterprise/centos7-i386/): Contains recent versions of `tzdata` to avoid missing package dependencies with base/updates within the `centos7-base-i386` / `centos7-updates-i386` external repos. These mismatches were seen most recently when attempting to build `java-1.8.0-openjdk` which required `tzdata >= 2024` and was not "seen" by koji as the version of `tzdata` from base was taken as precedence +* [centos7-dependency-fixes](https://linuxsoft.cern.ch/enterprise/centos7-dependency-fixes/): Contains recent versions of `tzdata` to avoid missing package dependencies with base/updates external repos. These mismatches were seen most recently when attempting to build `java-1.8.0-openjdk` which required `tzdata >= 2025` and was not "seen" by koji as the version of `tzdata` from base was taken as precedence * [centos7-base-i386](https://linuxsoft.cern.ch/centos-vault/altarch/7/os/i386/): Base from "CentOS 7 alternative architecture (i686)" (required for multilib package builds on _i386 tags) * [centos7-updates-i386](https://linuxsoft.cern.ch/centos-vault/altarch/7/updates/i386/): Updates from "CentOS 7 alternative architecture (i686)" (required for multilib package builds on _i386 tags) * [linuxsupport7-stable](https://linuxsoft.cern.ch/internal/repos/linuxsupport7-stable): includes a EL7 `rust` [build](https://gitlab.cern.ch/linuxsupport/rpms/rust) (required to build firefox on EL7) -- GitLab