Skip to content

feat: add support for RHEL/AlmaLinux/Rocky Linux 10 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 1, 2025
Merged

feat: add support for RHEL/AlmaLinux/Rocky Linux 10 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
- almalinux_9_appstream_1.22
- almalinux_9_appstream_1.24
- almalinux_9_appstream_1.26
- almalinux_10
arch:
- linux/amd64
- linux/arm64/v8
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
- almalinux_9_appstream_1.22
- almalinux_9_appstream_1.24
- almalinux_9_appstream_1.26
- almalinux_10
arch:
- linux/amd64
- linux/arm64/v8
Expand Down
14 changes: 10 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ Usage:
Options:
-d Debug mode.

Build for RHEL/AlmaLinux/Rocky Linux 10 + AppStream module:
build almalinux:10

Build for RHEL/AlmaLinux/Rocky Linux 9 + AppStream module:
build almalinux:9
build almalinux:9:appstream:1.22
Expand All @@ -75,6 +78,9 @@ Usage:
# EPEL 8 Modularity was going away on February 15, 2023
build almalinux:8:epel-modular:mainline

Build for RHEL/AlmaLinux/Rocky Linux 10 linux/arm64/v8(aarch64) + AppStream module:
build -p linux/arm64/v8 almalinux:10

Build for RHEL/AlmaLinux/Rocky Linux 9 linux/arm64/v8(aarch64) + AppStream module:
build -p linux/arm64/v8 almalinux:9
build -p linux/arm64/v8 almalinux:9:appstream:1.22
Expand All @@ -86,15 +92,15 @@ Usage:
You can build RPM packages in Docker.

```bash
# el9 + Non-modular package version
./build almalinux:9
# el10 + Non-modular package version
./build almalinux:10
```

- Debug shell

```bash
# el9 + debug shell
BUILD_HOSTNAME=el9.example.org ./build -d almalinux:9
# el10 + debug shell
BUILD_HOSTNAME=el10.example.org ./build -d almalinux:10
/pkg/build-rpm /pkg/rpmbuild nginx-module-fancyindex.spec

# el9 + linux/arm64/v8 + debug shell
Expand Down
6 changes: 6 additions & 0 deletions build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ Usage:
Options:
-d Debug mode.

Build for RHEL/AlmaLinux/Rocky Linux 10 + AppStream module:
${PACKAGER} almalinux:10

Build for RHEL/AlmaLinux/Rocky Linux 9 + AppStream module:
${PACKAGER} almalinux:9
${PACKAGER} almalinux:9:appstream:1.22
Expand All @@ -46,6 +49,9 @@ Usage:
# EPEL 8 Modularity was going away on February 15, 2023
${PACKAGER} almalinux:8:epel-modular:mainline

Build for RHEL/AlmaLinux/Rocky Linux 10 linux/arm64/v8(aarch64) + AppStream module:
${PACKAGER} -p linux/arm64/v8 almalinux:10

Build for RHEL/AlmaLinux/Rocky Linux 9 linux/arm64/v8(aarch64) + AppStream module:
${PACKAGER} -p linux/arm64/v8 almalinux:9
${PACKAGER} -p linux/arm64/v8 almalinux:9:appstream:1.22
Expand Down
8 changes: 4 additions & 4 deletions build-rpm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ if [[ ! -d SOURCES ]]; then
mkdir SOURCES
fi

if [[ "${RPM_DIST}" = ".el9" ]]; then
# el9 or later
spectool -g -a "SPECS/${SPEC_FILE_NAME}" -C SOURCES/
else
if [[ "${RPM_DIST}" = ".el8" ]]; then
# el8
spectool -g -A "SPECS/${SPEC_FILE_NAME}" -C SOURCES/
else
# el9 or later
spectool -g -a "SPECS/${SPEC_FILE_NAME}" -C SOURCES/
fi

echo "Building RPM files:"
Expand Down
14 changes: 11 additions & 3 deletions rpmbuild/SPECS/nginx-module-fancyindex.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@ Requires: nginx = %{nginx_epoch_version}:%{nginx_version}
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gd-devel
%if 0%{?rhel} == 7
BuildRequires: gperftools-devel
%endif
BuildRequires: libtool
BuildRequires: libxslt-devel
BuildRequires: nginx
BuildRequires: openssl-devel
%if 0%{?rhel} == 10
BuildRequires: pcre2-devel
%else
# el8 and el9
BuildRequires: pcre-devel
%endif
BuildRequires: perl-devel
BuildRequires: perl(ExtUtils::Embed)
BuildRequires: zlib-devel
Expand All @@ -46,7 +48,13 @@ Nginx module to use PAM for simple http authentication.

%build
cd %{_builddir}/nginx-%{nginx_version}
%if 0%{?rhel} == 10
# Fix ./configure: error: invalid option "--without-engine
./configure %(nginx -V 2>&1 | grep 'configure arguments' | sed -r 's@^[^:]+: @@' | sed 's/--without-engine //') --add-dynamic-module=../%{mod_base_dir}-%{version}
%else
# el8 and el9
./configure %(nginx -V 2>&1 | grep 'configure arguments' | sed -r 's@^[^:]+: @@') --add-dynamic-module=../%{mod_base_dir}-%{version}
%endif
make modules

%install
Expand Down
Loading