shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-26 14:04:03 +03:00
Code

Merge pull request #31224 from mrc0mmand/packit-bpftool-workaround

Browse Source 
packit: temporarily build systemd without BPF stuff
This commit is contained in:
Luca Boccassi 2024-02-09 13:48:13 +00:00 committed by GitHub
commit 9131b93590
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.packit.yml
View File

@ -44,6 +44,10 @@ actions:
# Temporarily add libarchive-devel build dep and libarchive runtime dep
# until the change propagates to Rawhide's specfile
- "sed -ri '0,/^BuildRequires: .+$/s//&\\nBuildRequires: libarchive-devel\\nRequires: libarchive/' .packit_rpm/systemd.spec"
# FIXME: temporarily build without BPF stuff, since there's currently no
# bpftool package in Rawhide (at least not until [0] lands)
# [0] https://bodhi.fedoraproject.org/updates/FEDORA-2024-bb73636f1d
- "sed -nri '1N;2N;/\\nBuildRequires:\\s+bpftool$/{N;N;d};P;N;D' .packit_rpm/systemd.spec"
jobs:
- job: copr_build

3
src/test/test-path.c
View File

@ -100,7 +100,8 @@ static int _check_states(unsigned line,
service_state_to_string(service->state),
service_result_to_string(service->result));
if (service->state == SERVICE_FAILED && service->main_exec_status.status == EXIT_CGROUP) {
if (service->state == SERVICE_FAILED &&
(service->main_exec_status.status == EXIT_CGROUP || service->result == SERVICE_FAILURE_RESOURCES)) {
const char *ci = ci_environment();
/* On a general purpose system we may fail to start the service for reasons which are