Skip to content

Commit 7cc2e06

Browse files
fix: remove net-tools from BuildRequires to fix Fedora 43 build
On Fedora 43, net-tools pulls in systemd which conflicts with systemd-standalone-tmpfiles in container build environments. Pre-define ZM_PATH_ARP, ZM_PATH_ARP_SCAN, ZM_PATH_IP, and ZM_PATH_IFCONFIG in the cmake call instead of relying on find_program() at build time. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 63410fb commit 7cc2e06

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

.github/workflows/build-rpm-packages-aarch64.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ jobs:
6565
- name: Install build tools
6666
run: |
6767
set -eux
68+
# Install systemd to resolve conflicts with systemd-standalone-tmpfiles
69+
# in container images (needed by net-tools, mosquitto, etc.)
70+
dnf -y --allowerasing install systemd
6871
dnf -y install \
6972
arp-scan \
7073
git \
@@ -82,6 +85,7 @@ jobs:
8285
- name: Setup RPM build directory
8386
run: |
8487
set -eux
88+
rm -rf ~/rpmbuild
8589
rpmdev-setuptree
8690
8791
- name: Checkout

.github/workflows/build-rpm-packages.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ jobs:
6363
- name: Install build tools
6464
run: |
6565
set -eux
66+
# Install systemd to resolve conflicts with systemd-standalone-tmpfiles
67+
# in container images (needed by net-tools, mosquitto, etc.)
68+
dnf -y --allowerasing install systemd
6669
dnf -y install \
6770
arp-scan \
6871
git \
@@ -80,6 +83,7 @@ jobs:
8083
- name: Setup RPM build directory
8184
run: |
8285
set -eux
86+
rm -rf ~/rpmbuild
8387
rpmdev-setuptree
8488
8589
- name: Checkout

distros/redhat/zoneminder.spec

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ BuildRequires: pcre2-devel
5555
BuildRequires: libjpeg-turbo-devel
5656
BuildRequires: findutils
5757
BuildRequires: coreutils
58-
BuildRequires: net-tools
58+
# net-tools intentionally omitted from BuildRequires to avoid
59+
# systemd conflicts in container build environments.
60+
# Paths are pre-defined in the cmake call below instead.
5961
BuildRequires: perl
6062
BuildRequires: perl-generators
6163
BuildRequires: perl(Archive::Tar)
@@ -225,6 +227,10 @@ mv -f CxxUrl-%{CxxUrl_version} ./dep/CxxUrl
225227
-DZM_WEB_USER="%{zmuid_final}" \
226228
-DZM_WEB_GROUP="%{zmgid_final}" \
227229
-DZM_TARGET_DISTRO="%{zmtargetdistro}" \
230+
-DZM_PATH_ARP="/usr/sbin/ip neigh" \
231+
-DZM_PATH_ARP_SCAN="/usr/sbin/arp-scan" \
232+
-DZM_PATH_IP="/usr/sbin/ip" \
233+
-DZM_PATH_IFCONFIG="/usr/sbin/ifconfig" \
228234
.
229235

230236
%cmake_build

0 commit comments

Comments
 (0)