Skip to content

Commit 36aaad1

Browse files
chore(core): build acl (#1010)
* chore(core): build acl Signed-off-by: Daniil Antoshin <daniil.antoshin@flant.com> * Update images/virt-handler/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Daniil Antoshin <daniil.antoshin@flant.com> --------- Signed-off-by: Daniil Antoshin <daniil.antoshin@flant.com> Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com>
1 parent 3a9f0ef commit 36aaad1

4 files changed

Lines changed: 71 additions & 5 deletions

File tree

component_versions/version_map.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ package:
1212
gnutls: 3.8.6
1313
dmidecode: 3-6
1414
glib2: 2.82.5
15+
acl: 2.3.1
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
---
2+
image: {{ $.ImageType }}/{{ $.ImageName }}
3+
final: false
4+
fromImage: builder/scratch
5+
import:
6+
- image: {{ $.ImageType }}/{{ $.ImageName }}-builder
7+
add: /out
8+
to: /{{ $.ImageName }}
9+
before: setup
10+
11+
---
12+
{{- $version := get $.Package $.ImageName }}
13+
{{- $gitRepoUrl := "acl.git" }}
14+
15+
{{- $name := print $.ImageName "-dependencies" -}}
16+
{{- define "$name" -}}
17+
packages:
18+
- gcc
19+
- git gettext-tools autoconf libtool gcc make
20+
- libattr-devel
21+
- tree
22+
{{- end -}}
23+
24+
{{ $builderDependencies := include "$name" . | fromYaml }}
25+
26+
image: {{ $.ImageType }}/{{ $.ImageName }}-builder
27+
final: false
28+
fromImage: builder/alt
29+
secrets:
30+
- id: SOURCE_REPO
31+
value: {{ $.SOURCE_REPO_GIT }}
32+
shell:
33+
beforeInstall:
34+
- |
35+
apt-get update && apt-get install -y \
36+
{{ $builderDependencies.packages | join " " }}
37+
rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
38+
39+
install:
40+
- |
41+
OUTDIR=/out
42+
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
43+
44+
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /src
45+
cd /src
46+
47+
./autogen.sh
48+
49+
./configure \
50+
--prefix=/usr \
51+
--libdir=/usr/lib64 \
52+
53+
make -j$(nproc)
54+
55+
make DESTDIR=$OUTDIR install
56+
57+
strip $OUTDIR/usr/bin/*

images/virt-handler/werf.inc.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ imageSpec:
5151
{{- $name := print $.ImageName "-dependencies" -}}
5252
{{- define "$name" -}}
5353
packages:
54-
- acl
5554
- libnftnl
5655
- libjansson4
5756
binaries:
@@ -86,6 +85,10 @@ import:
8685
add: /nftables
8786
to: /nftables
8887
before: install
88+
- image: packages/binaries/acl
89+
add: /acl
90+
to: /acl
91+
before: install
8992
- image: qemu
9093
add: /qemu-img
9194
to: /relocate
@@ -99,6 +102,9 @@ shell:
99102
- rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
100103
- cp -a /xorriso/. /
101104
- cp -a /nftables/. /
105+
- cp -a /acl/. /
106+
107+
- rm -rf /{xorriso,nftables,acl}
102108
setup:
103109
- |
104110
/relocate_binaries.sh -i "{{ $virtHandlerDependencies.binaries | join " " }}" -o /relocate

images/virt-launcher/werf.inc.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ libs:
102102
- libsystemd-devel
103103
- libjson-c-devel
104104
- systemtap-sdt-devel
105-
- libacl
106-
- libacl-devel
107105
- libtpms-devel libtpms
108106
- glib2-devel
109107
- libgio-devel
@@ -115,7 +113,6 @@ libs:
115113
- libisofs
116114
- libburn
117115
packages:
118-
- acl
119116
- attr
120117
- ethtool
121118
- fdisk
@@ -250,6 +247,10 @@ import:
250247
add: /gnutls
251248
to: /gnutls
252249
before: install
250+
- image: packages/binaries/acl
251+
add: /acl
252+
to: /acl
253+
before: install
253254

254255
# Statically builded
255256
- image: packages/binaries/openssl
@@ -333,11 +334,12 @@ shell:
333334
cp -a /numactl/. /
334335
cp -a /gnutls/. /
335336
cp -a /dmidecode/. /
337+
cp -a /acl/. /
336338
337339
echo "Show libs after relocation in /relocate/usr/lib64"
338340
ls -la /relocate/usr/lib64
339341
# Cleanup
340-
rm -rf /{VBINS,qemu-bins,libvirt-bins,xorriso,swtpm,numactl,gnutls,dmidecode}
342+
rm -rf /{VBINS,qemu-bins,libvirt-bins,xorriso,swtpm,numactl,gnutls,dmidecode,acl}
341343
342344
setup:
343345
- |

0 commit comments

Comments
 (0)