Skip to content
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

Jump to bottom

packaging/rhel: add fixes to adjust to AlmaLinux:9 #125

Merged
merged 2 commits into from
Jun 4, 2024
Merged

packaging/rhel: add fixes to adjust to AlmaLinux:9 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e855ae
packaging/rhel: add fixes to adjust to AlmaLinux:9
bazsi May 24, 2024
e7b0205
dbld: add almalinux-9 as distro
bazsi Jun 1, 2024
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/create-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ on:
"ubuntu-lunar",
"ubuntu-mantic",
"almalinux-8",
"almalinux-9",
"fedora-39",
"fedora-40"
]'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dbld-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
strategy:
matrix:
image:
- almalinux-9
- almalinux-8
- fedora-39
- fedora-40
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
dbld-image-mode: cache
distros: '[
"almalinux-8",
"almalinux-9",
"debian-bookworm",
"debian-testing",
"fedora-40",
Expand Down
1 change: 1 addition & 0 deletions dbld/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion dbld/build.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 9 additions & 2 deletions dbld/builddeps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 25 additions & 0 deletions dbld/images/almalinux-9.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
FROM almalinux:9
LABEL maintainer="Laszlo Varady <[email protected]>, Balazs Scheidler <[email protected]>"
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"]
1 change: 1 addition & 0 deletions dbld/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

BUILDER_IMAGES= \
almalinux-8 \
almalinux-9 \
fedora-39 \
fedora-40 \
debian-stretch \
Expand Down
10 changes: 10 additions & 0 deletions packaging/rhel/axosyslog.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -64,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
Expand Down Expand Up @@ -371,6 +378,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
Expand Down
Loading