chore(ci): import glib2, libxkbcommon, libstdc++6

build/components/versions.yml

@@ -13,7 +13,7 @@ package:
   dtc: v1.7.2
   e2fsprogs: v1.47.1
   file: FILE5_45
-  gcc: releases/gcc-14.2.0
+  gcc: releases/gcc-13.2.0
   glib2: 2.84.2
   glibc: glibc-2.38
   libgmp: 6.3.0
@@ -84,8 +84,9 @@ package:
   readline: readline-8.2
   cyrus-sasl2: cyrus-sasl-2.1.28 # libsasl2-3
   libseccomp: v2.6.0
-  selinux: 3.6
+  selinux: 3.8
   libslirp: v4.8.0
+  libxkbcommon: xkbcommon-1.10.0
   snappy: 1.2.2 # libsnappy
   systemd: v255
   zlib: v1.3.1

images/libvirt/werf.inc.yaml

@@ -72,11 +72,9 @@ altLibraries:
 - libdevmapper-devel
 - ceph-devel
 - libiscsi-devel libglusterfs-devel
-- libgnutls-devel
 - libsystemd-devel
 - systemtap-sdt-devel
-- libacl-devel glib2-devel glibc-utils
-- libgio-devel
+- glibc-utils
 - wireshark-devel
 - libclocale
 - libslirp-devel
@@ -92,7 +90,8 @@ packages:
 - selinux
 - cyrus-sasl2
 - libtasn1 libtirpc
-- libunistring libxml2
+- glib2 acl libunistring libxml2
+- gnutls
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}

images/packages/e2fsprogs/werf.inc.yaml

@@ -27,10 +27,9 @@ shell:
 altPackages:
 - gcc git make libtool gettext-tools
 - libuuid-devel libarchive-devel
-- glib2-devel
 - tree
 packages:
-- util-linux acl
+- glib2 util-linux acl
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -59,7 +58,6 @@ shell:
   install:
   - |
     # Install packages
-    echo "Install packages"
     PKGS="{{ $builderDependencies.packages | join " " }}"
     for pkg in $PKGS; do
       cp -a /$pkg/. /

images/packages/gcc/werf.inc.yaml

@@ -9,6 +9,7 @@ import:
   before: setup
   includePaths:
   - usr/lib64/libgcc_s.so.1
+  - usr/lib64/libstdc++.so.6
 ---
 image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}
 final: false
@@ -31,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
-
 ---
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
@@ -46,7 +44,7 @@ altPackages:
 - autogen dejagnu glibc-devel-static
 - tree
 packages:
-- zlib 
+- zlib
 - zstd
 {{- end -}}
 
@@ -78,7 +76,7 @@ shell:
       cp -a /$pkg/. /
       rm -rf /$pkg
     done
-    
+
     OUTDIR=/out
 
     cd /src
@@ -105,4 +103,4 @@ shell:
     make DESTDIR=$OUTDIR install-strip
     rm -rf $OUTDIR/usr/share
 
-    tree -sp $OUTDIR
+    tree -hp $OUTDIR

images/packages/glib2/werf.inc.yaml

@@ -4,8 +4,10 @@ altPackages:
 - gcc gcc-c++
 - git pkg-config meson ninja-build cmake
 - libunwind-devel libelf-devel sysprof-devel libgvdb-devel
+- tree
 packages:
-- libffi zlib pcre2
+- libffi zlib pcre2 util-linux
+- selinux
 {{- end -}}
 
 {{- $builderDependencies := include "$name" . | fromYaml }}
@@ -90,6 +92,11 @@ shell:
       -Dlibdir=/usr/lib64 \
       -Dgtk_doc=false \
       -Dbuildtype=release \
-      -Dstrip=true
+      -Dstrip=true \
+      --default-library=both \
+      -Dselinux=enabled \
+      -Dlibmount=enabled
     meson compile -C _build
     DESTDIR=${OUTDIR} meson install -C _build
+
+    tree -hp $OUTDIR

images/packages/libjson-glib/werf.inc.yaml

@@ -28,8 +28,9 @@ shell:
 {{- define "$name" -}}
 altPackages:
 - gcc git make libtool gettext-tools meson ninja-build
-- glib2-devel libgio-devel
 - tree
+packages:
+- glib2 util-linux
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -46,6 +47,7 @@ import:
   add: /src
   to: /src
   before: install
+{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
 shell:
   beforeInstall:
   {{- include "alt packages proxy" . | nindent 2 }}
@@ -57,6 +59,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
     mkdir _build

images/packages/libpsl/werf.inc.yaml

@@ -28,12 +28,12 @@ altPackages:
 - gcc git make libtool gettext-tools meson ninja-build
 - rpm-build-python3
 - libicu-devel
-- glib2-devel libgio-devel
 - gtk-doc xsltproc
 - publicsuffix-list
 - publicsuffix-list-dafsa
 - tree
 packages:
+- glib2
 - libidn2 libunistring
 {{- end -}}
 

images/packages/libxkbcommon/README.md

@@ -0,0 +1,42 @@
+# libxkbcommon
+```
+└── [drwxr-xr-x     6]  usr
+    ├── [drwxr-xr-x     3]  bin
+    │   └── [-rwxr-xr-x   23K]  xkbcli
+    ├── [drwxr-xr-x     3]  include
+    │   └── [drwxr-xr-x     9]  xkbcommon
+    │       ├── [-rw-r--r--  3.1K]  xkbcommon-compat.h
+    │       ├── [-rw-r--r--   19K]  xkbcommon-compose.h
+    │       ├── [-rw-r--r--  244K]  xkbcommon-keysyms.h
+    │       ├── [-rw-r--r--  3.8K]  xkbcommon-names.h
+    │       ├── [-rw-r--r--  8.0K]  xkbcommon-x11.h
+    │       ├── [-rw-r--r--   72K]  xkbcommon.h
+    │       └── [-rw-r--r--   24K]  xkbregistry.h
+    ├── [drwxr-xr-x    12]  lib64
+    │   ├── [lrwxrwxrwx    21]  libxkbcommon-x11.so -> libxkbcommon-x11.so.0
+    │   ├── [lrwxrwxrwx    26]  libxkbcommon-x11.so.0 -> libxkbcommon-x11.so.0.10.0
+    │   ├── [-rwxr-xr-x   51K]  libxkbcommon-x11.so.0.10.0
+    │   ├── [lrwxrwxrwx    17]  libxkbcommon.so -> libxkbcommon.so.0
+    │   ├── [lrwxrwxrwx    22]  libxkbcommon.so.0 -> libxkbcommon.so.0.10.0
+    │   ├── [-rwxr-xr-x  416K]  libxkbcommon.so.0.10.0
+    │   ├── [lrwxrwxrwx    19]  libxkbregistry.so -> libxkbregistry.so.0
+    │   ├── [lrwxrwxrwx    24]  libxkbregistry.so.0 -> libxkbregistry.so.0.10.0
+    │   ├── [-rwxr-xr-x   43K]  libxkbregistry.so.0.10.0
+    │   └── [drwxr-xr-x     5]  pkgconfig
+    │       ├── [-rw-r--r--   291]  xkbcommon-x11.pc
+    │       ├── [-rw-r--r--   202]  xkbcommon.pc
+    │       └── [-rw-r--r--   269]  xkbregistry.pc
+    └── [drwxr-xr-x     3]  libexec
+        └── [drwxr-xr-x    11]  xkbcommon
+            ├── [-rwxr-xr-x   27K]  xkbcli-compile-compose
+            ├── [-rwxr-xr-x   31K]  xkbcli-compile-keymap
+            ├── [-rwxr-xr-x   47K]  xkbcli-dump-keymap-wayland
+            ├── [-rwxr-xr-x   23K]  xkbcli-dump-keymap-x11
+            ├── [-rwxr-xr-x   31K]  xkbcli-how-to-type
+            ├── [-rwxr-xr-x   31K]  xkbcli-interactive-evdev
+            ├── [-rwxr-xr-x   47K]  xkbcli-interactive-wayland
+            ├── [-rwxr-xr-x   27K]  xkbcli-interactive-x11
+            └── [-rwxr-xr-x   19K]  xkbcli-list
+
+9 directories, 29 files
+```

images/packages/libxkbcommon/werf.inc.yaml

@@ -0,0 +1,95 @@
+---
+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 := "xkbcommon/libxkbcommon.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 git make libtool gettext-tools meson ninja-build bison
+- xkeyboard-config-devel
+- wayland-devel libwayland-client-devel wayland-protocols
+- libxcb-devel
+- bash-completion
+- tree
+packages:
+- libxml2
+{{- 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
+{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
+shell:
+  beforeInstall:
+  {{- include "alt packages proxy" . | nindent 2 }}
+  - |
+    apt-get install -y \
+      {{ $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
+    mkdir _build
+    /usr/bin/meson setup _build  \
+      --prefix=/usr \
+      --libdir=/usr/lib64 \
+      --wrap-mode=nofallback \
+      --wrap-mode=nodownload \
+      -Denable-docs=false \
+      -Denable-x11=true \
+      -Denable-xkbregistry=true \
+      -Ddefault_library=shared
+
+    ninja-build -j$(nproc) -C _build
+    DESTDIR=$OUTDIR ninja-build install -C _build
+    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/nbdkit/werf.inc.yaml

@@ -43,6 +43,7 @@ packages:
 - zstd
 - libxml2
 - libtasn1
+- libgcc1
 - libunistring
 {{- end -}}
 

images/packages/p11-kit/werf.inc.yaml

@@ -27,11 +27,12 @@ shell:
 {{- define "$name" -}}
 altPackages:
 - git gcc gcc-c++ make meson ninja-build pkg-config
-- glib2-devel libffi-devel gettext-devel
-- openssl-devel ca-certificates
+- gettext-devel
+- ca-certificates
 - tree
 packages:
 - libtasn1
+- libffi openssl
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}