fanhuadesenlinnn/openssh-rpms
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/boypt/openssh-rpms.git synced 2026-09-20 08:03:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

docs: align UOS20 to EL8 image and map Recommended RPMs to CI artifacts

Browse Source 
- README.md table: replace meaningless aarch64_el7/8/9 tags with actual CI
  artifacts (rpm-el5-x86_64/i686, rpm-el6-x86_64, rpm-el7/8/9-*,
  rpm-uos20-*), fuzzy version via artifact name; fix UOS20 row from
  aarch64_el7 to rpm-uos20-*
- README.md: UOS20=1 ./compile.sh el7 -> el8 (spec remains el7 via
  GUESS_DIST), anchor #uos-20-variant-el7-family -> #uos-20-variant-el8
- docker/README.md: UOS 20 Variant (EL7-family) -> (EL8), reuse EL7
  image / Dockerfile.centos:7 -> reuse EL8 image via
  Dockerfile.centos-stream:8 (with GUESS_DIST note), uos20- -> uos20.,
  build-args table EL7 -> EL8
This commit is contained in:
boypt
2026-08-21 12:09:34 +08:00
parent ad677a79a3
commit 7ae3bb4d1e
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
README.md
View File

@@ -6,26 +6,26 @@ Similar Project: [Backport OpenSSH for Debian / Ubuntu distros](https://github.c
## Supported (tested) Distro:
| Distro | Version | Arch | Recommanded EL RPMs |
|----------------|----------------|---------------------|-----------------------------------|
| CentOS | 5 | x86_64 / i686 | EL 5 |
| CentOS | 6 | x86_64 | EL 6 |
| CentOS | 7 | x86_64 / aarch64 | EL 7 (`aarch64_el7`) |
| CentOS | 8 | x86_64 / aarch64 | EL 8 (`aarch64_el8`) |
| CentOS Stream | 8 | x86_64 / aarch64 | EL 8 (`aarch64_el8`) |
| CentOS Stream | 9 | x86_64 / aarch64 | EL 9 (`aarch64_el9`) |
| Rocky Linux | 8 | x86_64 / aarch64 | EL 8 (`aarch64_el8`) |
| Rocky Linux | 9 | x86_64 / aarch64 | EL 9 (`aarch64_el9`) |
| Amazon Linux | 1 | x86_64 | EL 6 |
| Amazon Linux | 2 | x86_64 / aarch64 | EL 7 (`aarch64_el7`) |
| Amazon Linux | 2023 | x86_64 / aarch64 | EL 9 (`aarch64_el9`) |
| UnionTech UOS | V20 | x86_64 / aarch64 | **UOS20** (`aarch64_el7`) |
| openEuler | 20.03 | x86_64 / aarch64 | EL 8 (`aarch64_el8`) |
| openEuler | 22.03 | x86_64 / aarch64 | EL 8 (`aarch64_el8`) |
| openEuler | 24.03 | x86_64 / aarch64 | EL 9 (`aarch64_el9`) |
| AnolisOS | 7 | x86_64 / aarch64 | EL 7 (`aarch64_el7`) |
| AnolisOS | 8 | x86_64 / aarch64 | EL 8 (`aarch64_el8`) |
| AnolisOS | 2023 | x86_64 / aarch64 | EL 9 (`aarch64_el9`) |
| Distro | Version | Arch | Recommanded EL RPMs |
|================|================|=====================|======================================================================|
| CentOS | 5 | x86_64 / i686 | EL 5 (`rpm-el5-x86_64`, `rpm-el5-i686`) |
| CentOS | 6 | x86_64 | EL 6 (`rpm-el6-x86_64`) |
| CentOS | 7 | x86_64 / aarch64 | EL 7 (`rpm-el7-x86_64`, `rpm-el7-aarch64`) |
| CentOS | 8 | x86_64 / aarch64 | EL 8 (`rpm-el8-x86_64`, `rpm-el8-aarch64`) |
| CentOS Stream | 8 | x86_64 / aarch64 | EL 8 (`rpm-el8-x86_64`, `rpm-el8-aarch64`) |
| CentOS Stream | 9 | x86_64 / aarch64 | EL 9 (`rpm-el9-x86_64`, `rpm-el9-aarch64`) |
| Rocky Linux | 8 | x86_64 / aarch64 | EL 8 (`rpm-el8-x86_64`, `rpm-el8-aarch64`) |
| Rocky Linux | 9 | x86_64 / aarch64 | EL 9 (`rpm-el9-x86_64`, `rpm-el9-aarch64`) |
| Amazon Linux | 1 | x86_64 | EL 6 (`rpm-el6-x86_64`) |
| Amazon Linux | 2 | x86_64 / aarch64 | EL 7 (`rpm-el7-x86_64`, `rpm-el7-aarch64`) |
| Amazon Linux | 2023 | x86_64 / aarch64 | EL 9 (`rpm-el9-x86_64`, `rpm-el9-aarch64`) |
| UnionTech UOS | V20 | x86_64 / aarch64 | **UOS20** (`rpm-uos20-x86_64`, `rpm-uos20-aarch64`) |
| openEuler | 20.03 | x86_64 / aarch64 | EL 8 (`rpm-el8-x86_64`, `rpm-el8-aarch64`) |
| openEuler | 22.03 | x86_64 / aarch64 | EL 8 (`rpm-el8-x86_64`, `rpm-el8-aarch64`) |
| openEuler | 24.03 | x86_64 / aarch64 | EL 9 (`rpm-el9-x86_64`, `rpm-el9-aarch64`) |
| AnolisOS | 7 | x86_64 / aarch64 | EL 7 (`rpm-el7-x86_64`, `rpm-el7-aarch64`) |
| AnolisOS | 8 | x86_64 / aarch64 | EL 8 (`rpm-el8-x86_64`, `rpm-el8-aarch64`) |
| AnolisOS | 2023 | x86_64 / aarch64 | EL 9 (`rpm-el9-x86_64`, `rpm-el9-aarch64`) |
> `aarch64` RPMs are built from the same `el7/` spec via `aarch64_el7/8/9` Docker tags (`ghcr.io/boypt/openssh-rpms:aarch64_el7` etc., QEMU-built, per-arch tags — not multi-arch manifests).
@@ -173,13 +173,13 @@ which closes the target fd before each `dup2()` in `sshd.c`), set
`UOS20=1`:
```bash
UOS20=1 ./compile.sh el7
UOS20=1 ./compile.sh el8
```
The flag also prefixes `PKGREL` with `uos20.` so the resulting RPMs are distinguishable from the standard build (e.g. PKGREL `1` becomes `uos20.1`, producing `openssh-XXXXX-uos20.1.el7.x86_64.rpm`). The patch is only
applied when the `uos20` macro is set, so ordinary EL7/8/9 builds are
unaffected. For the Docker-based build, see
[docker/README.md](docker/README.md#uos-20-variant-el7-family).
[docker/README.md](docker/README.md#uos-20-variant-el8).
### Install on uniontech UOS 20

10
docker/README.md
View File

@@ -57,13 +57,13 @@ docker build -t elssh:el7 -f ./docker/Dockerfile.centos --build-arg VERSION_NUM=
docker run --rm -v .:/data elssh:el7
```
#### UOS 20 Variant (EL7-family)
#### UOS 20 Variant (EL8)
Reuse the EL7 image and pass `UOS20=1` to enable the kernel-panic fix in `sshd.c` and prefix `PKGREL` with `uos20-` (so the resulting RPMs are distinguishable from the standard build).
Reuse the EL8 image (CentOS Stream 8, `el7/` spec via `GUESS_DIST` mapping) and pass `UOS20=1` to enable the kernel-panic fix in `sshd.c` and prefix `PKGREL` with `uos20.` (so the resulting RPMs are distinguishable from the standard build).
```bash
docker build -t elssh:el7 -f ./docker/Dockerfile.centos --build-arg VERSION_NUM=7 .
docker run --rm -v .:/data -e "UOS20=1" elssh:el7
docker build -t elssh:el8 -f ./docker/Dockerfile.centos-stream --build-arg VERSION_NUM=8 .
docker run --rm -v .:/data -e "UOS20=1" elssh:el8
```
#### For EL8 (CentOS 8 / RHEL 8 / Rocky 8 / AlmaLinux 8)
@@ -110,7 +110,7 @@ docker run --rm -v .:/data --platform linux/arm64 elssh_aarch64:el9
|-------------------|--------|-----------|
| `VERSION_NUM` | 6,7,8,9| Specifies the target EL version (used in most Dockerfiles) |
| `M32` (EL5 only) | 0 or 1 | `0` = 64-bit, `1` = 32-bit |
| `UOS20` | 0 or 1 | `1` = build the UOS 20 variant (EL7 image); enables the kernel-panic patch and prefixes `PKGREL` with `uos20.` |
| `UOS20` | 0 or 1 | `1` = build the UOS 20 variant (EL8 image); enables the kernel-panic patch and prefixes `PKGREL` with `uos20.` |
> Note: Standalone Dockerfiles for Amazon Linux / openEuler / Rocky Linux have been consolidated into the generic EL images (reusing EL8/EL9 via glibc compatibility) and are no longer maintained separately.