chore(ci): build libsystemd, libudev1, libunistring2, liburing, libuserspace-rcu

build/components/versions.yml

@@ -31,6 +31,9 @@ package:
   libfuse3: fuse-3.16.2
   libffi: v3.5.2
   libgcrypt: libgcrypt-1.10.2
+  liburing: liburing-2.6
+  libuserspace-rcu: v0.14.0
+  libunistring: v1.3
   libxcrypt: v4.4.36
   libgpg-error: libgpg-error-1.55
   libibverbs: 1.0.0
@@ -84,6 +87,7 @@ package:
   selinux: 3.6
   libslirp: v4.8.0
   snappy: 1.2.2 # libsnappy
+  systemd: v255
   zlib: v1.3.1
   zstd: v1.5.7
   krb5: krb5-1.21.3-final

images/cdi-artifact/werf.inc.yaml

@@ -13,6 +13,7 @@ packages:
 - libxml2
 - xz
 - libtasn1
+- libunistring
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}

images/libvirt/werf.inc.yaml

@@ -76,7 +76,7 @@ altLibraries:
 - libsystemd-devel
 - systemtap-sdt-devel
 - libacl-devel glib2-devel glibc-utils
-- libgio-devel libxml2-devel
+- libgio-devel
 - wireshark-devel
 - libclocale
 - libslirp-devel
@@ -92,6 +92,7 @@ packages:
 - selinux
 - cyrus-sasl2
 - libtasn1 libtirpc
+- libunistring libxml2
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}

images/packages/gnutls/werf.inc.yaml

@@ -45,19 +45,19 @@ altPackages:
 - make autoconf automake libtool makeinfo gettext-devel patch
 - perl-Net-SSLeay perl-IPC-Cmd perl-Pod-Html
 - gem-gettext-devel gettext po4a
-- libunistring-devel
 - libtpm2-tss-devel libtrousers-devel
 - libunbound-devel bison gtk-doc texinfo texlive
 - libev4 libev-devel libopencdk-devel
 - liboqs-devel
-- libssl-devel iproute2-devel
+- iproute2-devel
 - wget
 packages:
 - libbrotli libidn2 libgcrypt libgmp
 - nettle zlib zstd p11-kit
 - openssl
 - readline
 - libtasn1
+- libunistring
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}

images/packages/libcurl/werf.inc.yaml

@@ -47,6 +47,7 @@ packages:
 - libpsl
 - cyrus-sasl2
 - ngtcp2 libtasn1
+- libunistring
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}

images/packages/libidn/werf.inc.yaml

@@ -4,11 +4,13 @@
 
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
-packages:
+altPackages:
 - gcc git make makeinfo automake libtool patch gperf help2man gengetopt
 - python3 python3-module-docutils gtk-doc
-- gettext texinfo indent glibc-gconv-modules libabigail-devel libunistring-devel
+- gettext texinfo indent glibc-gconv-modules libabigail-devel
 - cvs
+packages:
+- libunistring
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -32,7 +34,6 @@ secrets:
 shell:
   install:
   - |
-    mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
     git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
 
     cd /src
@@ -51,17 +52,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/libmnl/werf.inc.yaml

@@ -29,9 +29,11 @@ shell:
 altPackages:
 - gcc make git autoconf libtool gettext-tools
 - automake pkgconf glibc-devel systemd-devel
-- texinfo indent glibc-gconv-modules 
-- libabigail-devel libunistring-devel cvs
+- texinfo indent glibc-gconv-modules
+- libabigail-devel cvs
 - tree
+packages:
+- libunistring
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -44,6 +46,7 @@ import:
   add: /src
   to: /src
   before: install
+{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
 shell:
   beforeInstall:
   {{- include "alt packages proxy" . | nindent 2 }}
@@ -55,6 +58,13 @@ shell:
 
   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/libnbd/werf.inc.yaml

@@ -30,12 +30,12 @@ altPackages:
 - gcc gcc-c++ make git autoconf libtool gettext-tools
 - automake pkgconf glibc-devel
 - bash-completion hardlink
-- liburing-devel perl-podlators
+- perl-podlators
 - ocaml ocaml-findlib ocaml-ocamldoc
 packages:
 - gnutls libidn2 libgmp ubdsrv xz libxml2
 - libtasn1
-- libfuse3
+- liburing libfuse3 libunistring
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -80,7 +80,7 @@ shell:
       --libdir=/usr/lib64 \
       --disable-ocaml \
       --disable-golang \
-      --disable-rust 
+      --disable-rust
 
     make -j$(nproc)
 

images/packages/libpsl/werf.inc.yaml

@@ -29,13 +29,12 @@ altPackages:
 - rpm-build-python3
 - libicu-devel
 - glib2-devel libgio-devel
-- libunistring-devel
 - gtk-doc xsltproc
 - publicsuffix-list
 - publicsuffix-list-dafsa
 - tree
 packages:
-- libidn2
+- libidn2 libunistring
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}

images/packages/libunistring/README.md

@@ -0,0 +1,34 @@
+# libunistring
+```
+└── [drwxr-xr-x     4]  usr
+    ├── [drwxr-xr-x    16]  include
+    │   ├── [-rw-r--r--   20K]  unicase.h
+    │   ├── [-rw-r--r--  7.4K]  uniconv.h
+    │   ├── [-rw-r--r--   48K]  unictype.h
+    │   ├── [-rw-r--r--   11K]  unigbrk.h
+    │   ├── [-rw-r--r--  6.8K]  unilbrk.h
+    │   ├── [-rw-r--r--  1.2K]  unimetadata.h
+    │   ├── [-rw-r--r--  1.9K]  uniname.h
+    │   ├── [-rw-r--r--   11K]  uninorm.h
+    │   ├── [-rw-r--r-- 10.0K]  unistdio.h
+    │   ├── [-rw-r--r--   45K]  unistr.h
+    │   ├── [drwxr-xr-x     9]  unistring
+    │   │   ├── [-rw-r--r--  4.5K]  cdefs.h
+    │   │   ├── [-rw-r--r--  1.4K]  iconveh.h
+    │   │   ├── [-rw-r--r--  2.6K]  inline.h
+    │   │   ├── [-rw-r--r--  6.0K]  localcharset.h
+    │   │   ├── [-rw-r--r--  4.6K]  stdint.h
+    │   │   ├── [-rw-r--r--  1.6K]  version.h
+    │   │   └── [-rw-r--r--  1.4K]  woe32dll.h
+    │   ├── [-rw-r--r--  2.3K]  unitypes.h
+    │   ├── [-rw-r--r--  3.2K]  uniwbrk.h
+    │   └── [-rw-r--r--  2.1K]  uniwidth.h
+    └── [drwxr-xr-x     7]  lib64
+        ├── [-rw-r--r--  6.0M]  libunistring.a
+        ├── [-rwxr-xr-x   947]  libunistring.la
+        ├── [lrwxrwxrwx    21]  libunistring.so -> libunistring.so.5.2.0
+        ├── [lrwxrwxrwx    21]  libunistring.so.5 -> libunistring.so.5.2.0
+        └── [-rwxr-xr-x  1.9M]  libunistring.so.5.2.0
+
+5 directories, 25 files
+```

images/packages/libunistring/werf.inc.yaml

@@ -0,0 +1,84 @@
+---
+image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}
+final: false
+fromImage: builder/scratch
+import:
+- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
+  add: /out
+  to: /{{ $.ImageName }}
+  before: setup
+
+---
+{{- $version := get .PackageVersion .ImageName }}
+{{- $gitRepoUrl := "gnu/libunistring.git" }}
+image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
+final: false
+fromImage: builder/src
+secrets:
+- id: SOURCE_REPO
+  value: {{ $.SOURCE_REPO_GIT }}
+shell:
+  install:
+  - |
+    git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
+    cd /src
+    git clone $(cat /run/secrets/SOURCE_REPO)/gnulib.git ./gnulib
+
+---
+
+{{- $name := print $.ImageName "-dependencies" -}}
+{{- define "$name" -}}
+altPackages:
+- gcc gcc-c++ git make makeinfo libtool gettext-tools
+- patch gperf
+- tree
+{{- end -}}
+
+{{ $builderDependencies := include "$name" . | fromYaml }}
+
+
+image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
+final: false
+fromImage: builder/alt
+secrets:
+- id: SOURCE_REPO
+  value: {{ $.SOURCE_REPO_GIT }}
+import:
+- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
+  add: /src
+  to: /src
+  before: install
+shell:
+  beforeInstall:
+  {{- include "alt packages proxy" . | nindent 2 }}
+  - |
+    apt-get install -y \
+      {{ $builderDependencies.altPackages | join " " }}
+
+  {{- include "alt packages clean" . | nindent 2 }}
+
+  install:
+  - |
+    OUTDIR=/out
+    cd /src
+    export GNULIB_SRCDIR=$(pwd)/gnulib
+    export GNULIB_TOOL=$(pwd)/gnulib/gnulib-tool
+
+    ./autogen.sh
+    touch tests/Makefile.in
+    ./configure \
+      --prefix=/usr \
+      --libdir=/usr/lib64
+
+    # remove non-existing tests from build to prevent failure
+    sed -i 's/SUBDIRS = doc gnulib-local lib tests/SUBDIRS = doc gnulib-local lib/' Makefile
+    make -j$(nproc)
+    make DESTDIR=$OUTDIR install
+    rm -rf $OUTDIR/usr/share
+    find $OUTDIR -type f -executable | while read -r execfile; do
+      if strip "$execfile"; then
+        echo "Stripped: $execfile"
+      fi
+    done
+
+    tree -hp $OUTDIR

images/packages/liburing/README.md

@@ -0,0 +1,25 @@
+# liburing
+```
+└── [drwxr-xr-x     4]  usr
+    ├── [drwxr-xr-x     4]  include
+    │   ├── [drwxr-xr-x     6]  liburing
+    │   │   ├── [-rw-r--r--  2.4K]  barrier.h
+    │   │   ├── [-rw-r--r--   276]  compat.h
+    │   │   ├── [-rw-r--r--   19K]  io_uring.h
+    │   │   └── [-rw-r--r--   164]  io_uring_version.h
+    │   └── [-rw-r--r--   44K]  liburing.h
+    └── [drwxr-xr-x    11]  lib64
+        ├── [-rw-r--r--   48K]  liburing-ffi.a
+        ├── [lrwxrwxrwx    19]  liburing-ffi.so -> liburing-ffi.so.2.6
+        ├── [lrwxrwxrwx    19]  liburing-ffi.so.2 -> liburing-ffi.so.2.6
+        ├── [-rwxr-xr-x   42K]  liburing-ffi.so.2.6
+        ├── [-rw-r--r--   28K]  liburing.a
+        ├── [lrwxrwxrwx    15]  liburing.so -> liburing.so.2.6
+        ├── [lrwxrwxrwx    15]  liburing.so.2 -> liburing.so.2.6
+        ├── [-rwxr-xr-x   25K]  liburing.so.2.6
+        └── [drwxr-xr-x     4]  pkgconfig
+            ├── [-rw-r--r--   236]  liburing-ffi.pc
+            └── [-rw-r--r--   228]  liburing.pc
+
+6 directories, 15 files
+```