Skip to content

Commit dab9b7e

Browse files
nevermarinenevermarine
authored
chore(ci): build libpixman, libpng16, libpsl, libqpl1, librdmacm, libssl3 (#1425)
Signed-off-by: Maksim Fedotov <[email protected]>
1 parent d49b008 commit dab9b7e

File tree

21 files changed

+902
-410
lines changed

21 files changed

+902
-410
lines changed

‎build/components/versions.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ package:
3333
libxcrypt: v4.4.36
3434
libgpg-error: libgpg-error-1.55
3535
libibverbs: 1.0.0
36-
rdma-core: v57.0
36+
rdma-core: v53.0
3737
libgsasl: v2.2.2
3838
libidn: v1.43
3939
libidn2: v2.3.8
@@ -42,6 +42,10 @@ package:
4242
libjansson4: v2.14.1
4343
libjson-c5: json-c-0.17
4444
libjson-glib: 1.10.6
45+
libpixman: pixman-0.43.4
46+
libpng: v1.6.50
47+
libpsl: 0.21.5
48+
libqpl: v1.6.0
4549
openldap: OPENLDAP_REL_ENG_2_6_9
4650
keyutils: v1.6.3
4751
libmd: 1.1.0

‎images/edk2/werf.inc.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ altPackages:
2020
- qemu-kvm-core
2121
- iasl
2222
- python3-modules-sqlite3 python3-module-virt-firmware libuuid-devel
23-
- libssl-devel
24-
- libssl-devel libdwarf-devel libuuid-devel
23+
- libdwarf-devel libuuid-devel
2524
- bc perl-PathTools perl-IPC-Cmd perl-JSON
2625
packages:
2726
- zlib libisoburn libburn libisofs
27+
- openssl
2828
{{- end -}}
2929

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

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,12 @@ altPackages:
5151
- libunbound-devel bison gtk-doc texinfo texlive
5252
- libev4 libev-devel libopencdk-devel
5353
- liboqs-devel libreadline-devel
54-
- openssl libssl-devel iproute2-devel
54+
- libssl-devel iproute2-devel
5555
- wget
5656
packages:
5757
- libbrotli libidn2 libgcrypt libgmp
5858
- nettle zlib zstd p11-kit
59+
- openssl
5960
{{- end -}}
6061

6162
{{ $builderDependencies := include "$name" . | fromYaml }}
@@ -93,9 +94,9 @@ shell:
9394
9495
# Fake distcheck-hook that checks bootstrap is called without --skip-po
9596
mkdir -p po/.reference
96-
97+
9798
./bootstrap --skip-po
98-
99+
99100
./configure \
100101
--prefix=/usr \
101102
--exec-prefix=/usr \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ secrets:
1919
value: {{ $.SOURCE_REPO_GIT }}
2020
shell:
2121
install:
22-
- |
23-
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
22+
- git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
2423
---
2524

2625
{{- $name := print $.ImageName "-dependencies" -}}
@@ -30,7 +29,7 @@ altPackages:
3029
- glibc-devel-static
3130
- groff-base
3231
- libkrb5-devel libgsasl-devel
33-
- libpsl-devel libbrotli-devel
32+
- libbrotli-devel
3433
- python3-base
3534
- openssh-server
3635
- openssh-clients
@@ -46,6 +45,7 @@ packages:
4645
- zlib zstd
4746
- libssh2
4847
- openldap
48+
- libpsl
4949
{{- end -}}
5050

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

‎images/packages/libpixman/README.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# libpixman
2+
```
3+
└── [drwxr-xr-x 4] usr
4+
├── [drwxr-xr-x 3] include
5+
│ └── [drwxr-xr-x 4] pixman-1
6+
│ ├── [-rw-r--r-- 1.7K] pixman-version.h
7+
│ └── [-rw-r--r-- 47K] pixman.h
8+
└── [drwxr-xr-x 6] lib64
9+
├── [lrwxrwxrwx 16] libpixman-1.so -> libpixman-1.so.0
10+
├── [lrwxrwxrwx 21] libpixman-1.so.0 -> libpixman-1.so.0.43.4
11+
├── [-rwxr-xr-x 699K] libpixman-1.so.0.43.4
12+
└── [drwxr-xr-x 3] pkgconfig
13+
└── [-rw-r--r-- 227] pixman-1.pc
14+
15+
6 directories, 6 files
16+
```

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

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
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 := "pixman/pixman.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+
- git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
23+
---
24+
25+
{{- $name := print $.ImageName "-dependencies" -}}
26+
{{- define "$name" -}}
27+
altPackages:
28+
- gcc git make libtool gettext-tools meson ninja-build
29+
- tree
30+
packages:
31+
- libpng
32+
{{- end -}}
33+
34+
{{ $builderDependencies := include "$name" . | fromYaml }}
35+
36+
37+
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
38+
final: false
39+
fromImage: builder/alt
40+
secrets:
41+
- id: SOURCE_REPO
42+
value: {{ $.SOURCE_REPO_GIT }}
43+
import:
44+
- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
45+
add: /src
46+
to: /src
47+
before: install
48+
{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
49+
shell:
50+
beforeInstall:
51+
{{- include "alt packages proxy" . | nindent 2 }}
52+
- |
53+
apt-get install -y \
54+
{{ $builderDependencies.altPackages | join " " }}
55+
56+
{{- include "alt packages clean" . | nindent 2 }}
57+
58+
install:
59+
- |
60+
# Install packages
61+
PKGS="{{ $builderDependencies.packages | join " " }}"
62+
for pkg in $PKGS; do
63+
cp -a /$pkg/. /
64+
rm -rf /$pkg
65+
done
66+
67+
OUTDIR=/out
68+
cd /src
69+
70+
mkdir _build
71+
/usr/bin/meson setup _build \
72+
--prefix=/usr \
73+
--libdir=/usr/lib64 \
74+
--wrap-mode=nofallback \
75+
--wrap-mode=nodownload
76+
77+
ninja-build -j$(nproc) -C _build
78+
DESTDIR=$OUTDIR ninja-build install -C _build
79+
find $OUTDIR -type f -executable | while read -r execfile; do
80+
if strip "$execfile"; then
81+
echo "Stripped: $execfile"
82+
fi
83+
done
84+
tree -hp $OUTDIR

‎images/packages/libpng/README.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# libpng
2+
```
3+
└── [drwxr-xr-x 4.0K] usr
4+
├── [drwxr-xr-x 4.0K] bin
5+
│ ├── [lrwxrwxrwx 15] libpng-config -> libpng16-config
6+
│ ├── [-rwxr-xr-x 2.3K] libpng16-config
7+
│ ├── [-rwxr-xr-x 15K] png-fix-itxt
8+
│ └── [-rwxr-xr-x 55K] pngfix
9+
├── [drwxr-xr-x 4.0K] include
10+
│ ├── [drwxr-xr-x 4.0K] libpng16
11+
│ │ ├── [-rw-r--r-- 145K] png.h
12+
│ │ ├── [-rw-r--r-- 22K] pngconf.h
13+
│ │ └── [-rw-r--r-- 7.9K] pnglibconf.h
14+
│ ├── [lrwxrwxrwx 14] png.h -> libpng16/png.h
15+
│ ├── [lrwxrwxrwx 18] pngconf.h -> libpng16/pngconf.h
16+
│ └── [lrwxrwxrwx 21] pnglibconf.h -> libpng16/pnglibconf.h
17+
└── [drwxr-xr-x 4.0K] lib64
18+
├── [lrwxrwxrwx 11] libpng.la -> libpng16.la
19+
├── [lrwxrwxrwx 11] libpng.so -> libpng16.so
20+
├── [-rwxr-xr-x 923] libpng16.la
21+
├── [lrwxrwxrwx 19] libpng16.so -> libpng16.so.16.50.0
22+
├── [lrwxrwxrwx 19] libpng16.so.16 -> libpng16.so.16.50.0
23+
├── [-rwxr-xr-x 211K] libpng16.so.16.50.0
24+
└── [drwxr-xr-x 4.0K] pkgconfig
25+
├── [lrwxrwxrwx 11] libpng.pc -> libpng16.pc
26+
└── [-rw-r--r-- 259] libpng16.pc
27+
28+
7 directories, 18 files
29+
```

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

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
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 := "libpng.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+
- git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
23+
---
24+
25+
{{- $name := print $.ImageName "-dependencies" -}}
26+
{{- define "$name" -}}
27+
altPackages:
28+
- gcc git make libtool gettext-tools
29+
- tree
30+
packages:
31+
- zlib
32+
{{- end -}}
33+
34+
{{ $builderDependencies := include "$name" . | fromYaml }}
35+
36+
37+
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
38+
final: false
39+
fromImage: builder/alt
40+
secrets:
41+
- id: SOURCE_REPO
42+
value: {{ $.SOURCE_REPO_GIT }}
43+
import:
44+
- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
45+
add: /src
46+
to: /src
47+
before: install
48+
{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
49+
shell:
50+
beforeInstall:
51+
{{- include "alt packages proxy" . | nindent 2 }}
52+
- |
53+
apt-get install -y \
54+
{{ $builderDependencies.altPackages | join " " }}
55+
56+
{{- include "alt packages clean" . | nindent 2 }}
57+
58+
install:
59+
- |
60+
# Install packages
61+
PKGS="{{ $builderDependencies.packages | join " " }}"
62+
for pkg in $PKGS; do
63+
cp -a /$pkg/. /
64+
rm -rf /$pkg
65+
done
66+
67+
OUTDIR=/out
68+
cd /src
69+
autoreconf -fisv
70+
./configure \
71+
--prefix=/usr \
72+
--libdir=/usr/lib64 \
73+
--disable-static
74+
75+
make -j$(nproc)
76+
DESTDIR=$OUTDIR make install
77+
rm -rf $OUTDIR/usr/share
78+
find $OUTDIR -type f -executable | while read -r execfile; do
79+
if strip "$execfile"; then
80+
echo "Stripped: $execfile"
81+
fi
82+
done
83+
tree -hp $OUTDIR
84+

‎images/packages/libpsl/README.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# libpsl
2+
```
3+
[drwxr-xr-x 4.0K] /out
4+
└── [drwxr-xr-x 4.0K] usr
5+
├── [drwxr-xr-x 4.0K] bin
6+
│ ├── [-rwxr-xr-x 23K] psl
7+
│ └── [-rwxr-xr-x 22K] psl-make-dafsa
8+
├── [drwxr-xr-x 4.0K] include
9+
│ └── [-rw-r--r-- 5.7K] libpsl.h
10+
└── [drwxr-xr-x 4.0K] lib64
11+
├── [lrwxrwxrwx 11] libpsl.so -> libpsl.so.5
12+
├── [lrwxrwxrwx 15] libpsl.so.5 -> libpsl.so.5.3.5
13+
├── [-rwxr-xr-x 26K] libpsl.so.5.3.5
14+
└── [drwxr-xr-x 4.0K] pkgconfig
15+
└── [-rw-r--r-- 236] libpsl.pc
16+
17+
6 directories, 7 files
18+
```

0 commit comments

Comments
 (0)