Skip to content

Commit ef38ae4

Browse files
committed
resolve comments
Signed-off-by: Maksim Fedotov <[email protected]>
1 parent fc67d12 commit ef38ae4

File tree

5 files changed

+5
-8
lines changed

5 files changed

+5
-8
lines changed

build/components/versions.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ package:
1515
file: FILE5_45
1616
gcc: releases/gcc-13.2.0
1717
glib2: 2.84.2
18+
# release/2.38/master from upstream glibc
19+
# https://sourceware.org/git/?p=glibc.git;a=commit;h=650a0aaaffa9ddb44732fa6156b31c5f30ee596f
20+
# https://git.altlinux.org/gears/g/glibc.git?p=glibc.git;a=log;h=bb14266fc6e81ea0239c3974d32c57f3fdefe86d
1821
glibc: 650a0aaaffa9ddb44732fa6156b31c5f30ee596f # release/2.38/master
1922
libgmp: 6.3.0
2023
gnutls: 3.8.10

images/dvcr-artifact/werf.inc.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ binaries:
8181
- /usr/bin/qemu-img
8282
- /usr/bin/qemu-nbd
8383
- /usr/lib64/libnbd.s*
84-
# do not include following packages, it will be replaced by one from q
85-
# - glibc selinux
8684
packages:
8785
- bzip2 file nbdkit libnbd xz libxml2
8886
- libseccomp zlib zstd

images/packages/libvirt/werf.inc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ shell:
259259
rm -rf $OUTDIR/usr/share/bash-completion/
260260
rm -rf $OUTDIR/etc/ssh/
261261
rm -rf $OUTDIR/usr/share/doc
262+
rm -rf $OUTDIR/usr/local/share/locale/
262263
263264
find $OUTDIR -type f -executable | while read -r execfile; do
264265
if strip "$execfile"; then

images/packages/swtpm/werf.inc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ altPackages:
3535
- tpm2-pkcs11 tpm2-pkcs11-tools tpm2-tools tpm2-abrmd
3636
- libgnutls-openssl-devel
3737
- libfuse-devel
38-
- libseccomp
3938
- perl-podlators
4039
packages:
4140
- libgmp libtpms openssl libjson-glib

images/virt-launcher/werf.inc.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ shell:
392392
---
393393
image: {{ .ModuleNamePrefix }}{{ .ImageName }}-gobuilder
394394
final: false
395-
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/golang-alt-svace-1.24.9" }}
395+
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-alt" "builder/golang-alt-svace-1.24.9" }}
396396
git:
397397
- add: {{ .ModuleDir }}/images/{{ .ImageName }}/node-labeller
398398
to: /node-labeller
@@ -414,10 +414,6 @@ secrets:
414414
- id: GOPROXY
415415
value: {{ .GOPROXY }}
416416
shell:
417-
beforeInstall:
418-
{{- include "alt packages proxy" . | nindent 2 }}
419-
- apt-get install -y golang ca-certificates gcc
420-
{{- include "alt packages clean" . | nindent 2 }}
421417
install:
422418
- |
423419
# Install packages

0 commit comments

Comments
 (0)