From 5e855aec2fa34d20f28353d5996b4ea5d677d52a Mon Sep 17 00:00:00 2001 From: Balazs Scheidler Date: Fri, 24 May 2024 11:01:39 +0200 Subject: [PATCH 1/2] packaging/rhel: add fixes to adjust to AlmaLinux:9 Use Python 3.11 Signed-off-by: Balazs Scheidler --- packaging/rhel/axosyslog.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packaging/rhel/axosyslog.spec b/packaging/rhel/axosyslog.spec index 55044ddcad..a320ec6eae 100644 --- a/packaging/rhel/axosyslog.spec +++ b/packaging/rhel/axosyslog.spec @@ -27,6 +27,10 @@ Source4: syslog-ng.logrotate7 %bcond_without mqtt +%if 0%{?rhel} == 9 +%global python_devel python3.11-devel +%global py_ver 3.11 +%else %if 0%{?rhel} == 8 %global python_devel python39-devel %global py_ver 3.9 @@ -39,6 +43,7 @@ Source4: syslog-ng.logrotate7 %global py_ver %{python3_version} %endif %endif +%endif %if 0%{?rhel} >= 7 || 0%{?fedora} <= 32 %bcond_without java @@ -371,6 +376,9 @@ make DESTDIR=%{buildroot} install %if 0%{?rhel} == 8 %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/syslog %endif +%if 0%{?rhel} >= 9 +%{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/syslog-ng +%endif %if 0%{?fedora} >= 28 %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/syslog-ng %endif From e7b0205638165bd382f6050a46c9d89c7a04494a Mon Sep 17 00:00:00 2001 From: Balazs Scheidler Date: Sat, 1 Jun 2024 09:00:24 +0200 Subject: [PATCH 2/2] dbld: add almalinux-9 as distro Signed-off-by: Balazs Scheidler --- .github/workflows/create-packages.yml | 1 + .github/workflows/dbld-images.yml | 1 + .github/workflows/packages.yml | 1 + dbld/Makefile.am | 1 + dbld/build.manifest | 3 ++- dbld/builddeps | 11 +++++++++-- dbld/images/almalinux-9.dockerfile | 25 +++++++++++++++++++++++++ dbld/rules | 1 + packaging/rhel/axosyslog.spec | 2 ++ 9 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 dbld/images/almalinux-9.dockerfile diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml index a4d402101a..450b1cd767 100644 --- a/.github/workflows/create-packages.yml +++ b/.github/workflows/create-packages.yml @@ -24,6 +24,7 @@ on: "ubuntu-lunar", "ubuntu-mantic", "almalinux-8", + "almalinux-9", "fedora-39", "fedora-40" ]' diff --git a/.github/workflows/dbld-images.yml b/.github/workflows/dbld-images.yml index def841331b..9f5df371f7 100644 --- a/.github/workflows/dbld-images.yml +++ b/.github/workflows/dbld-images.yml @@ -29,6 +29,7 @@ jobs: strategy: matrix: image: + - almalinux-9 - almalinux-8 - fedora-39 - fedora-40 diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index d313ef6e25..5750d2de83 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -35,6 +35,7 @@ jobs: dbld-image-mode: cache distros: '[ "almalinux-8", + "almalinux-9", "debian-bookworm", "debian-testing", "fedora-40", diff --git a/dbld/Makefile.am b/dbld/Makefile.am index 5e5282a5ae..9b10b87252 100644 --- a/dbld/Makefile.am +++ b/dbld/Makefile.am @@ -27,6 +27,7 @@ EXTRA_DIST += \ dbld/images/centos.prepare.sh \ dbld/images/fedora.prepare.sh \ dbld/images/almalinux-8.dockerfile \ + dbld/images/almalinux-9.dockerfile \ dbld/images/devshell.dockerfile \ dbld/images/fedora-39.dockerfile \ dbld/images/fedora-40.dockerfile \ diff --git a/dbld/build.manifest b/dbld/build.manifest index cce5885ef3..794738f50b 100644 --- a/dbld/build.manifest +++ b/dbld/build.manifest @@ -42,4 +42,5 @@ ubuntu-lunar python3 ubuntu-mantic python3 fedora python3 -almalinux python3,noriemann,nokafka,nomqtt,nojava +almalinux-8 python3,noriemann,nokafka,nomqtt,nojava +almalinux-9 python3,nojava,nosql diff --git a/dbld/builddeps b/dbld/builddeps index 5f2e0083a4..ef7f79e0f6 100755 --- a/dbld/builddeps +++ b/dbld/builddeps @@ -113,8 +113,15 @@ function add_copr_repo { # PIP installation later. case "${OS_DISTRIBUTION}" in centos|almalinux) - $YUM_INSTALL yum-plugin-copr - yum config-manager --set-enabled powertools + case "${OS_DISTRIBUTION_CODE_NAME}" in + 8) + $YUM_INSTALL yum-plugin-copr + yum config-manager --set-enabled powertools + ;; + 9) + dnf config-manager --set-enabled crb + ;; + esac ;; fedora) $DNF_INSTALL -y dnf-plugins-core diff --git a/dbld/images/almalinux-9.dockerfile b/dbld/images/almalinux-9.dockerfile new file mode 100644 index 0000000000..dd8cc8d085 --- /dev/null +++ b/dbld/images/almalinux-9.dockerfile @@ -0,0 +1,25 @@ +FROM almalinux:9 +LABEL maintainer="Laszlo Varady , Balazs Scheidler " +ENV OS_DISTRIBUTION=almalinux +ENV OS_DISTRIBUTION_CODE_NAME=9 + +ARG ARG_IMAGE_PLATFORM +ARG COMMIT +ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +LABEL COMMIT=${COMMIT} + +COPY images/entrypoint.sh / +COPY . /dbld/ + +RUN /dbld/builddeps install_dbld_dependencies +RUN /dbld/builddeps add_epel_repo +RUN /dbld/builddeps add_copr_repo +RUN /dbld/builddeps install_yum_packages +RUN /dbld/builddeps install_rpm_build_deps + +RUN /dbld/builddeps install_criterion + +VOLUME /source +VOLUME /build + +ENTRYPOINT ["/entrypoint.sh"] diff --git a/dbld/rules b/dbld/rules index f764617d09..a2ddc2a459 100755 --- a/dbld/rules +++ b/dbld/rules @@ -2,6 +2,7 @@ BUILDER_IMAGES= \ almalinux-8 \ + almalinux-9 \ fedora-39 \ fedora-40 \ debian-stretch \ diff --git a/packaging/rhel/axosyslog.spec b/packaging/rhel/axosyslog.spec index a320ec6eae..5a17407012 100644 --- a/packaging/rhel/axosyslog.spec +++ b/packaging/rhel/axosyslog.spec @@ -69,7 +69,9 @@ BuildRequires: glib2-devel BuildRequires: ivykis-devel BuildRequires: json-c-devel BuildRequires: libcap-devel +%if 0%{?rhel} <= 8 BuildRequires: libdbi-devel +%endif BuildRequires: libnet-devel BuildRequires: openssl-devel BuildRequires: pcre2-devel