Skip to content

Commit 3ae565b

Browse files
author
Valeriy Khorunzhin
committed
lzo, lz4, libkrb5 use
Signed-off-by: Valeriy Khorunzhin <[email protected]>
1 parent 07bfbf9 commit 3ae565b

File tree

4 files changed

+27
-3
lines changed

4 files changed

+27
-3
lines changed

images/packages/krb5/werf.inc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ fromImage: builder/scratch
55
import:
66
- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder
77
add: /out
8-
to: /libkrb5
8+
to: /krb5
99
before: setup
1010

1111
---

images/packages/libgsasl/werf.inc.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ shell:
3737
packages:
3838
- gcc git make libtool gettext-tools
3939
- patch gperf help2man texinfo gengetopt
40-
- gtk-doc libgnutls-devel libkrb5-devel libntlm-devel libreadline-devel
40+
- gtk-doc libgnutls-devel libntlm-devel libreadline-devel
4141
{{- end -}}
4242

4343
{{ $builderDependencies := include "$name" . | fromYaml }}
@@ -46,6 +46,12 @@ image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder
4646
final: false
4747
fromImage: builder/alt
4848
import:
49+
- image: {{ .ModuleNamePrefix }}packages/krb5
50+
add: /krb5
51+
to: /relocate
52+
after: setup
53+
includePaths:
54+
- usr/lib64/libkrb5support.a
4955
- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
5056
add: /src
5157
to: /src

images/qemu/werf.inc.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,18 @@ image: {{ .ModuleNamePrefix }}{{ .ImageName }}
136136
final: false
137137
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/alt-go-svace" }}
138138
import:
139+
- image: {{ .ModuleNamePrefix }}packages/lzo
140+
add: /lzo
141+
to: /relocate
142+
after: setup
143+
includePaths:
144+
- usr/lib64/liblzo2.a
145+
- image: {{ .ModuleNamePrefix }}packages/lz4
146+
add: /lz4
147+
to: /relocate
148+
after: setup
149+
includePaths:
150+
- usr/lib64/liblz4.a
139151
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
140152
add: /{{ $gitRepoName }}-{{ $version }}
141153
to: /{{ $gitRepoName }}-{{ $version }}

images/virt-launcher/werf.inc.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ libs:
6868
- libdaxctl-devel
6969
- rdma-core-devel
7070
- bzlib-devel
71-
- liblzo2-devel
7271
- libsnappy-devel
7372
- libcacard-devel
7473
- libusbredir-devel
@@ -233,6 +232,13 @@ import:
233232
includePaths:
234233
- sbin/hwclock
235234

235+
- image: {{ .ModuleNamePrefix }}packages/lzo
236+
add: /lzo
237+
to: /relocate
238+
after: setup
239+
includePaths:
240+
- usr/lib64/liblzo2.a
241+
236242
# GNU utilities
237243
- image: tools/coreutils
238244
add: /

0 commit comments

Comments
 (0)