diff options
| author | Kyrylo Yatsenko <hedrok@gmail.com> | 2026-06-04 14:54:46 +0300 |
|---|---|---|
| committer | Kyrylo Yatsenko <hedrok@gmail.com> | 2026-06-10 13:37:55 +0300 |
| commit | 8c11ba45aed4374fb7d683f75dd4dac9ce595d13 (patch) | |
| tree | 7f01ca156a35c29a72014ee854d5e9bb03ba33ce /scripts | |
| parent | 0b27f39ae61acc644d31687ffca6ef85f0123c04 (diff) | |
| download | vyos-build-8c11ba45aed4374fb7d683f75dd4dac9ce595d13.tar.gz vyos-build-8c11ba45aed4374fb7d683f75dd4dac9ce595d13.zip | |
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.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/package-build/strongswan/package.toml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/package-build/strongswan/package.toml b/scripts/package-build/strongswan/package.toml index a5722062..f7fae186 100644 --- a/scripts/package-build/strongswan/package.toml +++ b/scripts/package-build/strongswan/package.toml @@ -3,8 +3,14 @@ name = "strongswan" commit_id = "debian/5.9.11-2" scm_url = "https://salsa.debian.org/debian/strongswan.git" +# systemd now contains pkg-config files and systemd-dev is not needed +# this changes debian/control so the change is needed before mk-build-deps +# call so cannot be included in normal patches +pre_build_hook = "sed -i '/ systemd-dev /d' debian/control" + # build_cmd = "cd ..; yes | ./build.sh; ./build-vici.sh" build_cmd = """ +set -e export DEBEMAIL="maintainers@vyos.net" export DEBFULLNAME="VyOS Package Maintainers" |