chore(ci): import libs

build/components/versions.yml

@@ -15,7 +15,7 @@ package:
   file: FILE5_45
   gcc: releases/gcc-13.2.0
   glib2: 2.84.2
-  glibc: glibc-2.38
+  glibc: 650a0aaaffa9ddb44732fa6156b31c5f30ee596f
   libgmp: 6.3.0
   gnutls: 3.8.10
   libattr: v2.5.2

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

@@ -3,10 +3,11 @@
 {{- define "$name" -}}
 altPackages:
 - glibc-utils
-- mount xfsprogs xfstests util-linux
+- xfsprogs xfstests
 packages:
 - libssh libssh2
 - libffi e2fsprogs
+- util-linux
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}

images/dvcr/werf.inc.yaml

@@ -12,7 +12,6 @@ secrets:
 shell:
   install:
   - |
-    mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
     echo "Git clone CDI repository..."
     git clone --depth 1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /distribution
 

images/edk2/werf.inc.yaml

@@ -7,7 +7,7 @@
 {{- define "$name" -}}
 altPackages:
 - gcc gcc-c++
-- git curl
+- git
 - bash-completion
 - clang
 - ccache
@@ -19,12 +19,13 @@ altPackages:
 - dosfstools mtools genisoimage binutils-devel
 - qemu-kvm-core
 - iasl
-- python3-modules-sqlite3 python3-module-virt-firmware libuuid-devel
-- libdwarf-devel libuuid-devel
+- python3-modules-sqlite3 python3-module-virt-firmware
+- libdwarf-devel
 - bc perl-PathTools perl-IPC-Cmd perl-JSON
 packages:
 - zlib libisoburn libburn libisofs
 - openssl
+- libcurl util-linux
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}

images/libvirt/install-libvirt.sh

@@ -203,7 +203,7 @@ $SRC_BASE/include/libvirt/libvirt-event.h to /usr/include/libvirt
 $SRC_BASE/include/libvirt/libvirt.h to /usr/include/libvirt
 $SRC_BASE/include/libvirt/libvirt-host.h to /usr/include/libvirt
 $SRC_BASE/include/libvirt/libvirt-interface.h to /usr/include/libvirt
-# $SRC_BASE/include/libvirt/libvirt-lxc.h to /usr/include/libvirt
+$SRC_BASE/include/libvirt/libvirt-lxc.h to /usr/include/libvirt
 $SRC_BASE/include/libvirt/libvirt-network.h to /usr/include/libvirt
 $SRC_BASE/include/libvirt/libvirt-nodedev.h to /usr/include/libvirt
 $SRC_BASE/include/libvirt/libvirt-nwfilter.h to /usr/include/libvirt
@@ -541,10 +541,10 @@ $SRC_BUILD/tools/libvirt-guests.sh to /usr/libexec
 # $SRC_BUILD/tools/bash-completion/virsh to /usr/share/bash-completion/completions
 # $SRC_BUILD/tools/bash-completion/virt-admin to /usr/share/bash-completion/completions
 # $SRC_BUILD/tools/ssh-proxy/30-libvirt-ssh-proxy.conf to /etc/ssh/ssh_config.d
-# $SRC_BUILD/libvirt.pc to /usr/lib64/pkgconfig
-# $SRC_BUILD/libvirt-qemu.pc to /usr/lib64/pkgconfig
-# $SRC_BUILD/libvirt-lxc.pc to /usr/lib64/pkgconfig
-# $SRC_BUILD/libvirt-admin.pc to /usr/lib64/pkgconfig
+$SRC_BUILD/libvirt.pc to /usr/lib64/pkgconfig
+$SRC_BUILD/libvirt-qemu.pc to /usr/lib64/pkgconfig
+$SRC_BUILD/libvirt-lxc.pc to /usr/lib64/pkgconfig
+$SRC_BUILD/libvirt-admin.pc to /usr/lib64/pkgconfig
 EOF
 )
 

images/libvirt/werf.inc.yaml

@@ -56,28 +56,25 @@ altPackages:
 - parted
 - qemu-img open-iscsi
 - xml-utils xsltproc
-- systemd-container polkit
+- polkit
+- glibc-utils
 - python3 python3-devel
 - python3-module-pytest python3-module-docutils
 - python3-tools python3-module-pip
 - python3-module-black
 - mdevctl tshark
 - dmsetup pm-utils
 altLibraries:
-- libudev-devel
 - libpciaccess-devel
 - libyajl-devel sanlock-devel
-- libpcap-devel libnl-devel
+- libpcap-devel
 - libparted-devel
 - libdevmapper-devel
 - ceph-devel
 - libiscsi-devel libglusterfs-devel
-- libsystemd-devel
 - systemtap-sdt-devel
-- glibc-utils
 - wireshark-devel
 - libclocale
-- libslirp-devel
 - libyajl-devel
 packages:
 - dmidecode lvm2 libattr libbsd libmd util-linux
@@ -92,6 +89,7 @@ packages:
 - libtasn1 libtirpc
 - glib2 acl libunistring libxml2
 - gnutls
+- systemd libnl3 libslirp
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -205,7 +203,21 @@ shell:
 
   setup:
   - |
-    /install-libvirt.sh --version-num "{{ $version }}" \
-                        -s /{{ $gitRepoName }}-{{ $version }} \
-                        -d /BINS \
-                        -b build
+  {{- include "alt packages proxy" . | nindent 2 }}
+  - apt-get install -y tree
+  {{- include "alt packages clean" . | nindent 2 }}
+  - echo 'TREE OF SRC'
+  - tree /{{ $gitRepoName }}-{{ $version }}
+  - echo 'TREE OF BUILD'
+  - tree /{{ $gitRepoName }}-{{ $version }}/build
+  - |
+    cd /{{ $gitRepoName }}-{{ $version }}
+    DESTDIR=/BINS ninja -C build install
+    rm -rf /BINS/var
+    find /BINS -type f -executable | while read -r execfile; do
+    if strip "$execfile"; then
+      echo "Stripped: $execfile"
+    fi
+    done
+  - echo 'TREE OF BINS'
+  - tree /BINS

images/packages/acl/werf.inc.yaml

@@ -20,20 +20,18 @@ secrets:
   value: {{ $.SOURCE_REPO_GIT }}
 shell:
   install:
-  - |
-    mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
+  - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
 
-    git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
-
 ---
 
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
-packages:
+altPackages:
 - gcc
 - git gettext-tools autoconf libtool gcc make
-- libattr-devel
 - tree
+packages:
+- libattr
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -46,17 +44,25 @@ import:
   add: /src
   to: /src
   before: install
+{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
 shell:
   beforeInstall:
   {{- include "alt packages proxy" . | nindent 2 }}
   - |
     apt-get install -y \
-      {{ $builderDependencies.packages | join " " }}
+      {{ $builderDependencies.altPackages | join " " }}
 
   {{- include "alt packages clean" . | nindent 2 }}
 
   install:
   - |
+    # Install packages
+    PKGS="{{ $builderDependencies.packages | join " " }}"
+    for pkg in $PKGS; do
+      cp -a /$pkg/. /
+      rm -rf /$pkg
+    done
+
     OUTDIR=/out
 
     cd /src

images/packages/bzip2/werf.inc.yaml

@@ -19,19 +19,16 @@ secrets:
   value: {{ $.SOURCE_REPO_GIT }}
 shell:
   install:
-  - |
-    mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
+  - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
 
-    git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
-
 ---
 
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
 altPackages:
 - gcc git libtool
 - make automake autoconf makeinfo
-- glibc-devel
+- glibc-utils
 - meson ninja-build
 - pkg-config
 - tree
@@ -63,7 +60,7 @@ shell:
     mkdir -p $OUTDIR/usr/lib64
 
     cd /src
-    
+
     sed -i \
       -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
       -e 's:ln -s -f \$(PREFIX)/bin/:ln -s :' \

images/packages/cyrus-sasl2/werf.inc.yaml

@@ -30,7 +30,7 @@ altPackages:
 - meson ninja-build flex
 - libsphinxclient-devel libsphinxclient
 - libsphinxbase-devel libgdbm-devel
-- libdb4-devel libkrb5-devel
+- libdb4-devel
 - groff-base
 - perl-Pod-POM-View-Restructured
 - python3-module-sphinx
@@ -42,14 +42,14 @@ altPackages:
 - m4
 - groff-base gettext-tools
 - libdb4-devel
-- libkrb5-devel
 - libsqlite3-devel
 - tree
 packages:
 - libxcrypt
 - zlib
 - linux-pam
 - openssl e2fsprogs
+- krb5
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -80,7 +80,7 @@ shell:
       cp -a /$pkg/. /
       rm -rf /$pkg
     done
-    
+
     OUTDIR=/out
 
     cd /src
@@ -103,7 +103,7 @@ shell:
       --with-dblib=berkeley \
       --with-sqlite3 \
       --disable-macos-framework
-    
+
     make -j$(nproc)
     make DESTDIR=$OUTDIR install
 

images/packages/dmidecode/werf.inc.yaml

@@ -20,11 +20,8 @@ secrets:
   value: {{ $.SOURCE_REPO_GIT }}
 shell:
   install:
-  - |
-    mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
+  - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
 
-    git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
-
 
 ---
 

images/packages/dtc/werf.inc.yaml

@@ -32,11 +32,8 @@ secrets:
   value: {{ $.SOURCE_REPO_GIT }}
 shell:
   install:
-  - |
-    mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
+  - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
 
-    git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
-
 
 ---
 image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder

images/packages/e2fsprogs/werf.inc.yaml

@@ -26,7 +26,7 @@ shell:
 {{- define "$name" -}}
 altPackages:
 - gcc git make libtool gettext-tools
-- libuuid-devel libarchive-devel
+- libarchive-devel
 - tree
 packages:
 - glib2 util-linux acl

images/packages/file/werf.inc.yaml

@@ -19,10 +19,7 @@ secrets:
   value: {{ $.SOURCE_REPO_GIT }}
 shell:
   install:
-  - |
-    mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
-
-    git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
+  - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
 ---
 
 {{- $name := print $.ImageName "-dependencies" -}}
@@ -32,10 +29,11 @@ altPackages:
 - make automake autoconf libtool makeinfo
 - pkg-config
 - bison
-- bzlib-devel liblzma-devel libseccomp-devel libcap-devel lzip ncompress strace
+- lzip ncompress strace
 - tree
 packages:
 - zlib zstd xz
+- bzip2 libseccomp libcap
 {{- end -}}
 
 
@@ -67,7 +65,7 @@ shell:
       cp -a /$pkg/. /
       rm -rf /$pkg
     done
-    
+
     OUTDIR=/out
     cd /src
 

images/packages/gcc/werf.inc.yaml

@@ -41,7 +41,7 @@ altPackages:
 - git gcc-c++ flex make makeinfo libtool autoconf_2.60
 - libelf-devel libmpc-devel libmpfr-devel perl-Pod-Parser
 - libgc-devel coreutils
-- autogen dejagnu glibc-devel-static
+- autogen dejagnu
 - tree
 packages:
 - zlib