Skip to content

Commit 8c11ba4

Browse files
committed
T8099: Fix strongswan build
* Remove systemd-dev from dependencies * Add `set -e` to build_cmd. Strongswan depends on `systemd` and `systemd-dev`, installing both fails with: ``` The following packages have unmet dependencies: systemd-dev : Breaks: systemd (< 253-2~) but 252.39-1~deb12u2 is to be installed E: Unable to correct problems, you have held broken packages. ``` `systemd-dev` contains pkg-config files for systemd and udev, but current `systemd` package installs identical `/usr/share/pkgconfig/systemd.pc` - maybe that's why packages cannot be installed simultaneously. So remove it from dependencies. Though the package failed to build, `./build.py` returned 0 as `build_cmd` has two build commands one after another without any checks of exit value of first one that builds strongswan. Added `set -e` so that any failure in any of commands results to build failure.
1 parent 0b27f39 commit 8c11ba4

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

scripts/package-build/strongswan/package.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@ name = "strongswan"
33
commit_id = "debian/5.9.11-2"
44
scm_url = "https://salsa.debian.org/debian/strongswan.git"
55

6+
# systemd now contains pkg-config files and systemd-dev is not needed
7+
# this changes debian/control so the change is needed before mk-build-deps
8+
# call so cannot be included in normal patches
9+
pre_build_hook = "sed -i '/ systemd-dev /d' debian/control"
10+
611
# build_cmd = "cd ..; yes | ./build.sh; ./build-vici.sh"
712
build_cmd = """
13+
set -e
814
export DEBEMAIL="maintainers@vyos.net"
915
export DEBFULLNAME="VyOS Package Maintainers"
1016

0 commit comments

Comments
 (0)