Skip to content

Commit 0e29e31

Browse files
chore(core): self-build gnutls (#975)
Build the gnutls package and replace it in virt-launcher image. --------- Signed-off-by: Nikita Korolev <nikita.korolev@flant.com> Co-authored-by: Maxim Fedotov <maksim.fedotov@flant.com>
1 parent b54fae1 commit 0e29e31

4 files changed

Lines changed: 67 additions & 4 deletions

File tree

component_versions/version_map.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ package:
99
nftables: 1.1.3
1010
openssl: openssl-3.4.1
1111
nbdkit: 1.39.5
12+
gnutls: 3.8.6
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
---
2+
image: {{ $.ImageType }}/{{ $.ImageName }}
3+
final: false
4+
fromImage: builder/scratch
5+
import:
6+
- image: {{ $.ImageType }}/{{ $.ImageName }}-builder
7+
add: /out
8+
to: /gnutls
9+
before: setup
10+
11+
---
12+
{{- $version := get $.Package $.ImageName }}
13+
{{- $gitRepoUrl := "gnutls/gnutls.git" }}
14+
15+
{{- $name := print $.ImageName "-dependencies" -}}
16+
{{- define "$name" -}}
17+
packages:
18+
- gcc git gperf glibc-devel-static wget
19+
- make autoconf automake libtool makeinfo gettext-devel patch
20+
- perl-Net-SSLeay perl-IPC-Cmd perl-Pod-Html
21+
- gem-gettext-devel gettext po4a
22+
- libnettle-devel libp11-kit-devel libunistring-devel
23+
- libtpm2-tss-devel libtrousers-devel libbrotli-devel
24+
- libtasn1-devel libtasn1-utils libidn2-devel zlib-devel
25+
- libunbound-devel bison gtk-doc texinfo texlive
26+
- libev4 libev-devel libgcrypt-devel libopencdk-devel
27+
{{- end -}}
28+
29+
{{ $builderDependencies := include "$name" . | fromYaml }}
30+
31+
image: {{ $.ImageType }}/{{ $.ImageName }}-builder
32+
final: false
33+
fromImage: builder/alt
34+
secrets:
35+
- id: SOURCE_REPO
36+
value: {{ $.SOURCE_REPO }}
37+
shell:
38+
beforeInstall:
39+
- |
40+
apt-get update && apt-get install -y \
41+
{{ $builderDependencies.packages | join " " }}
42+
apt-get clean
43+
rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
44+
45+
install:
46+
- |
47+
OUTDIR=/out
48+
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
49+
50+
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
51+
cd /src
52+
53+
./bootstrap
54+
55+
./configure --prefix=/usr --libdir=/usr/lib64 --disable-tests
56+
57+
make -j$(nproc)
58+
59+
make DESTDIR=$OUTDIR install-strip

images/packages/binaries/numactl/werf.inc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,3 @@ shell:
5959
rm -rf $OUTDIR/usr/share
6060
rm -rf $OUTDIR/usr/lib64/pkgconfig
6161
rm -rf $OUTDIR/usr/bin/numademo
62-

images/virt-launcher/werf.inc.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ libs:
6161
- libzstd-devel
6262
- libseccomp-devel
6363
- libgcrypt-devel
64-
- libgnutls-devel
6564
- libnettle-devel
6665
- libudev-devel
6766
- libmultipath-devel
@@ -246,6 +245,10 @@ import:
246245
add: /xorriso
247246
to: /xorriso
248247
before: install
248+
- image: packages/binaries/gnutls
249+
add: /gnutls
250+
to: /gnutls
251+
before: install
249252

250253
# Statically builded
251254
- image: packages/binaries/openssl
@@ -255,12 +258,12 @@ import:
255258
includePaths:
256259
- usr/bin/openssl
257260

261+
# GNU utilities
258262
- image: tools/coreutils
259263
add: /
260264
to: /relocate
261265
after: setup
262266
includePaths:
263-
# GNU utilities
264267
- usr/bin/cp
265268
- usr/bin/sleep
266269
- usr/bin/coreutils
@@ -320,11 +323,12 @@ shell:
320323
cp -a /xorriso/. /
321324
cp -a /swtpm/. /
322325
cp -a /numactl/. /
326+
cp -a /gnutls/. /
323327
324328
echo "Show libs after relocation in /relocate/usr/lib64"
325329
ls -la /relocate/usr/lib64
326330
# Cleanup
327-
rm -rf /{VBINS,qemu-bins,libvirt-bins,swtpm,numactl}
331+
rm -rf /{VBINS,qemu-bins,libvirt-bins,xorriso,swtpm,numactl,gnutls}
328332
329333
setup:
330334
- |

0 commit comments

Comments
 (0)