Backport: chore(core): build libs (#1402)

chore(core): build libs (#1371)

packages:
- libffi: v3.5.2
- libmnl: libmnl-1.0.5
- libnbd: v1.23.6
- multipath-tools: 0.11.1
- libblkid -> util-linux: v2.41.1

refactoring build packages
- gnutls
- libgmp
- nbdkit

---------

Signed-off-by: Nikita Korolev <[email protected]>
Co-authored-by: Nikita Korolev <[email protected]>

Author: deckhouse-BOaTswain

.werf/defines/images.tmpl

@@ -35,9 +35,15 @@ Result:
 {{-     $stage = index . 2 }}
 {{-   end }}
 {{-   range $imageName := $ImageNameList }}
-- image: {{ $context.ModuleNamePrefix }}packages/{{ $imageName }}
-  add: /{{ $imageName }}
-  to: /{{ $imageName }}
+{{-     $packages := splitList " " $imageName -}}
+{{-     range $packages -}}
+{{-       $image := trim . -}}
+{{-       if ne $image "" }}
+- image: packages/{{ $image }}
+  add: /{{ $image }}
+  to: /{{ $image }}
   before: {{ $stage }}
+{{-       end }}
+{{-     end -}}
 {{-   end }}
 {{ end }}

build/components/versions.yml

@@ -1,6 +1,6 @@
 firmware:
-  qemu: 9.2.0
-  libvirt: 10.9.0
+  qemu: v9.2.0
+  libvirt: v10.9.0
   edk2: stable202411
 core:
   3p-kubevirt: v1.3.1-v12n.10
@@ -17,10 +17,9 @@ package:
   glib2: 2.84.2
   glibc: glibc-2.38
   libgmp: 6.3.0
-  gnutls: 3.8.6
+  gnutls: 3.8.10
   libattr: v2.5.2
   libaudit: v4.0.3
-  libblkid: v2.41
   libbrotli: v1.1.0
   libbsd: 0.12.2
   libburn: release-1.5.6
@@ -29,6 +28,7 @@ package:
   libcapstone: 4.0.2
   libcurl: curl-8_14_1
   libfuse3: fuse-3.16.2
+  libffi: v3.5.2
   libgcrypt: libgcrypt-1.10.2
   libxcrypt: v4.4.36
   libtpms: v0.10.0
@@ -40,10 +40,14 @@ package:
   libidn2: v2.3.8
   libisoburn: release-1.5.6
   libmd: 1.1.0
+  libmnl: libmnl-1.0.5
+  libnbd: v1.23.6
   lvm2: v2_03_32
+  multipath-tools: 0.11.1
   nbdkit: v1.39.5
   nettle: nettle_3.10.1_release_20241230
   nftables: v1.1.3
   numactl: v2.0.19
   openssl: openssl-3.4.1
   swtpm: v0.10.0
+  util-linux: v2.41.1

images/base-alt-p11-binaries/werf.inc.yaml

@@ -1,12 +1,13 @@
 ---
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
-packages:
+altPackages:
 - glibc-utils
 - mount xfsprogs xfstests util-linux
-- libffi-devel
-libraries:
+altLibraries:
 - libssh-devel libssh2-devel
+packages:
+- libffi e2fsprogs
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -18,20 +19,19 @@ git:
   - add: {{ .ModuleDir }}/build/tools/relocate_binaries.sh
     to: /relocate_binaries.sh
 import:
-{{- $images := list "e2fsprogs" -}}
-{{- include "importPackageImages" (list . $images "install") -}}
+{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
 shell:
   install:
+  {{- include "alt packages proxy" . | nindent 2 }}
+  - |
+    apt-get install -y \
+        {{ $builderDependencies.altPackages | join " " }} \
+        {{ $builderDependencies.altLibraries | join " " }}
+  {{- include "alt packages clean" . | nindent 2 }}
   - |
     # Install packages
-    PKGS="{{ $images | join " " }}"
+    PKGS="{{ $builderDependencies.packages | join " " }}"
     for pkg in $PKGS; do
-      cp -a /$pkg/. /
+      cp -af /$pkg/. /
       rm -rf /$pkg
     done
-  {{- include "alt packages proxy" . | nindent 2 }}
-  - |
-    apt-get install -y \
-        {{ $builderDependencies.packages | join " " }} \
-        {{ $builderDependencies.libraries | join " " }}
-  {{- include "alt packages clean" . | nindent 2 }}

images/cdi-artifact/werf.inc.yaml

@@ -3,6 +3,16 @@
 {{- $gitRepoUrl := (printf "%s/%s" "deckhouse" $gitRepoName) }}
 {{- $version := get $.Core $gitRepoName }}
 
+{{- $name := print $.ImageName "-dependencies" -}}
+{{- define "$name" -}}
+binaries:
+- /cdi-binaries/cdi-importer
+- /cdi-binaries/cdi-source-update-poller
+packages:
+- libnbd
+{{- end -}}
+
+{{ $builderDependencies := include "$name" . | fromYaml }}
 
 image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
 final: false
@@ -21,7 +31,6 @@ secrets:
 shell:
   install:
   - |
-    mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
     echo "Git clone CDI repository..."
     git clone --depth 1 --branch {{ $version }} $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} /src/containerized-data-importer
 
@@ -30,38 +39,40 @@ shell:
 ---
 image: {{ .ModuleNamePrefix }}{{ .ImageName }}
 final: false
-fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.23" "builder/alt-go-svace" }}
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/alt-go-svace" }}
 mount:
-  - fromPath: ~/go-pkg-cache
-    to: /go/pkg
-import:
-- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
-  add: /src/containerized-data-importer
-  to: /containerized-data-importer
-  before: install
+- fromPath: ~/go-pkg-cache
+  to: /go/pkg
 secrets:
 - id: SOURCE_REPO
   value: {{ $.SOURCE_REPO }}
 - id: GOPROXY
   value: {{ .GOPROXY }}
+import:
+- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
+  add: /src/containerized-data-importer
+  to: /containerized-data-importer
+  before: install
+{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
 shell:
   beforeInstall:
-{{- if eq $.SVACE_ENABLED "false" }}
-  {{- include "debian packages proxy" . | nindent 2 }}
-  - apt-get install --yes libnbd-dev
-  {{- include "debian packages clean" . | nindent 2 }}
-{{- else }}
   {{- include "alt packages proxy" . | nindent 2 }}
-  - apt-get -qq install -y libnbd-devel
+  - |
+    apt-get -qq install -y libxml2-devel \
+      git binutils make gcc glibc-pthread glibc-devel glibc-devel-static golang
   {{- include "alt packages clean" . | nindent 2 }}
-{{- end }}
-
   install:
   - |
-    export GOPROXY=$(cat /run/secrets/GOPROXY)
-    mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
+    # Install packages
+    PKGS="{{ $builderDependencies.packages | join " " }}"
+    for pkg in $PKGS; do
+      cp -a /$pkg/. /
+      rm -rf /$pkg
+    done
 
   - |
+    export GOPROXY=$(cat /run/secrets/GOPROXY)
+    
     echo Download Go modules.
     cd /containerized-data-importer
     go mod download
@@ -133,7 +144,6 @@ shell:
     {{- $_ := set $ "ProjectName" (list $.ImageName "cdi-source-update-poller" | join "/") }}
     {{- include "image-build.build" (set $ "BuildCommand" `go build -ldflags="-s -w" -o /cdi-binaries/cdi-source-update-poller ./tools/cdi-source-update-poller`) | nindent 6 }}
 
-
   - chown -R 64535:64535 /cdi-binaries/*
   - ls -la /cdi-binaries
 

images/cdi-importer/werf.inc.yaml

@@ -16,8 +16,7 @@ imageSpec:
 {{- define "cdi-importer-deps" -}}
 libraries:
 - libsqlite3
-packages:
-  - libnbd
+- libxml2-devel
 binaries:
   # nbd bins and libs
   - /usr/sbin/nbdkit
@@ -55,14 +54,13 @@ import:
   add: /qemu-img
   to: /relocate
   before: setup
-{{- $images := list "nbdkit" -}}
+{{- $images := list "nbdkit" "libnbd" -}}
 {{- include "importPackageImages" (list . $images "install") -}}
 shell:
   install:
   {{- include "alt packages proxy" . | nindent 2 }}
   - |
     apt-get install --yes \
-      {{ $cdiImporterDependencies.packages | join " " }} \
       {{ $cdiImporterDependencies.libraries | join " " }}
   {{- include "alt packages clean" . | nindent 2 }}
   - |

images/dvcr-artifact/werf.inc.yaml

@@ -1,7 +1,19 @@
 ---
+{{- $nameDeps := print $.ImageName "-dependencies" -}}
+{{- define "$nameDeps" -}}
+altPackages:
+- gcc glibc-pthread glibc-devel glibc-devel-static
+- git golang make binutils
+- libxml2-devel
+packages:
+- libnbd
+{{- end -}}
+
+{{ $builderDeps := include "$nameDeps" . | fromYaml }}
+
 image: {{ .ModuleNamePrefix }}{{ .ImageName }}-builder
 final: false
-fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/alt-go-svace" }}
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/alt-go-svace" }}
 git:
 - add: {{ .ModuleDir }}/images/{{ .ImageName }}
   to: /src
@@ -14,18 +26,23 @@ git:
 secrets:
 - id: GOPROXY
   value: {{ .GOPROXY }}
+import:
+{{- include "importPackageImages" (list . $builderDeps.packages "install") -}}
 shell:
   beforeInstall:
-{{- if eq $.SVACE_ENABLED "false" }}
-  {{- include "debian packages proxy" . | nindent 2 }}
-  - apt-get -qq install -y --no-install-recommends libnbd-dev
-  {{- include "debian packages clean" . | nindent 2 }}
-{{- else }}
   {{- include "alt packages proxy" . | nindent 2 }}
-  - apt-get -qq install -y libnbd-devel
+  - |
+    apt-get -qq install -y \
+      {{ $builderDeps.altPackages | join " " }}
   {{- include "alt packages clean" . | nindent 2 }}
-{{- end }}
   install:
+  - |
+    # Install packages
+    PKGS="{{ $builderDeps.packages | join " " }}"
+    for pkg in $PKGS; do
+      cp -a /$pkg/. /
+      rm -rf /$pkg
+    done
   - cd /src
   - export GOPROXY=$(cat /run/secrets/GOPROXY)
   - go mod download
@@ -51,8 +68,8 @@ shell:
 ---
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
-libraries:
-- libnbd
+altPackages:
+- libxml2-devel
 binaries:
 - /usr/local/bin/dvcr-importer
 - /usr/sbin/nbd*
@@ -65,9 +82,11 @@ binaries:
 - /usr/bin/qemu-img
 - /usr/bin/qemu-nbd
 - /usr/lib64/libnbd.s*
+packages:
+- bzip2 file nbdkit libnbd
 {{- end -}}
 
-{{ $dvcrDependencies := include "$name" . | fromYaml }}
+{{ $builderDependencies := include "$name" . | fromYaml }}
 
 image: {{ .ModuleNamePrefix }}{{ .ImageName }}-bins
 final: false
@@ -84,8 +103,7 @@ import:
   add: /out
   to: /usr/local/bin
   before: setup
-{{- $images := list "bzip2" "file" "nbdkit" -}}
-{{- include "importPackageImages" (list . $images "install") -}}
+{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
 - image: {{ .ModuleNamePrefix }}qemu
   add: /qemu-img
   to: /qemu-img
@@ -95,14 +113,12 @@ shell:
   {{- include "alt packages proxy" . | nindent 2 }}
   - |
     apt-get install -y \
-      {{ $dvcrDependencies.libraries | join " " }}
-
+      {{ $builderDependencies.altPackages | join " " }}
   {{- include "alt packages clean" . | nindent 2 }}
-
   install:
   - |
     # Install packages
-    PKGS="{{ $images | join " " }}"
+    PKGS="{{ $builderDependencies.packages | join " " }}"
     PKGS+=" qemu-img"
     for pkg in $PKGS; do
       cp -a /$pkg/. /
@@ -111,4 +127,4 @@ shell:
 
   setup:
   - |
-    /relocate_binaries.sh -i "{{ $dvcrDependencies.binaries | join " " }}" -o /relocate
+    /relocate_binaries.sh -i "{{ $builderDependencies.binaries | join " " }}" -o /relocate

images/libvirt/install-libvirt.sh

@@ -27,7 +27,7 @@ EOF
     exit 0
 }
 convert_version() {
-    local version="$1"
+    local version="${1#v}"
 
     # Split the version string into major, minor, and patch parts
     # and construct the compact version by combining major and zero-padded minor