Skip to content

Commit ad29bec

Browse files
nevermarineIsteb4k
nevermarine
authored and
Isteb4k
committed
chore(ci): import glib2, libxkbcommon, libstdc++6 (#1447)
Signed-off-by: Maksim Fedotov <[email protected]> (cherry picked from commit 1421125)
1 parent b533269 commit ad29bec

File tree

17 files changed

+1902
-384
lines changed

17 files changed

+1902
-384
lines changed

‎build/components/versions.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ package:
1313
dtc: v1.7.2
1414
e2fsprogs: v1.47.1
1515
file: FILE5_45
16-
gcc: releases/gcc-14.2.0
16+
gcc: releases/gcc-13.2.0
1717
glib2: 2.84.2
1818
glibc: glibc-2.38
1919
libgmp: 6.3.0
@@ -84,8 +84,9 @@ package:
8484
readline: readline-8.2
8585
cyrus-sasl2: cyrus-sasl-2.1.28 # libsasl2-3
8686
libseccomp: v2.6.0
87-
selinux: 3.6
87+
selinux: 3.8
8888
libslirp: v4.8.0
89+
libxkbcommon: xkbcommon-1.10.0
8990
snappy: 1.2.2 # libsnappy
9091
systemd: v255
9192
zlib: v1.3.1

‎images/libvirt/werf.inc.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,9 @@ altLibraries:
7272
- libdevmapper-devel
7373
- ceph-devel
7474
- libiscsi-devel libglusterfs-devel
75-
- libgnutls-devel
7675
- libsystemd-devel
7776
- systemtap-sdt-devel
78-
- libacl-devel glib2-devel glibc-utils
79-
- libgio-devel
77+
- glibc-utils
8078
- wireshark-devel
8179
- libclocale
8280
- libslirp-devel
@@ -92,7 +90,8 @@ packages:
9290
- selinux
9391
- cyrus-sasl2
9492
- libtasn1 libtirpc
95-
- libunistring libxml2
93+
- glib2 acl libunistring libxml2
94+
- gnutls
9695
{{- end -}}
9796

9897
{{ $builderDependencies := include "$name" . | fromYaml }}

‎images/packages/e2fsprogs/werf.inc.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ shell:
2727
altPackages:
2828
- gcc git make libtool gettext-tools
2929
- libuuid-devel libarchive-devel
30-
- glib2-devel
3130
- tree
3231
packages:
33-
- util-linux acl
32+
- glib2 util-linux acl
3433
{{- end -}}
3534

3635
{{ $builderDependencies := include "$name" . | fromYaml }}
@@ -59,7 +58,6 @@ shell:
5958
install:
6059
- |
6160
# Install packages
62-
echo "Install packages"
6361
PKGS="{{ $builderDependencies.packages | join " " }}"
6462
for pkg in $PKGS; do
6563
cp -a /$pkg/. /

‎images/packages/gcc/README.md‎

Lines changed: 1649 additions & 0 deletions
Large diffs are not rendered by default.

‎images/packages/gcc/werf.inc.yaml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import:
99
before: setup
1010
includePaths:
1111
- usr/lib64/libgcc_s.so.1
12+
- usr/lib64/libstdc++.so.6
1213
---
1314
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}
1415
final: false
@@ -31,11 +32,8 @@ secrets:
3132
value: {{ $.SOURCE_REPO_GIT }}
3233
shell:
3334
install:
34-
- |
35-
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
35+
- git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
3636

37-
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
38-
3937
---
4038
{{- $name := print $.ImageName "-dependencies" -}}
4139
{{- define "$name" -}}
@@ -46,7 +44,7 @@ altPackages:
4644
- autogen dejagnu glibc-devel-static
4745
- tree
4846
packages:
49-
- zlib
47+
- zlib
5048
- zstd
5149
{{- end -}}
5250

@@ -78,7 +76,7 @@ shell:
7876
cp -a /$pkg/. /
7977
rm -rf /$pkg
8078
done
81-
79+
8280
OUTDIR=/out
8381
8482
cd /src
@@ -105,4 +103,4 @@ shell:
105103
make DESTDIR=$OUTDIR install-strip
106104
rm -rf $OUTDIR/usr/share
107105
108-
tree -sp $OUTDIR
106+
tree -hp $OUTDIR

‎images/packages/glib2/werf.inc.yaml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ altPackages:
44
- gcc gcc-c++
55
- git pkg-config meson ninja-build cmake
66
- libunwind-devel libelf-devel sysprof-devel libgvdb-devel
7+
- tree
78
packages:
8-
- libffi zlib pcre2
9+
- libffi zlib pcre2 util-linux
10+
- selinux
911
{{- end -}}
1012

1113
{{- $builderDependencies := include "$name" . | fromYaml }}
@@ -90,6 +92,11 @@ shell:
9092
-Dlibdir=/usr/lib64 \
9193
-Dgtk_doc=false \
9294
-Dbuildtype=release \
93-
-Dstrip=true
95+
-Dstrip=true \
96+
--default-library=both \
97+
-Dselinux=enabled \
98+
-Dlibmount=enabled
9499
meson compile -C _build
95100
DESTDIR=${OUTDIR} meson install -C _build
101+
102+
tree -hp $OUTDIR

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ shell:
2828
{{- define "$name" -}}
2929
altPackages:
3030
- gcc git make libtool gettext-tools meson ninja-build
31-
- glib2-devel libgio-devel
3231
- tree
32+
packages:
33+
- glib2 util-linux
3334
{{- end -}}
3435

3536
{{ $builderDependencies := include "$name" . | fromYaml }}
@@ -46,6 +47,7 @@ import:
4647
add: /src
4748
to: /src
4849
before: install
50+
{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
4951
shell:
5052
beforeInstall:
5153
{{- include "alt packages proxy" . | nindent 2 }}
@@ -57,6 +59,13 @@ shell:
5759

5860
install:
5961
- |
62+
# Install packages
63+
PKGS="{{ $builderDependencies.packages | join " " }}"
64+
for pkg in $PKGS; do
65+
cp -a /$pkg/. /
66+
rm -rf /$pkg
67+
done
68+
6069
OUTDIR=/out
6170
cd /src
6271
mkdir _build

‎images/packages/libpsl/werf.inc.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ altPackages:
2828
- gcc git make libtool gettext-tools meson ninja-build
2929
- rpm-build-python3
3030
- libicu-devel
31-
- glib2-devel libgio-devel
3231
- gtk-doc xsltproc
3332
- publicsuffix-list
3433
- publicsuffix-list-dafsa
3534
- tree
3635
packages:
36+
- glib2
3737
- libidn2 libunistring
3838
{{- end -}}
3939

‎images/packages/libxkbcommon/README.md‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# libxkbcommon
2+
```
3+
└── [drwxr-xr-x 6] usr
4+
├── [drwxr-xr-x 3] bin
5+
│ └── [-rwxr-xr-x 23K] xkbcli
6+
├── [drwxr-xr-x 3] include
7+
│ └── [drwxr-xr-x 9] xkbcommon
8+
│ ├── [-rw-r--r-- 3.1K] xkbcommon-compat.h
9+
│ ├── [-rw-r--r-- 19K] xkbcommon-compose.h
10+
│ ├── [-rw-r--r-- 244K] xkbcommon-keysyms.h
11+
│ ├── [-rw-r--r-- 3.8K] xkbcommon-names.h
12+
│ ├── [-rw-r--r-- 8.0K] xkbcommon-x11.h
13+
│ ├── [-rw-r--r-- 72K] xkbcommon.h
14+
│ └── [-rw-r--r-- 24K] xkbregistry.h
15+
├── [drwxr-xr-x 12] lib64
16+
│ ├── [lrwxrwxrwx 21] libxkbcommon-x11.so -> libxkbcommon-x11.so.0
17+
│ ├── [lrwxrwxrwx 26] libxkbcommon-x11.so.0 -> libxkbcommon-x11.so.0.10.0
18+
│ ├── [-rwxr-xr-x 51K] libxkbcommon-x11.so.0.10.0
19+
│ ├── [lrwxrwxrwx 17] libxkbcommon.so -> libxkbcommon.so.0
20+
│ ├── [lrwxrwxrwx 22] libxkbcommon.so.0 -> libxkbcommon.so.0.10.0
21+
│ ├── [-rwxr-xr-x 416K] libxkbcommon.so.0.10.0
22+
│ ├── [lrwxrwxrwx 19] libxkbregistry.so -> libxkbregistry.so.0
23+
│ ├── [lrwxrwxrwx 24] libxkbregistry.so.0 -> libxkbregistry.so.0.10.0
24+
│ ├── [-rwxr-xr-x 43K] libxkbregistry.so.0.10.0
25+
│ └── [drwxr-xr-x 5] pkgconfig
26+
│ ├── [-rw-r--r-- 291] xkbcommon-x11.pc
27+
│ ├── [-rw-r--r-- 202] xkbcommon.pc
28+
│ └── [-rw-r--r-- 269] xkbregistry.pc
29+
└── [drwxr-xr-x 3] libexec
30+
└── [drwxr-xr-x 11] xkbcommon
31+
├── [-rwxr-xr-x 27K] xkbcli-compile-compose
32+
├── [-rwxr-xr-x 31K] xkbcli-compile-keymap
33+
├── [-rwxr-xr-x 47K] xkbcli-dump-keymap-wayland
34+
├── [-rwxr-xr-x 23K] xkbcli-dump-keymap-x11
35+
├── [-rwxr-xr-x 31K] xkbcli-how-to-type
36+
├── [-rwxr-xr-x 31K] xkbcli-interactive-evdev
37+
├── [-rwxr-xr-x 47K] xkbcli-interactive-wayland
38+
├── [-rwxr-xr-x 27K] xkbcli-interactive-x11
39+
└── [-rwxr-xr-x 19K] xkbcli-list
40+
41+
9 directories, 29 files
42+
```

‎images/packages/libxkbcommon/werf.inc.yaml‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
---
2+
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}
3+
final: false
4+
fromImage: builder/scratch
5+
import:
6+
- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
7+
add: /out
8+
to: /{{ $.ImageName }}
9+
before: setup
10+
11+
---
12+
{{- $version := get .PackageVersion .ImageName }}
13+
{{- $gitRepoUrl := "xkbcommon/libxkbcommon.git" }}
14+
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
15+
final: false
16+
fromImage: builder/src
17+
secrets:
18+
- id: SOURCE_REPO
19+
value: {{ $.SOURCE_REPO_GIT }}
20+
shell:
21+
install:
22+
- |
23+
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
24+
25+
---
26+
27+
{{- $name := print $.ImageName "-dependencies" -}}
28+
{{- define "$name" -}}
29+
altPackages:
30+
- gcc git make libtool gettext-tools meson ninja-build bison
31+
- xkeyboard-config-devel
32+
- wayland-devel libwayland-client-devel wayland-protocols
33+
- libxcb-devel
34+
- bash-completion
35+
- tree
36+
packages:
37+
- libxml2
38+
{{- end -}}
39+
40+
{{ $builderDependencies := include "$name" . | fromYaml }}
41+
42+
43+
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
44+
final: false
45+
fromImage: builder/alt
46+
secrets:
47+
- id: SOURCE_REPO
48+
value: {{ $.SOURCE_REPO_GIT }}
49+
import:
50+
- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
51+
add: /src
52+
to: /src
53+
before: install
54+
{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
55+
shell:
56+
beforeInstall:
57+
{{- include "alt packages proxy" . | nindent 2 }}
58+
- |
59+
apt-get install -y \
60+
{{ $builderDependencies.altPackages | join " " }}
61+
62+
{{- include "alt packages clean" . | nindent 2 }}
63+
64+
install:
65+
- |
66+
# Install packages
67+
PKGS="{{ $builderDependencies.packages | join " " }}"
68+
for pkg in $PKGS; do
69+
cp -a /$pkg/. /
70+
rm -rf /$pkg
71+
done
72+
73+
OUTDIR=/out
74+
cd /src
75+
mkdir _build
76+
/usr/bin/meson setup _build \
77+
--prefix=/usr \
78+
--libdir=/usr/lib64 \
79+
--wrap-mode=nofallback \
80+
--wrap-mode=nodownload \
81+
-Denable-docs=false \
82+
-Denable-x11=true \
83+
-Denable-xkbregistry=true \
84+
-Ddefault_library=shared
85+
86+
ninja-build -j$(nproc) -C _build
87+
DESTDIR=$OUTDIR ninja-build install -C _build
88+
rm -rf $OUTDIR/usr/share
89+
find $OUTDIR -type f -executable | while read -r execfile; do
90+
if strip "$execfile"; then
91+
echo "Stripped: $execfile"
92+
fi
93+
done
94+
tree -hp $OUTDIR
95+

0 commit comments

Comments
 (0)