chore(ci): build libisofs, libjansson4, libjson-c5, libjson-glib, libkeyutils, libldap2 (#1364)

Signed-off-by: Maksim Fedotov <[email protected]>

Author: nevermarine

build/components/versions.yml

@@ -38,6 +38,12 @@ package:
   libidn: v1.43
   libidn2: v2.3.8
   libisoburn: release-1.5.6
+  libisofs: release-1.5.6
+  libjansson4: v2.14.1
+  libjson-c5: json-c-0.17
+  libjson-glib: 1.10.6
+  openldap: OPENLDAP_REL_ENG_2_6_9
+  keyutils: v1.6.3
   libmd: 1.1.0
   libnftnl: libnftnl-1.3.0
   nghttp2: v1.66.0

images/edk2/werf.inc.yaml

@@ -23,9 +23,8 @@ altPackages:
 - libssl-devel
 - libssl-devel libdwarf-devel libuuid-devel
 - bc perl-PathTools perl-IPC-Cmd perl-JSON
-- libisofs-devel
 packages:
-- zlib libisoburn libburn
+- zlib libisoburn libburn libisofs
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}

images/libvirt/werf.inc.yaml

@@ -80,7 +80,7 @@ altLibraries:
 - libreadline-devel libtasn1-devel
 - libattr-devel libbsd-devel
 - libsystemd-devel
-- libjson-c-devel systemtap-sdt-devel
+- systemtap-sdt-devel
 - libacl-devel glib2-devel glibc-utils
 - libgio-devel libxml2-devel
 - libtirpc-devel libsasl2-devel
@@ -89,10 +89,10 @@ altLibraries:
 - libslirp-devel
 - libyajl-devel libselinux-devel
 packages:
-- dmidecode lvm2 libattr libbsd libmd util-linux 
-- libgcrypt libfuse3 libaudit libnbd libcap-ng 
+- dmidecode lvm2 libattr libbsd libmd util-linux
+- libgcrypt libfuse3 libaudit libnbd libcap-ng
 - openssl libcurl e2fsprogs libxcrypt numactl
-- zlib
+- zlib libjson-c5 keyutils
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}

images/packages/keyutils/README.md

@@ -0,0 +1,23 @@
+# keyutils
+```
+├── [drwxr-xr-x     5]  etc
+│   ├── [drwxr-xr-x     2]  keyutils
+│   ├── [-rw-r--r--  1.7K]  request-key.conf
+│   └── [drwxr-xr-x     2]  request-key.d
+└── [drwxr-xr-x     6]  usr
+    ├── [drwxr-xr-x     3]  bin
+    │   └── [-rwxr-xr-x   63K]  keyctl
+    ├── [drwxr-xr-x     3]  include
+    │   └── [-rw-r--r--   12K]  keyutils.h
+    ├── [drwxr-xr-x     6]  lib64
+    │   ├── [lrwxrwxrwx    27]  libkeyutils.so -> /usr/lib64/libkeyutils.so.1
+    │   ├── [lrwxrwxrwx    19]  libkeyutils.so.1 -> libkeyutils.so.1.10
+    │   ├── [-rwxr-xr-x   22K]  libkeyutils.so.1.10
+    │   └── [drwxr-xr-x     3]  pkgconfig
+    │       └── [-rwxr-xr-x   159]  libkeyutils.pc
+    └── [drwxr-xr-x     4]  sbin
+        ├── [-rwxr-xr-x   31K]  key.dns_resolver
+        └── [-rwxr-xr-x   27K]  request-key
+
+10 directories, 9 files
+```

images/packages/keyutils/werf.inc.yaml

@@ -0,0 +1,85 @@
+---
+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 := "dhowells/keyutils.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
+---
+
+{{- $name := print $.ImageName "-dependencies" -}}
+{{- define "$name" -}}
+altPackages:
+- gcc gcc-c++ git make libtool gettext-tools
+- rpmspec
+- 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
+    make \
+      -j$(nproc) \
+      NO_ARLIB=1 \
+      PREFIX=/usr \
+      LIBDIR=/usr/lib64 \
+      BINDIR=/usr/bin \
+      SBINDIR=/usr/sbin \
+      NO_GLIBC_KEYERR=1 \
+      'CFLAGS=-Werror'
+
+    make DESTDIR=$OUTDIR install \
+      NO_ARLIB=1 \
+      PREFIX=/usr \
+      LIBDIR=/usr/lib64 \
+      BINDIR=/usr/bin \
+      SBINDIR=/usr/sbin
+
+    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/libcap-ng/werf.inc.yaml

@@ -21,14 +21,12 @@ 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
 
 ---
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
-packages:
+altPackages:
 - gcc git make libtool gettext-tools
 - glibc-kernheaders libattr-devel
 - rpm-build-python3 python3-devel
@@ -53,7 +51,7 @@ shell:
   {{- include "alt packages proxy" . | nindent 2 }}
   - |
     apt-get install -y \
-      {{ $builderDependencies.packages | join " " }}
+      {{ $builderDependencies.altPackages | join " " }}
 
   {{- include "alt packages clean" . | nindent 2 }}
 

images/packages/libcap/werf.inc.yaml

@@ -21,14 +21,12 @@ 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
 
 ---
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
-packages:
+altPackages:
 - gcc git make libtool gettext-tools
 - libpam-devel gperf
 - tree
@@ -52,7 +50,7 @@ shell:
   {{- include "alt packages proxy" . | nindent 2 }}
   - |
     apt-get install -y \
-      {{ $builderDependencies.packages | join " " }}
+      {{ $builderDependencies.altPackages | join " " }}
 
   {{- include "alt packages clean" . | nindent 2 }}
 

images/packages/libcurl/werf.inc.yaml

@@ -20,8 +20,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
 ---
 
@@ -33,20 +31,21 @@ altPackages:
 - glibc-devel-static
 - groff-base
 - libkrb5-devel libgsasl-devel
-- libzstd-devel libpsl-devel libldap-devel libbrotli-devel
+- libzstd-devel libpsl-devel libbrotli-devel
 - python3-base
 - openssh-server
 - openssh-clients
 - caddy
 - python3-module-pytest-xdist
 - python3-module-psutil
 - python3-module-filelock
-- gnutls-utils libngtcp2-devel
+- libngtcp2-devel
 - tree
 packages:
 - openssl libidn2 libgmp gnutls nettle
 - nghttp2 nghttp3
 - zlib
+- openldap
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -63,7 +62,7 @@ import:
   add: /src
   to: /src
   before: install
-{{- include "importPackageImages" (list . $builderDependencies.packages  "install") -}}
+{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
 shell:
   beforeInstall:
   {{- include "alt packages proxy" . | nindent 2 }}

images/packages/libgsasl/werf.inc.yaml

@@ -21,7 +21,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
@@ -34,10 +33,12 @@ shell:
 ---
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
-packages:
+altPackages:
 - gcc git make libtool gettext-tools
 - patch gperf help2man texinfo gengetopt
 - gtk-doc libgnutls-devel libkrb5-devel libntlm-devel libreadline-devel
+packages:
+- libgcrypt libidn
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -50,21 +51,20 @@ import:
   add: /src
   to: /src
   before: install
-{{- $images := list "libgcrypt" "libidn" -}}
-{{- include "importPackageImages" (list . $images "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="{{ $images | join " " }}"
+    PKGS="{{ $builderDependencies.packages | join " " }}"
     for pkg in $PKGS; do
       cp -a /$pkg/. /
       rm -rf /$pkg

images/packages/libisoburn/werf.inc.yaml

@@ -21,18 +21,17 @@ 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
 
 ---
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
-packages:
+altPackages:
 - gcc
 - git pkg-config trousers
 - automake autoconf make makeinfo libtool
-- libisofs-devel
+packages:
+- libburn libisofs
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -45,21 +44,20 @@ import:
   add: /src
   to: /src
   before: install
-{{- $images := list "libburn" -}}
-{{- include "importPackageImages" (list . $images "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="{{ $images | join " " }}"
+    PKGS="{{ $builderDependencies.packages | join " " }}"
     for pkg in $PKGS; do
       cp -a /$pkg/. /
       rm -rf /$pkg