code_public/ja4-platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(rpm): add systemd-rpm-macros to Dockerfile.package, fix correlator spec_version

Browse Source 
- sentinel/correlator: install systemd-rpm-macros in rpm-builder stage
- correlator: use build_version macro (not version) to avoid recursive expansion
- mod-reqin-log: fix ctest --test-dir to find tests in build/tests/

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
toto
2026-04-09 22:33:53 +02:00
parent ea488c0b11
commit 6d64c2a8a8
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/correlator/Dockerfile.package
View File

@ -43,7 +43,7 @@ WORKDIR /package
ARG VERSION=dev
RUN dnf install -y rpm-build rpmdevtools && dnf clean all
RUN dnf install -y rpm-build rpmdevtools systemd-rpm-macros && dnf clean all
RUN mkdir -p /root/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} && \
mkdir -p /packages/rpm/{el8,el9,el10}
@ -71,7 +71,7 @@ COPY services/correlator/packaging/rpm/logcorrelator.spec /root/rpmbuild/SPECS/l
# el8
RUN rpmbuild --define "_topdir /root/rpmbuild" \
--define "dist .el8" \
--define "version ${VERSION}" \
--define "build_version ${VERSION}" \
--target x86_64 \
-bb /root/rpmbuild/SPECS/logcorrelator.spec && \
cp /root/rpmbuild/RPMS/x86_64/*.el8.x86_64.rpm /packages/rpm/el8/
@ -79,7 +79,7 @@ RUN rpmbuild --define "_topdir /root/rpmbuild" \
# el9
RUN rpmbuild --define "_topdir /root/rpmbuild" \
--define "dist .el9" \
--define "version ${VERSION}" \
--define "build_version ${VERSION}" \
--target x86_64 \
-bb /root/rpmbuild/SPECS/logcorrelator.spec && \
cp /root/rpmbuild/RPMS/x86_64/*.el9.x86_64.rpm /packages/rpm/el9/
@ -87,7 +87,7 @@ RUN rpmbuild --define "_topdir /root/rpmbuild" \
# el10
RUN rpmbuild --define "_topdir /root/rpmbuild" \
--define "dist .el10" \
--define "version ${VERSION}" \
--define "build_version ${VERSION}" \
--target x86_64 \
-bb /root/rpmbuild/SPECS/logcorrelator.spec && \
cp /root/rpmbuild/RPMS/x86_64/*.el10.x86_64.rpm /packages/rpm/el10/

4
services/correlator/packaging/rpm/logcorrelator.spec
View File

@ -15,8 +15,8 @@ Packager: logcorrelator <dev@example.com>
BuildArch: x86_64
# Version macro with safe fallback
%if %{defined version}
%define spec_version %{version}
%if %{defined build_version}
%define spec_version %{build_version}
%else
%define spec_version 1.1.22
%endif