From bbbb1455296226456a858190f23c8b296cfeec2c Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 21 Aug 2025 17:17:50 +0300 Subject: [PATCH 01/64] pre Signed-off-by: Valeriy Khorunzhin --- build/components/versions.yml | 4 ++ images/packages/krb5/werf.inc.yaml | 79 ++++++++++++++++++++++++++++++ images/packages/lz4/werf.inc.yaml | 63 ++++++++++++++++++++++++ images/packages/lzo/werf.inc.yaml | 67 +++++++++++++++++++++++++ images/packages/xz/werf.inc.yaml | 71 +++++++++++++++++++++++++++ 5 files changed, 284 insertions(+) create mode 100644 images/packages/krb5/werf.inc.yaml create mode 100644 images/packages/lz4/werf.inc.yaml create mode 100644 images/packages/lzo/werf.inc.yaml create mode 100644 images/packages/xz/werf.inc.yaml diff --git a/build/components/versions.yml b/build/components/versions.yml index 5fb98de68c..f7c42b3308 100644 --- a/build/components/versions.yml +++ b/build/components/versions.yml @@ -75,3 +75,7 @@ package: util-linux: v2.41.1 zlib: v1.3.1 zstd: v1.5.7 + krb5: krb5-1.21.3-final + lz4: v1.9.4 + lzo: v2.10 + xz: v5.4.5 diff --git a/images/packages/krb5/werf.inc.yaml b/images/packages/krb5/werf.inc.yaml new file mode 100644 index 0000000000..172fb968fc --- /dev/null +++ b/images/packages/krb5/werf.inc.yaml @@ -0,0 +1,79 @@ +--- +image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }} +final: false +fromImage: builder/scratch +import: +- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder + add: /out + to: /libkrb5 + before: setup + +--- +{{- $version := get $.PackageVersion $.ImageName }} +# {{- $gitRepoUrl := "gcc.git" }} + +image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact +final: false +fromImage: builder/src +secrets: +- id: SOURCE_REPO + value: {{ $.SOURCE_REPO_GIT }} +shell: + install: + - | + mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config + + # git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src + git clone https://github.com/krb5/krb5 --branch {{ $version }} --depth=1 /src + +--- +{{- $name := print $.ImageName "-dependencies" -}} +{{- define "$name" -}} +packages: +- git gcc automake make +- flex libcom_err-devel libkeyutils-devel bison +- libncurses-devel libss-devel libssl-devel libtinfo-devel +- libpam-devel +{{- end -}} + +{{ $builderDependencies := include "$name" . | fromYaml }} + +image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder +final: false +fromImage: builder/alt +import: +- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact + add: /src + to: /src + before: install +shell: + beforeInstall: + {{- include "alt packages proxy" . | nindent 2 }} + - | + apt-get install -y \ + {{ $builderDependencies.packages | join " " }} + + {{- include "alt packages clean" . | nindent 2 }} + + install: + - | + OUTDIR=/out + + cd /src/src + export YACC="bison -y" + + autoreconf + + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib64 \ + --enable-shared --disable-static \ + --with-system-et \ + --with-system-ss \ + --enable-dns-for-realm \ + --enable-pkinit \ + --with-pkinit-crypto-impl=openssl \ + --with-tls-impl=openssl + + make -j$(nproc) + make DESTDIR=$OUTDIR install diff --git a/images/packages/lz4/werf.inc.yaml b/images/packages/lz4/werf.inc.yaml new file mode 100644 index 0000000000..3b41402581 --- /dev/null +++ b/images/packages/lz4/werf.inc.yaml @@ -0,0 +1,63 @@ +--- +image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }} +final: false +fromImage: builder/scratch +import: +- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder + add: /out + to: /liblz4 + before: setup + +--- +{{- $version := get $.PackageVersion $.ImageName }} +# {{- $gitRepoUrl := "gcc.git" }} + +image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact +final: false +fromImage: builder/src +secrets: +- id: SOURCE_REPO + value: {{ $.SOURCE_REPO_GIT }} +shell: + install: + - | + mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config + + # git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src + git clone https://github.com/lz4/lz4 --branch {{ $version }} --depth=1 /src + +--- +{{- $name := print $.ImageName "-dependencies" -}} +{{- define "$name" -}} +packages: +- git gcc automake make +{{- end -}} + +{{ $builderDependencies := include "$name" . | fromYaml }} + +image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder +final: false +fromImage: builder/alt +import: +- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact + add: /src + to: /src + before: install +shell: + beforeInstall: + {{- include "alt packages proxy" . | nindent 2 }} + - | + apt-get install -y \ + {{ $builderDependencies.packages | join " " }} + + {{- include "alt packages clean" . | nindent 2 }} + + install: + - | + OUTDIR=/out + + cd /src + + make -j$(nproc) + make DESTDIR=$OUTDIR install + mv /out/usr/local/lib/ /out/usr/lib64 diff --git a/images/packages/lzo/werf.inc.yaml b/images/packages/lzo/werf.inc.yaml new file mode 100644 index 0000000000..ce82259847 --- /dev/null +++ b/images/packages/lzo/werf.inc.yaml @@ -0,0 +1,67 @@ +--- +image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }} +final: false +fromImage: builder/scratch +import: +- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder + add: /out + to: /liblzo2 + before: setup + +--- +{{- $version := get $.PackageVersion $.ImageName }} +# {{- $gitRepoUrl := "gcc.git" }} + +image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact +final: false +fromImage: builder/src +secrets: +- id: SOURCE_REPO + value: {{ $.SOURCE_REPO_GIT }} +shell: + install: + - | + mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config + + # git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src + git clone git://git.altlinux.org/gears/l/lzo.git --branch {{ $version }} --depth=1 /src + +--- +{{- $name := print $.ImageName "-dependencies" -}} +{{- define "$name" -}} +packages: +- git gcc make +{{- end -}} + +{{ $builderDependencies := include "$name" . | fromYaml }} + +image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder +final: false +fromImage: builder/alt +import: +- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact + add: /src + to: /src + before: install +shell: + beforeInstall: + {{- include "alt packages proxy" . | nindent 2 }} + - | + apt-get install -y \ + {{ $builderDependencies.packages | join " " }} + + {{- include "alt packages clean" . | nindent 2 }} + + install: + - | + OUTDIR=/out + + cd /src + + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib64 \ + --enable-shared \ + --disable-silent-rules + make -j$(nproc) + make DESTDIR=$OUTDIR install diff --git a/images/packages/xz/werf.inc.yaml b/images/packages/xz/werf.inc.yaml new file mode 100644 index 0000000000..7b44653d88 --- /dev/null +++ b/images/packages/xz/werf.inc.yaml @@ -0,0 +1,71 @@ +--- +image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }} +final: false +fromImage: builder/scratch +import: +- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder + add: /out + to: /liblzma + before: setup + +--- +{{- $version := get $.PackageVersion $.ImageName }} +# {{- $gitRepoUrl := "gcc.git" }} + +image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact +final: false +fromImage: builder/src +secrets: +- id: SOURCE_REPO + value: {{ $.SOURCE_REPO_GIT }} +shell: + install: + - | + mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config + + # git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src + git clone https://github.com/tukaani-project/xz --branch {{ $version }} --depth=1 /src + +--- +{{- $name := print $.ImageName "-dependencies" -}} +{{- define "$name" -}} +packages: +- git gcc automake make +- glibc-devel-static gettext-devel +- libtool po4a doxygen +{{- end -}} + +{{ $builderDependencies := include "$name" . | fromYaml }} + +image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder +final: false +fromImage: builder/alt +import: +- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact + add: /src + to: /src + before: install +shell: + beforeInstall: + {{- include "alt packages proxy" . | nindent 2 }} + - | + apt-get install -y \ + {{ $builderDependencies.packages | join " " }} + + {{- include "alt packages clean" . | nindent 2 }} + + install: + - | + OUTDIR=/out + + cd /src + + ./autogen.sh + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib64 \ + --enable-dynamic \ + --disable-scripts + + make -j$(nproc) + make DESTDIR=$OUTDIR install From dc95f65de0c1550d5b696cea07329543b0f8a397 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Fri, 22 Aug 2025 11:07:19 +0300 Subject: [PATCH 02/64] fox capture Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/werf.inc.yaml | 5 ++--- images/packages/lzo/werf.inc.yaml | 5 ++--- images/packages/xz/werf.inc.yaml | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/images/packages/krb5/werf.inc.yaml b/images/packages/krb5/werf.inc.yaml index 172fb968fc..f39e1c48d9 100644 --- a/images/packages/krb5/werf.inc.yaml +++ b/images/packages/krb5/werf.inc.yaml @@ -10,7 +10,7 @@ import: --- {{- $version := get $.PackageVersion $.ImageName }} -# {{- $gitRepoUrl := "gcc.git" }} +{{- $gitRepoUrl := "krb5/krb5.git" }} image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact final: false @@ -23,8 +23,7 @@ shell: - | mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config - # git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src - git clone https://github.com/krb5/krb5 --branch {{ $version }} --depth=1 /src + git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src --- {{- $name := print $.ImageName "-dependencies" -}} diff --git a/images/packages/lzo/werf.inc.yaml b/images/packages/lzo/werf.inc.yaml index ce82259847..78d251f5db 100644 --- a/images/packages/lzo/werf.inc.yaml +++ b/images/packages/lzo/werf.inc.yaml @@ -10,7 +10,7 @@ import: --- {{- $version := get $.PackageVersion $.ImageName }} -# {{- $gitRepoUrl := "gcc.git" }} +{{- $gitRepoUrl := "oberhumer/lzo.git" }} image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact final: false @@ -23,8 +23,7 @@ shell: - | mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config - # git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src - git clone git://git.altlinux.org/gears/l/lzo.git --branch {{ $version }} --depth=1 /src + git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src --- {{- $name := print $.ImageName "-dependencies" -}} diff --git a/images/packages/xz/werf.inc.yaml b/images/packages/xz/werf.inc.yaml index 7b44653d88..e0bb9cf162 100644 --- a/images/packages/xz/werf.inc.yaml +++ b/images/packages/xz/werf.inc.yaml @@ -10,7 +10,7 @@ import: --- {{- $version := get $.PackageVersion $.ImageName }} -# {{- $gitRepoUrl := "gcc.git" }} +{{- $gitRepoUrl := "tukaani-project/xz.git" }} image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact final: false @@ -23,8 +23,7 @@ shell: - | mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config - # git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src - git clone https://github.com/tukaani-project/xz --branch {{ $version }} --depth=1 /src + git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src --- {{- $name := print $.ImageName "-dependencies" -}} From 7db82401853246b647a1a58cca4afd0646dcf6c3 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Fri, 22 Aug 2025 11:09:40 +0300 Subject: [PATCH 03/64] fix versions Signed-off-by: Valeriy Khorunzhin --- build/components/versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/components/versions.yml b/build/components/versions.yml index f7c42b3308..60ba022d52 100644 --- a/build/components/versions.yml +++ b/build/components/versions.yml @@ -77,5 +77,5 @@ package: zstd: v1.5.7 krb5: krb5-1.21.3-final lz4: v1.9.4 - lzo: v2.10 + lzo: lzo-2.10 xz: v5.4.5 From 0b20ecb7d82c9dbacf7a4f2860d90e5bb3a985bf Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Fri, 22 Aug 2025 12:39:12 +0300 Subject: [PATCH 04/64] fox fox fox Signed-off-by: Valeriy Khorunzhin --- images/packages/lz4/werf.inc.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/images/packages/lz4/werf.inc.yaml b/images/packages/lz4/werf.inc.yaml index 3b41402581..bb72b7af34 100644 --- a/images/packages/lz4/werf.inc.yaml +++ b/images/packages/lz4/werf.inc.yaml @@ -10,7 +10,7 @@ import: --- {{- $version := get $.PackageVersion $.ImageName }} -# {{- $gitRepoUrl := "gcc.git" }} +{{- $gitRepoUrl := "lz4/lz4.git" }} image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact final: false @@ -23,8 +23,7 @@ shell: - | mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config - # git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src - git clone https://github.com/lz4/lz4 --branch {{ $version }} --depth=1 /src + git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src --- {{- $name := print $.ImageName "-dependencies" -}} From f4957d226913d9ff7aa3567821e7f3f938364cf8 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Tue, 26 Aug 2025 07:39:29 +0300 Subject: [PATCH 05/64] static and readme Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/README.md | 166 +++++++++++++++++ images/packages/krb5/werf.inc.yaml | 19 +- images/packages/lz4/README.md | 32 ++++ images/packages/lz4/werf.inc.yaml | 2 +- images/packages/lzo/README.md | 40 ++++ images/packages/lzo/werf.inc.yaml | 2 +- images/packages/xz/README.md | 282 +++++++++++++++++++++++++++++ images/packages/xz/werf.inc.yaml | 2 +- 8 files changed, 533 insertions(+), 12 deletions(-) create mode 100644 images/packages/krb5/README.md create mode 100644 images/packages/lz4/README.md create mode 100644 images/packages/lzo/README.md create mode 100644 images/packages/xz/README.md diff --git a/images/packages/krb5/README.md b/images/packages/krb5/README.md new file mode 100644 index 0000000000..d202a14a4f --- /dev/null +++ b/images/packages/krb5/README.md @@ -0,0 +1,166 @@ +# krb5 +/libkrb5 +``` +`-- usr + |-- bin + | |-- gss-client + | |-- k5srvutil + | |-- kadmin + | |-- kdestroy + | |-- kinit + | |-- klist + | |-- kpasswd + | |-- krb5-config + | |-- ksu + | |-- kswitch + | |-- ktutil + | |-- kvno + | |-- sclient + | |-- sim_client + | `-- uuclient + |-- include + | |-- gssapi + | | |-- gssapi.h + | | |-- gssapi_alloc.h + | | |-- gssapi_ext.h + | | |-- gssapi_generic.h + | | |-- gssapi_krb5.h + | | `-- mechglue.h + | |-- gssapi.h + | |-- gssrpc + | | |-- auth.h + | | |-- auth_gss.h + | | |-- auth_gssapi.h + | | |-- auth_unix.h + | | |-- clnt.h + | | |-- netdb.h + | | |-- pmap_clnt.h + | | |-- pmap_prot.h + | | |-- pmap_rmt.h + | | |-- rename.h + | | |-- rpc.h + | | |-- rpc_msg.h + | | |-- svc.h + | | |-- svc_auth.h + | | |-- types.h + | | `-- xdr.h + | |-- kadm5 + | | |-- admin.h + | | |-- chpass_util_strings.h + | | `-- kadm_err.h + | |-- kdb.h + | |-- krad.h + | |-- krb5 + | | |-- ccselect_plugin.h + | | |-- certauth_plugin.h + | | |-- clpreauth_plugin.h + | | |-- hostrealm_plugin.h + | | |-- kadm5_auth_plugin.h + | | |-- kadm5_hook_plugin.h + | | |-- kdcpolicy_plugin.h + | | |-- kdcpreauth_plugin.h + | | |-- krb5.h + | | |-- localauth_plugin.h + | | |-- locate_plugin.h + | | |-- plugin.h + | | |-- preauth_plugin.h + | | `-- pwqual_plugin.h + | |-- krb5.h + | |-- profile.h + | |-- verto-module.h + | `-- verto.h + |-- lib64 + | |-- krb5 + | | `-- plugins + | | |-- authdata + | | |-- kdb + | | |-- libkrb5 + | | |-- preauth + | | `-- tls + | |-- libgssapi_krb5.a + | |-- libgssrpc.a + | |-- libk5crypto.a + | |-- libkadm5clnt.a -> libkadm5clnt_mit.a + | |-- libkadm5clnt_mit.a + | |-- libkadm5srv.a -> libkadm5srv_mit.a + | |-- libkadm5srv_mit.a + | |-- libkdb5.a + | |-- libkrad.a + | |-- libkrb5.a + | |-- libkrb5_db2.a + | |-- libkrb5_k5tls.a + | |-- libkrb5_otp.a + | |-- libkrb5_pkinit.a + | |-- libkrb5_spake.a + | |-- libkrb5_test.a + | |-- libkrb5support.a + | |-- libverto.a + | `-- pkgconfig + | |-- gssrpc.pc + | |-- kadm-client.pc + | |-- kadm-server.pc + | |-- kdb.pc + | |-- krb5-gssapi.pc + | |-- krb5.pc + | |-- mit-krb5-gssapi.pc + | `-- mit-krb5.pc + |-- sbin + | |-- gss-server + | |-- kadmin.local + | |-- kadmind + | |-- kdb5_util + | |-- kprop + | |-- kpropd + | |-- kproplog + | |-- krb5-send-pr + | |-- krb5kdc + | |-- sim_server + | |-- sserver + | `-- uuserver + |-- share + | |-- examples + | | `-- krb5 + | | |-- kdc.conf + | | |-- krb5.conf + | | `-- services.append + | `-- man + | |-- cat1 + | |-- cat5 + | |-- cat7 + | |-- cat8 + | |-- man1 + | | |-- k5srvutil.1 + | | |-- kadmin.1 + | | |-- kdestroy.1 + | | |-- kinit.1 + | | |-- klist.1 + | | |-- kpasswd.1 + | | |-- krb5-config.1 + | | |-- ksu.1 + | | |-- kswitch.1 + | | |-- ktutil.1 + | | |-- kvno.1 + | | `-- sclient.1 + | |-- man5 + | | |-- k5identity.5 + | | |-- k5login.5 + | | |-- kadm5.acl.5 + | | |-- kdc.conf.5 + | | `-- krb5.conf.5 + | |-- man7 + | | `-- kerberos.7 + | `-- man8 + | |-- kadmin.local.8 + | |-- kadmind.8 + | |-- kdb5_ldap_util.8 + | |-- kdb5_util.8 + | |-- kprop.8 + | |-- kpropd.8 + | |-- kproplog.8 + | |-- krb5kdc.8 + | `-- sserver.8 + `-- var + |-- krb5kdc + `-- run + `-- krb5kdc +``` \ No newline at end of file diff --git a/images/packages/krb5/werf.inc.yaml b/images/packages/krb5/werf.inc.yaml index f39e1c48d9..3f37092a63 100644 --- a/images/packages/krb5/werf.inc.yaml +++ b/images/packages/krb5/werf.inc.yaml @@ -60,19 +60,20 @@ shell: cd /src/src export YACC="bison -y" + export CFLAGS="-O2 -fcommon" autoreconf ./configure \ - --prefix=/usr \ - --libdir=/usr/lib64 \ - --enable-shared --disable-static \ - --with-system-et \ - --with-system-ss \ - --enable-dns-for-realm \ - --enable-pkinit \ - --with-pkinit-crypto-impl=openssl \ - --with-tls-impl=openssl + --prefix=/usr \ + --libdir=/usr/lib64 \ + --disable-shared --enable-static \ + --enable-dns-for-realm \ + --enable-pkinit \ + --with-system-et \ + --with-system-ss \ + --with-pkinit-crypto-impl=openssl \ + --with-tls-impl=openssl make -j$(nproc) make DESTDIR=$OUTDIR install diff --git a/images/packages/lz4/README.md b/images/packages/lz4/README.md new file mode 100644 index 0000000000..89afd8d54d --- /dev/null +++ b/images/packages/lz4/README.md @@ -0,0 +1,32 @@ +# lz4 +/lz4 +``` +`-- usr + |-- lib64 + | |-- liblz4.a + | |-- liblz4.so -> liblz4.so.1.9.4 + | |-- liblz4.so.1 -> liblz4.so.1.9.4 + | |-- liblz4.so.1.9.4 + | `-- pkgconfig + | `-- liblz4.pc + `-- local + |-- bin + | |-- lz4 + | |-- lz4c -> lz4 + | |-- lz4cat -> lz4 + | `-- unlz4 -> lz4 + |-- include + | |-- lz4.h + | |-- lz4frame.h + | |-- lz4frame_static.h + | `-- lz4hc.h + `-- share + `-- man + `-- man1 + |-- lz4.1 + |-- lz4c.1 -> lz4.1 + |-- lz4cat.1 -> lz4.1 + `-- unlz4.1 -> lz4.1 + +10 directories, 17 files +``` \ No newline at end of file diff --git a/images/packages/lz4/werf.inc.yaml b/images/packages/lz4/werf.inc.yaml index bb72b7af34..562c22b04c 100644 --- a/images/packages/lz4/werf.inc.yaml +++ b/images/packages/lz4/werf.inc.yaml @@ -5,7 +5,7 @@ fromImage: builder/scratch import: - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder add: /out - to: /liblz4 + to: /lz4 before: setup --- diff --git a/images/packages/lzo/README.md b/images/packages/lzo/README.md new file mode 100644 index 0000000000..03a7fed186 --- /dev/null +++ b/images/packages/lzo/README.md @@ -0,0 +1,40 @@ +# lzo +/lzo +``` +`-- usr + |-- include + | `-- lzo + | |-- lzo1.h + | |-- lzo1a.h + | |-- lzo1b.h + | |-- lzo1c.h + | |-- lzo1f.h + | |-- lzo1x.h + | |-- lzo1y.h + | |-- lzo1z.h + | |-- lzo2a.h + | |-- lzo_asm.h + | |-- lzoconf.h + | |-- lzodefs.h + | `-- lzoutil.h + |-- lib64 + | |-- liblzo2.a + | |-- liblzo2.la + | |-- liblzo2.so -> liblzo2.so.2.0.0 + | |-- liblzo2.so.2 -> liblzo2.so.2.0.0 + | |-- liblzo2.so.2.0.0 + | `-- pkgconfig + | `-- lzo2.pc + `-- share + `-- doc + `-- lzo + |-- AUTHORS + |-- COPYING + |-- LZO.FAQ + |-- LZO.TXT + |-- LZOAPI.TXT + |-- NEWS + `-- THANKS + +9 directories, 26 files +``` \ No newline at end of file diff --git a/images/packages/lzo/werf.inc.yaml b/images/packages/lzo/werf.inc.yaml index 78d251f5db..5c42c92f0d 100644 --- a/images/packages/lzo/werf.inc.yaml +++ b/images/packages/lzo/werf.inc.yaml @@ -5,7 +5,7 @@ fromImage: builder/scratch import: - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder add: /out - to: /liblzo2 + to: /lzo before: setup --- diff --git a/images/packages/xz/README.md b/images/packages/xz/README.md new file mode 100644 index 0000000000..4938006afb --- /dev/null +++ b/images/packages/xz/README.md @@ -0,0 +1,282 @@ +# xz +/xz +``` +`-- usr + |-- bin + | |-- lzcat -> xz + | |-- lzma -> xz + | |-- lzmadec + | |-- lzmainfo + | |-- unlzma -> xz + | |-- unxz -> xz + | |-- xz + | |-- xzcat -> xz + | `-- xzdec + |-- include + | |-- lzma + | | |-- base.h + | | |-- bcj.h + | | |-- block.h + | | |-- check.h + | | |-- container.h + | | |-- delta.h + | | |-- filter.h + | | |-- hardware.h + | | |-- index.h + | | |-- index_hash.h + | | |-- lzma12.h + | | |-- stream_flags.h + | | |-- version.h + | | `-- vli.h + | `-- lzma.h + |-- lib64 + | |-- liblzma.a + | |-- liblzma.la + | |-- liblzma.so -> liblzma.so.5.4.5 + | |-- liblzma.so.5 -> liblzma.so.5.4.5 + | |-- liblzma.so.5.4.5 + | `-- pkgconfig + | `-- liblzma.pc + `-- share + |-- doc + | `-- xz + | |-- AUTHORS + | |-- COPYING + | |-- COPYING.GPLv2 + | |-- NEWS + | |-- README + | |-- THANKS + | |-- TODO + | |-- api + | | |-- annotated.html + | | |-- base_8h.html + | | |-- bc_s.png + | | |-- bc_sd.png + | | |-- bcj_8h.html + | | |-- block_8h.html + | | |-- check_8h.html + | | |-- classes.html + | | |-- closed.png + | | |-- container_8h.html + | | |-- delta_8h.html + | | |-- dir_b17a1d403082bd69a703ed987cf158fb.html + | | |-- doc.svg + | | |-- docd.svg + | | |-- doxygen.css + | | |-- doxygen.svg + | | |-- doxygen_crawl.html + | | |-- files.html + | | |-- filter_8h.html + | | |-- folderclosed.svg + | | |-- folderclosedd.svg + | | |-- folderopen.svg + | | |-- folderopend.svg + | | |-- functions.html + | | |-- functions_vars.html + | | |-- globals.html + | | |-- globals_defs.html + | | |-- globals_enum.html + | | |-- globals_eval.html + | | |-- globals_func.html + | | |-- globals_type.html + | | |-- hardware_8h.html + | | |-- index.html + | | |-- index_8h.html + | | |-- index__hash_8h.html + | | |-- lzma12_8h.html + | | |-- lzma_8h.html + | | |-- minus.svg + | | |-- minusd.svg + | | |-- nav_f.png + | | |-- nav_fd.png + | | |-- nav_g.png + | | |-- nav_h.png + | | |-- nav_hd.png + | | |-- navtree.css + | | |-- open.png + | | |-- plus.svg + | | |-- plusd.svg + | | |-- splitbar.png + | | |-- splitbard.png + | | |-- stream__flags_8h.html + | | |-- structlzma__allocator.html + | | |-- structlzma__block.html + | | |-- structlzma__filter.html + | | |-- structlzma__index__iter.html + | | |-- structlzma__mt.html + | | |-- structlzma__options__bcj.html + | | |-- structlzma__options__delta.html + | | |-- structlzma__options__lzma.html + | | |-- structlzma__stream.html + | | |-- structlzma__stream__flags.html + | | |-- sync_off.png + | | |-- sync_on.png + | | |-- tab_a.png + | | |-- tab_ad.png + | | |-- tab_b.png + | | |-- tab_bd.png + | | |-- tab_h.png + | | |-- tab_hd.png + | | |-- tab_s.png + | | |-- tab_sd.png + | | |-- tabs.css + | | |-- version_8h.html + | | `-- vli_8h.html + | |-- examples + | | |-- 00_README.txt + | | |-- 01_compress_easy.c + | | |-- 02_decompress.c + | | |-- 03_compress_custom.c + | | |-- 04_compress_easy_mt.c + | | `-- Makefile + | |-- examples_old + | | |-- xz_pipe_comp.c + | | `-- xz_pipe_decomp.c + | |-- faq.txt + | |-- history.txt + | |-- lzma-file-format.txt + | `-- xz-file-format.txt + |-- locale + | |-- ca + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- cs + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- da + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- de + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- eo + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- es + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- fi + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- fr + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- hr + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- hu + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- it + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- ko + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- pl + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- pt + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- pt_BR + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- ro + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- sr + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- sv + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- tr + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- uk + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- vi + | | `-- LC_MESSAGES + | | `-- xz.mo + | |-- zh_CN + | | `-- LC_MESSAGES + | | `-- xz.mo + | `-- zh_TW + | `-- LC_MESSAGES + | `-- xz.mo + `-- man + |-- de + | `-- man1 + | |-- lzcat.1 -> xz.1 + | |-- lzma.1 -> xz.1 + | |-- lzmadec.1 -> xzdec.1 + | |-- unlzma.1 -> xz.1 + | |-- unxz.1 -> xz.1 + | |-- xz.1 + | |-- xzcat.1 -> xz.1 + | `-- xzdec.1 + |-- fr + | `-- man1 + | |-- lzcat.1 -> xz.1 + | |-- lzma.1 -> xz.1 + | |-- lzmadec.1 -> xzdec.1 + | |-- unlzma.1 -> xz.1 + | |-- unxz.1 -> xz.1 + | |-- xz.1 + | |-- xzcat.1 -> xz.1 + | `-- xzdec.1 + |-- ko + | `-- man1 + | |-- lzcat.1 -> xz.1 + | |-- lzma.1 -> xz.1 + | |-- lzmadec.1 -> xzdec.1 + | |-- unlzma.1 -> xz.1 + | |-- unxz.1 -> xz.1 + | |-- xz.1 + | |-- xzcat.1 -> xz.1 + | `-- xzdec.1 + |-- man1 + | |-- lzcat.1 -> xz.1 + | |-- lzma.1 -> xz.1 + | |-- lzmadec.1 -> xzdec.1 + | |-- lzmainfo.1 + | |-- unlzma.1 -> xz.1 + | |-- unxz.1 -> xz.1 + | |-- xz.1 + | |-- xzcat.1 -> xz.1 + | `-- xzdec.1 + |-- pt_BR + | `-- man1 + | |-- lzcat.1 -> xz.1 + | |-- lzma.1 -> xz.1 + | |-- lzmadec.1 -> xzdec.1 + | |-- unlzma.1 -> xz.1 + | |-- unxz.1 -> xz.1 + | |-- xz.1 + | |-- xzcat.1 -> xz.1 + | `-- xzdec.1 + |-- ro + | `-- man1 + | |-- lzcat.1 -> xz.1 + | |-- lzma.1 -> xz.1 + | |-- lzmadec.1 -> xzdec.1 + | |-- unlzma.1 -> xz.1 + | |-- unxz.1 -> xz.1 + | |-- xz.1 + | |-- xzcat.1 -> xz.1 + | `-- xzdec.1 + `-- uk + `-- man1 + |-- lzcat.1 -> xz.1 + |-- lzma.1 -> xz.1 + |-- lzmadec.1 -> xzdec.1 + |-- unlzma.1 -> xz.1 + |-- unxz.1 -> xz.1 + |-- xz.1 + |-- xzcat.1 -> xz.1 + `-- xzdec.1 + +74 directories, 203 files +``` \ No newline at end of file diff --git a/images/packages/xz/werf.inc.yaml b/images/packages/xz/werf.inc.yaml index e0bb9cf162..7f5f5387c0 100644 --- a/images/packages/xz/werf.inc.yaml +++ b/images/packages/xz/werf.inc.yaml @@ -5,7 +5,7 @@ fromImage: builder/scratch import: - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder add: /out - to: /liblzma + to: /xz before: setup --- From ae01170295d8fed86ae0e368aa3e05bae8f3f0cd Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Tue, 26 Aug 2025 23:41:04 +0300 Subject: [PATCH 06/64] lzo, lz4, libkrb5, openldap, xz use Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/werf.inc.yaml | 2 +- images/packages/libcurl/werf.inc.yaml | 7 +++++++ images/packages/libgsasl/werf.inc.yaml | 6 ++++++ images/packages/nbdkit/werf.inc.yaml | 8 ++++++++ images/qemu/werf.inc.yaml | 16 +++++++++++++++- images/virt-launcher/werf.inc.yaml | 8 +++++++- 6 files changed, 44 insertions(+), 3 deletions(-) diff --git a/images/packages/krb5/werf.inc.yaml b/images/packages/krb5/werf.inc.yaml index 3f37092a63..4a5aa759c9 100644 --- a/images/packages/krb5/werf.inc.yaml +++ b/images/packages/krb5/werf.inc.yaml @@ -5,7 +5,7 @@ fromImage: builder/scratch import: - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder add: /out - to: /libkrb5 + to: /krb5 before: setup --- diff --git a/images/packages/libcurl/werf.inc.yaml b/images/packages/libcurl/werf.inc.yaml index 18519b7e2c..9fbe149419 100644 --- a/images/packages/libcurl/werf.inc.yaml +++ b/images/packages/libcurl/werf.inc.yaml @@ -58,6 +58,13 @@ secrets: - id: SOURCE_REPO value: {{ $.SOURCE_REPO_GIT }} import: +- image: {{ .ModuleNamePrefix }}packages/openldap + add: /openldap + to: / + before: install + includePaths: + - usr/lib64/libldap.a + - usr/lib64/pkgconfig/ldap.pc - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact add: /src to: /src diff --git a/images/packages/libgsasl/werf.inc.yaml b/images/packages/libgsasl/werf.inc.yaml index 871f6267f2..1319a0c1f7 100644 --- a/images/packages/libgsasl/werf.inc.yaml +++ b/images/packages/libgsasl/werf.inc.yaml @@ -47,6 +47,12 @@ image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder final: false fromImage: builder/alt import: +- image: {{ .ModuleNamePrefix }}packages/krb5 + add: /krb5 + to: /relocate + after: setup + includePaths: + - usr/lib64/libkrb5support.a - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact add: /src to: /src diff --git a/images/packages/nbdkit/werf.inc.yaml b/images/packages/nbdkit/werf.inc.yaml index 805c56be3f..d91632468b 100644 --- a/images/packages/nbdkit/werf.inc.yaml +++ b/images/packages/nbdkit/werf.inc.yaml @@ -49,6 +49,14 @@ image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder final: false fromImage: builder/alt import: +- image: {{ .ModuleNamePrefix }}packages/xz + add: /xz + to: / + before: install + includePaths: + - usr/lib64/liblzma.a + - usr/lib64/pkgconfig/liblzma.pc + - usr/include - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact add: /src to: /src diff --git a/images/qemu/werf.inc.yaml b/images/qemu/werf.inc.yaml index 97f9f4afb6..2e0e3c08ba 100644 --- a/images/qemu/werf.inc.yaml +++ b/images/qemu/werf.inc.yaml @@ -136,6 +136,20 @@ image: {{ .ModuleNamePrefix }}{{ .ImageName }} final: false fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/alt-go-svace" }} import: +- image: {{ .ModuleNamePrefix }}packages/lzo + add: /lzo + to: / + before: install + includePaths: + - usr/lib64/liblzo2.a + - usr/lib64/pkgconfig/lzo2.pc + - usr/include +- image: {{ .ModuleNamePrefix }}packages/lz4 + add: /lz4 + to: / + before: install + includePaths: + - usr/lib64/liblz4.a - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact add: /{{ $gitRepoName }}-{{ $version }} to: /{{ $gitRepoName }}-{{ $version }} @@ -333,7 +347,7 @@ shell: --enable-vnc-sasl \ --enable-werror \ --enable-xkbcommon \ - --enable-zstd + --enable-zstd && cat /qemu-9.2.0/build/meson-logs/meson-log.txt {{- $_ := set $ "ProjectName" (list $.ImageName "qemu" | join "/") }} {{- include "image-build.build" (set $ "BuildCommand" `make -j$(nproc)`) | nindent 6 }} diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index ebb162d3ab..5f3c8aa587 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -60,7 +60,6 @@ altLibs: - libpmem-devel - libdaxctl-devel - bzlib-devel - - liblzo2-devel - libsnappy-devel - libcacard-devel - libusbredir-devel @@ -226,6 +225,13 @@ import: includePaths: - sbin/hwclock +- image: {{ .ModuleNamePrefix }}packages/lzo + add: /lzo + to: /relocate + after: setup + includePaths: + - usr/lib64/liblzo2.a + # GNU utilities - image: tools/coreutils add: / From 3c7f710056302c7713c8b3d50da6d1f258d1f6bd Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 27 Aug 2025 14:01:18 +0300 Subject: [PATCH 07/64] openldap dynamic Signed-off-by: Valeriy Khorunzhin --- images/packages/libcurl/werf.inc.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/packages/libcurl/werf.inc.yaml b/images/packages/libcurl/werf.inc.yaml index 9fbe149419..a2c2f316f0 100644 --- a/images/packages/libcurl/werf.inc.yaml +++ b/images/packages/libcurl/werf.inc.yaml @@ -63,8 +63,7 @@ import: to: / before: install includePaths: - - usr/lib64/libldap.a - - usr/lib64/pkgconfig/ldap.pc + - usr/lib64/libldap.so.2 - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact add: /src to: /src From eba7ef5eee12796de5e9058bd1cdc38477bc54c4 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 27 Aug 2025 14:10:11 +0300 Subject: [PATCH 08/64] xz dynamic Signed-off-by: Valeriy Khorunzhin --- images/packages/file/werf.inc.yaml | 7 +++++++ images/packages/nbdkit/werf.inc.yaml | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/images/packages/file/werf.inc.yaml b/images/packages/file/werf.inc.yaml index eb9635bf9d..4cd902d199 100644 --- a/images/packages/file/werf.inc.yaml +++ b/images/packages/file/werf.inc.yaml @@ -45,6 +45,13 @@ image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder final: false fromImage: builder/alt import: +- image: {{ .ModuleNamePrefix }}packages/xz + add: /xz + to: / + before: install + includePaths: + - usr/lib64/liblzma.so.5 + - usr/include - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact add: /src to: /src diff --git a/images/packages/nbdkit/werf.inc.yaml b/images/packages/nbdkit/werf.inc.yaml index d91632468b..0b13c8ac8c 100644 --- a/images/packages/nbdkit/werf.inc.yaml +++ b/images/packages/nbdkit/werf.inc.yaml @@ -54,8 +54,7 @@ import: to: / before: install includePaths: - - usr/lib64/liblzma.a - - usr/lib64/pkgconfig/liblzma.pc + - usr/lib64/liblzma.so.5 - usr/include - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact add: /src From b93d08d5443829bdea1c20bfc8e7a6c2a85a2786 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 27 Aug 2025 15:43:19 +0300 Subject: [PATCH 09/64] dynamic liblz4 Signed-off-by: Valeriy Khorunzhin --- images/qemu/werf.inc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/qemu/werf.inc.yaml b/images/qemu/werf.inc.yaml index 2e0e3c08ba..f2facfe13d 100644 --- a/images/qemu/werf.inc.yaml +++ b/images/qemu/werf.inc.yaml @@ -149,7 +149,7 @@ import: to: / before: install includePaths: - - usr/lib64/liblz4.a + - usr/lib64/liblz4.so.1 - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact add: /{{ $gitRepoName }}-{{ $version }} to: /{{ $gitRepoName }}-{{ $version }} From 5785654e91c0c50853ae2ed64405d8adabd8a586 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 27 Aug 2025 16:42:59 +0300 Subject: [PATCH 10/64] lzo dynamic Signed-off-by: Valeriy Khorunzhin --- images/qemu/werf.inc.yaml | 4 ++-- images/virt-launcher/werf.inc.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/qemu/werf.inc.yaml b/images/qemu/werf.inc.yaml index f2facfe13d..1b982450b1 100644 --- a/images/qemu/werf.inc.yaml +++ b/images/qemu/werf.inc.yaml @@ -141,8 +141,8 @@ import: to: / before: install includePaths: - - usr/lib64/liblzo2.a - - usr/lib64/pkgconfig/lzo2.pc + - usr/lib64/liblzo2.so.2 + - usr/lib64/liblzo2.so.2.0.0 - usr/include - image: {{ .ModuleNamePrefix }}packages/lz4 add: /lz4 diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index 5f3c8aa587..c8f765252c 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -230,7 +230,7 @@ import: to: /relocate after: setup includePaths: - - usr/lib64/liblzo2.a + - usr/lib64/liblzo2.so.2 # GNU utilities - image: tools/coreutils From 1c533efe61d5cbcba083364e99208400dc78e185 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 27 Aug 2025 16:46:53 +0300 Subject: [PATCH 11/64] ttt Signed-off-by: Valeriy Khorunzhin --- images/virt-launcher/werf.inc.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index c8f765252c..28c51e6d00 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -225,13 +225,6 @@ import: includePaths: - sbin/hwclock -- image: {{ .ModuleNamePrefix }}packages/lzo - add: /lzo - to: /relocate - after: setup - includePaths: - - usr/lib64/liblzo2.so.2 - # GNU utilities - image: tools/coreutils add: / From f5aab2b877a3b7dcaea9bdcb42aad21e274574da Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 27 Aug 2025 16:53:07 +0300 Subject: [PATCH 12/64] ttt Signed-off-by: Valeriy Khorunzhin --- images/packages/file/werf.inc.yaml | 7 ------- images/packages/nbdkit/werf.inc.yaml | 7 ------- 2 files changed, 14 deletions(-) diff --git a/images/packages/file/werf.inc.yaml b/images/packages/file/werf.inc.yaml index 4cd902d199..eb9635bf9d 100644 --- a/images/packages/file/werf.inc.yaml +++ b/images/packages/file/werf.inc.yaml @@ -45,13 +45,6 @@ image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder final: false fromImage: builder/alt import: -- image: {{ .ModuleNamePrefix }}packages/xz - add: /xz - to: / - before: install - includePaths: - - usr/lib64/liblzma.so.5 - - usr/include - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact add: /src to: /src diff --git a/images/packages/nbdkit/werf.inc.yaml b/images/packages/nbdkit/werf.inc.yaml index 0b13c8ac8c..805c56be3f 100644 --- a/images/packages/nbdkit/werf.inc.yaml +++ b/images/packages/nbdkit/werf.inc.yaml @@ -49,13 +49,6 @@ image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder final: false fromImage: builder/alt import: -- image: {{ .ModuleNamePrefix }}packages/xz - add: /xz - to: / - before: install - includePaths: - - usr/lib64/liblzma.so.5 - - usr/include - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact add: /src to: /src From b87a03d5ccc5ff681bef36ff8f00301f913c5e8e Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 27 Aug 2025 16:58:11 +0300 Subject: [PATCH 13/64] tttt Signed-off-by: Valeriy Khorunzhin --- images/packages/libgsasl/werf.inc.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/images/packages/libgsasl/werf.inc.yaml b/images/packages/libgsasl/werf.inc.yaml index 1319a0c1f7..871f6267f2 100644 --- a/images/packages/libgsasl/werf.inc.yaml +++ b/images/packages/libgsasl/werf.inc.yaml @@ -47,12 +47,6 @@ image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder final: false fromImage: builder/alt import: -- image: {{ .ModuleNamePrefix }}packages/krb5 - add: /krb5 - to: /relocate - after: setup - includePaths: - - usr/lib64/libkrb5support.a - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact add: /src to: /src From a43c1eb644e453bbba3c24e96a1115281bb715ef Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 27 Aug 2025 23:53:47 +0300 Subject: [PATCH 14/64] qemu fix Signed-off-by: Valeriy Khorunzhin --- images/qemu/werf.inc.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/qemu/werf.inc.yaml b/images/qemu/werf.inc.yaml index 1b982450b1..cd94636fa9 100644 --- a/images/qemu/werf.inc.yaml +++ b/images/qemu/werf.inc.yaml @@ -211,6 +211,8 @@ shell: git apply --ignore-space-change --ignore-whitespace ${p} && echo OK || (echo FAIL ; exit 1) done + ln /usr/lib64/liblzo2.so.2 /usr/lib64/liblzo2.so + ./configure \ --target-list="x86_64-softmmu" \ --with-pkgversion="-dvp" \ From fd83422765a65eb37ca62cd9224846f03b722588 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 28 Aug 2025 15:04:49 +0300 Subject: [PATCH 15/64] lzo && lz4 Signed-off-by: Valeriy Khorunzhin --- images/qemu/werf.inc.yaml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/images/qemu/werf.inc.yaml b/images/qemu/werf.inc.yaml index cd94636fa9..97f9f4afb6 100644 --- a/images/qemu/werf.inc.yaml +++ b/images/qemu/werf.inc.yaml @@ -136,20 +136,6 @@ image: {{ .ModuleNamePrefix }}{{ .ImageName }} final: false fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/alt-go-svace" }} import: -- image: {{ .ModuleNamePrefix }}packages/lzo - add: /lzo - to: / - before: install - includePaths: - - usr/lib64/liblzo2.so.2 - - usr/lib64/liblzo2.so.2.0.0 - - usr/include -- image: {{ .ModuleNamePrefix }}packages/lz4 - add: /lz4 - to: / - before: install - includePaths: - - usr/lib64/liblz4.so.1 - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact add: /{{ $gitRepoName }}-{{ $version }} to: /{{ $gitRepoName }}-{{ $version }} @@ -211,8 +197,6 @@ shell: git apply --ignore-space-change --ignore-whitespace ${p} && echo OK || (echo FAIL ; exit 1) done - ln /usr/lib64/liblzo2.so.2 /usr/lib64/liblzo2.so - ./configure \ --target-list="x86_64-softmmu" \ --with-pkgversion="-dvp" \ @@ -349,7 +333,7 @@ shell: --enable-vnc-sasl \ --enable-werror \ --enable-xkbcommon \ - --enable-zstd && cat /qemu-9.2.0/build/meson-logs/meson-log.txt + --enable-zstd {{- $_ := set $ "ProjectName" (list $.ImageName "qemu" | join "/") }} {{- include "image-build.build" (set $ "BuildCommand" `make -j$(nproc)`) | nindent 6 }} From 21a1620356e39821247747db3176ea5b33a5cba5 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 28 Aug 2025 19:40:11 +0300 Subject: [PATCH 16/64] build build build Signed-off-by: Valeriy Khorunzhin --- images/cdi-importer/werf.inc.yaml | 2 +- images/libvirt/werf.inc.yaml | 2 ++ images/packages/libnbd/werf.inc.yaml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/images/cdi-importer/werf.inc.yaml b/images/cdi-importer/werf.inc.yaml index 078f2b2b30..be6a02c29c 100644 --- a/images/cdi-importer/werf.inc.yaml +++ b/images/cdi-importer/werf.inc.yaml @@ -54,7 +54,7 @@ import: add: /qemu-img to: /relocate before: setup -{{- $images := list "nbdkit" "libnbd" -}} +{{- $images := list "nbdkit" "libnbd" "xz" -}} {{- include "importPackageImages" (list . $images "install") -}} shell: install: diff --git a/images/libvirt/werf.inc.yaml b/images/libvirt/werf.inc.yaml index 2ae82db181..ca0e7f7ab5 100644 --- a/images/libvirt/werf.inc.yaml +++ b/images/libvirt/werf.inc.yaml @@ -116,6 +116,8 @@ import: add: /qemu-img to: /qemu-img before: install +{{- $images := list "krb5" "xz" -}} +{{- include "importPackageImages" (list . $images "install") -}} shell: beforeInstall: {{- include "alt packages proxy" . | nindent 2 }} diff --git a/images/packages/libnbd/werf.inc.yaml b/images/packages/libnbd/werf.inc.yaml index 5e0af92f70..ea8f5288eb 100644 --- a/images/packages/libnbd/werf.inc.yaml +++ b/images/packages/libnbd/werf.inc.yaml @@ -7,6 +7,8 @@ import: add: /out to: /{{ $.ImageName }} before: setup +{{- $images := list "xz" -}} +{{- include "importPackageImages" (list . $images "install") -}} --- {{- $version := get .PackageVersion .ImageName }} From 7a809555a7abc39c6bf395edd03f0224abe0b4f8 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Fri, 29 Aug 2025 11:48:27 +0300 Subject: [PATCH 17/64] t Signed-off-by: Valeriy Khorunzhin --- images/dvcr-artifact/werf.inc.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/dvcr-artifact/werf.inc.yaml b/images/dvcr-artifact/werf.inc.yaml index 070620e232..3b8c8d909c 100644 --- a/images/dvcr-artifact/werf.inc.yaml +++ b/images/dvcr-artifact/werf.inc.yaml @@ -27,6 +27,8 @@ secrets: - id: GOPROXY value: {{ .GOPROXY }} import: +{{- $images := list "xz" -}} +{{- include "importPackageImages" (list . $images "install") -}} {{- include "importPackageImages" (list . $builderDeps.packages "install") -}} shell: beforeInstall: From ae427c733ccbfc552c404829704dad9d6d4034d1 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 1 Sep 2025 14:47:07 +0300 Subject: [PATCH 18/64] new template Signed-off-by: Valeriy Khorunzhin --- images/cdi-artifact/werf.inc.yaml | 1 + images/dvcr-artifact/werf.inc.yaml | 4 +--- images/libvirt/werf.inc.yaml | 3 +-- images/packages/file/werf.inc.yaml | 10 +++++++++- images/packages/libnbd/werf.inc.yaml | 4 +--- images/qemu/werf.inc.yaml | 18 +++++++++++++++++- images/virt-launcher/werf.inc.yaml | 6 +++--- 7 files changed, 33 insertions(+), 13 deletions(-) diff --git a/images/cdi-artifact/werf.inc.yaml b/images/cdi-artifact/werf.inc.yaml index 8cdd1fd798..9a0eaf70a0 100644 --- a/images/cdi-artifact/werf.inc.yaml +++ b/images/cdi-artifact/werf.inc.yaml @@ -10,6 +10,7 @@ binaries: - /cdi-binaries/cdi-source-update-poller packages: - libnbd +- xz {{- end -}} {{ $builderDependencies := include "$name" . | fromYaml }} diff --git a/images/dvcr-artifact/werf.inc.yaml b/images/dvcr-artifact/werf.inc.yaml index 3b8c8d909c..e4d285a15d 100644 --- a/images/dvcr-artifact/werf.inc.yaml +++ b/images/dvcr-artifact/werf.inc.yaml @@ -27,8 +27,6 @@ secrets: - id: GOPROXY value: {{ .GOPROXY }} import: -{{- $images := list "xz" -}} -{{- include "importPackageImages" (list . $images "install") -}} {{- include "importPackageImages" (list . $builderDeps.packages "install") -}} shell: beforeInstall: @@ -85,7 +83,7 @@ binaries: - /usr/bin/qemu-nbd - /usr/lib64/libnbd.s* packages: -- bzip2 file nbdkit libnbd +- bzip2 file nbdkit libnbd xz {{- end -}} {{ $builderDependencies := include "$name" . | fromYaml }} diff --git a/images/libvirt/werf.inc.yaml b/images/libvirt/werf.inc.yaml index ca0e7f7ab5..3e147f8bf4 100644 --- a/images/libvirt/werf.inc.yaml +++ b/images/libvirt/werf.inc.yaml @@ -92,6 +92,7 @@ packages: - openssl libcurl e2fsprogs libxcrypt numactl - zlib p11-kit - libssh libssh2 libjson-c5 keyutils +- krb5 xz {{- end -}} {{ $builderDependencies := include "$name" . | fromYaml }} @@ -116,8 +117,6 @@ import: add: /qemu-img to: /qemu-img before: install -{{- $images := list "krb5" "xz" -}} -{{- include "importPackageImages" (list . $images "install") -}} shell: beforeInstall: {{- include "alt packages proxy" . | nindent 2 }} diff --git a/images/packages/file/werf.inc.yaml b/images/packages/file/werf.inc.yaml index eb9635bf9d..5ade730fc4 100644 --- a/images/packages/file/werf.inc.yaml +++ b/images/packages/file/werf.inc.yaml @@ -35,7 +35,7 @@ altPackages: - bzlib-devel liblzma-devel libseccomp-devel libcap-devel lzip ncompress strace - tree packages: -- zlib zstd +- zlib zstd xz {{- end -}} @@ -60,6 +60,14 @@ shell: {{- include "alt packages clean" . | nindent 2 }} install: + - | + # Install packages + PKGS="{{ $builderDependencies.packages | join " " }}" + for pkg in $PKGS; do + cp -a /$pkg/. / + rm -rf /$pkg + done + - | # Install packages PKGS="{{ $builderDependencies.packages | join " " }}" diff --git a/images/packages/libnbd/werf.inc.yaml b/images/packages/libnbd/werf.inc.yaml index ea8f5288eb..1b631e097e 100644 --- a/images/packages/libnbd/werf.inc.yaml +++ b/images/packages/libnbd/werf.inc.yaml @@ -7,8 +7,6 @@ import: add: /out to: /{{ $.ImageName }} before: setup -{{- $images := list "xz" -}} -{{- include "importPackageImages" (list . $images "install") -}} --- {{- $version := get .PackageVersion .ImageName }} @@ -35,7 +33,7 @@ altPackages: - liburing-devel libxml2-devel perl-podlators - ocaml ocaml-findlib ocaml-ocamldoc packages: -- gnutls libidn2 libgmp ubdsrv +- gnutls libidn2 libgmp ubdsrv xz {{- end -}} {{ $builderDependencies := include "$name" . | fromYaml }} diff --git a/images/qemu/werf.inc.yaml b/images/qemu/werf.inc.yaml index 97f9f4afb6..7f5bae5ca4 100644 --- a/images/qemu/werf.inc.yaml +++ b/images/qemu/werf.inc.yaml @@ -64,6 +64,22 @@ shell: --- {{- $name := print $.ImageName "-dependencies" -}} {{- define "$name" -}} +packages: +- dmidecode +- libgcrypt +- nettle +- libcap-ng +- libcapstone +- openssl +- libcurl +- e2fsprogs +- libxcrypt +- numactl +- lzo +- lz4 +- krb5 +- openldap +- xz altPackages: - binutils - pkgconfig pkg-config @@ -151,7 +167,6 @@ import: includePaths: - install-qemu.sh - relocate_binaries.sh -{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}} secrets: - id: SOURCE_REPO value: {{ $.SOURCE_REPO_GIT }} @@ -177,6 +192,7 @@ shell: - | # Install packages PKGS="{{ $builderDependencies.packages | join " " }}" + PKGS="{{ $builderDependencies.packages | join " " }}" for pkg in $PKGS; do cp -a /$pkg/. / rm -rf /$pkg diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index 28c51e6d00..89d7937df2 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -129,6 +129,7 @@ packages: - zlib zstd p11-kit linux-pam - libssh libssh2 - libpixman libqpl rdma-core +- krb5 xz {{- end -}} {{ $builderDependencies := include "$name" . | fromYaml }} @@ -209,8 +210,6 @@ import: - node-labeller - vlctl -{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}} - # Statically builded - image: {{ .ModuleNamePrefix }}packages/openssl add: /openssl @@ -404,7 +403,8 @@ git: install: - '**/*' import: -{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}} +{{- $images := list "libcap-ng" "e2fsprogs" "libxcrypt" "openssl" "xz" "krb5" -}} +{{- include "importPackageImages" (list . $images "install") -}} secrets: - id: GOPROXY value: {{ .GOPROXY }} From fc7c181fdb2b5726ec5ece492c37687f36945005 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 1 Sep 2025 15:08:48 +0300 Subject: [PATCH 19/64] fix virt-launcher Signed-off-by: Valeriy Khorunzhin --- images/virt-launcher/werf.inc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index 89d7937df2..e656bc5e87 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -422,7 +422,7 @@ shell: {{- end }} - | # Install packages - PKGS="{{ $builderDependencies.packages | join " " }}" + PKGS="{{ $images | join " " }}" for pkg in $PKGS; do cp -a /$pkg/. / rm -rf /$pkg From cba2853cd4805db64366a9d9cfadcfb74fec4670 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 1 Sep 2025 16:52:55 +0300 Subject: [PATCH 20/64] fix qemu build Signed-off-by: Valeriy Khorunzhin --- images/qemu/werf.inc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/qemu/werf.inc.yaml b/images/qemu/werf.inc.yaml index 7f5bae5ca4..fe324c75bb 100644 --- a/images/qemu/werf.inc.yaml +++ b/images/qemu/werf.inc.yaml @@ -167,6 +167,7 @@ import: includePaths: - install-qemu.sh - relocate_binaries.sh + {{- include "importPackageImages" (list . $builderDependencies.packages "install") -}} secrets: - id: SOURCE_REPO value: {{ $.SOURCE_REPO_GIT }} From 831029aa30aae1fa43044bd1a8013d0d2119acfe Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 1 Sep 2025 17:04:59 +0300 Subject: [PATCH 21/64] virt-launcher fix Signed-off-by: Valeriy Khorunzhin --- images/virt-launcher/werf.inc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index e656bc5e87..35b34546be 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -240,6 +240,7 @@ import: before: setup includePaths: - temp_pod +{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}} shell: beforeInstall: {{- include "alt packages proxy" . | nindent 2 }} From b123a51a982126183507fb9ae78c5ce0087e606b Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Tue, 2 Sep 2025 11:22:58 +0300 Subject: [PATCH 22/64] clean krb5 Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/werf.inc.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/images/packages/krb5/werf.inc.yaml b/images/packages/krb5/werf.inc.yaml index 4a5aa759c9..564161dd17 100644 --- a/images/packages/krb5/werf.inc.yaml +++ b/images/packages/krb5/werf.inc.yaml @@ -5,7 +5,7 @@ fromImage: builder/scratch import: - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder add: /out - to: /krb5 + to: /{{ $.ImageName }} before: setup --- @@ -29,7 +29,7 @@ shell: {{- $name := print $.ImageName "-dependencies" -}} {{- define "$name" -}} packages: -- git gcc automake make +- git gcc automake make tree - flex libcom_err-devel libkeyutils-devel bison - libncurses-devel libss-devel libssl-devel libtinfo-devel - libpam-devel @@ -77,3 +77,8 @@ shell: make -j$(nproc) make DESTDIR=$OUTDIR install + rm -rf $OUTDIR/usr/bin + rm -rf $OUTDIR/usr/share + rm -rf $OUTDIR/usr/sbin + rm -rf $OUTDIR/usr/var + tree $OUTDIR From 45bc12fb24ab7082a72bddf1338325dbf1afbb2b Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Tue, 2 Sep 2025 11:34:58 +0300 Subject: [PATCH 23/64] change krb5 tree Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/README.md | 251 ++++++++++++--------------------- 1 file changed, 89 insertions(+), 162 deletions(-) diff --git a/images/packages/krb5/README.md b/images/packages/krb5/README.md index d202a14a4f..16bd362866 100644 --- a/images/packages/krb5/README.md +++ b/images/packages/krb5/README.md @@ -1,166 +1,93 @@ # krb5 /libkrb5 ``` -`-- usr - |-- bin - | |-- gss-client - | |-- k5srvutil - | |-- kadmin - | |-- kdestroy - | |-- kinit - | |-- klist - | |-- kpasswd - | |-- krb5-config - | |-- ksu - | |-- kswitch - | |-- ktutil - | |-- kvno - | |-- sclient - | |-- sim_client - | `-- uuclient - |-- include - | |-- gssapi - | | |-- gssapi.h - | | |-- gssapi_alloc.h - | | |-- gssapi_ext.h - | | |-- gssapi_generic.h - | | |-- gssapi_krb5.h - | | `-- mechglue.h - | |-- gssapi.h - | |-- gssrpc - | | |-- auth.h - | | |-- auth_gss.h - | | |-- auth_gssapi.h - | | |-- auth_unix.h - | | |-- clnt.h - | | |-- netdb.h - | | |-- pmap_clnt.h - | | |-- pmap_prot.h - | | |-- pmap_rmt.h - | | |-- rename.h - | | |-- rpc.h - | | |-- rpc_msg.h - | | |-- svc.h - | | |-- svc_auth.h - | | |-- types.h - | | `-- xdr.h - | |-- kadm5 - | | |-- admin.h - | | |-- chpass_util_strings.h - | | `-- kadm_err.h - | |-- kdb.h - | |-- krad.h - | |-- krb5 - | | |-- ccselect_plugin.h - | | |-- certauth_plugin.h - | | |-- clpreauth_plugin.h - | | |-- hostrealm_plugin.h - | | |-- kadm5_auth_plugin.h - | | |-- kadm5_hook_plugin.h - | | |-- kdcpolicy_plugin.h - | | |-- kdcpreauth_plugin.h - | | |-- krb5.h - | | |-- localauth_plugin.h - | | |-- locate_plugin.h - | | |-- plugin.h - | | |-- preauth_plugin.h - | | `-- pwqual_plugin.h - | |-- krb5.h - | |-- profile.h - | |-- verto-module.h - | `-- verto.h - |-- lib64 - | |-- krb5 - | | `-- plugins - | | |-- authdata - | | |-- kdb - | | |-- libkrb5 - | | |-- preauth - | | `-- tls - | |-- libgssapi_krb5.a - | |-- libgssrpc.a - | |-- libk5crypto.a - | |-- libkadm5clnt.a -> libkadm5clnt_mit.a - | |-- libkadm5clnt_mit.a - | |-- libkadm5srv.a -> libkadm5srv_mit.a - | |-- libkadm5srv_mit.a - | |-- libkdb5.a - | |-- libkrad.a - | |-- libkrb5.a - | |-- libkrb5_db2.a - | |-- libkrb5_k5tls.a - | |-- libkrb5_otp.a - | |-- libkrb5_pkinit.a - | |-- libkrb5_spake.a - | |-- libkrb5_test.a - | |-- libkrb5support.a - | |-- libverto.a - | `-- pkgconfig - | |-- gssrpc.pc - | |-- kadm-client.pc - | |-- kadm-server.pc - | |-- kdb.pc - | |-- krb5-gssapi.pc - | |-- krb5.pc - | |-- mit-krb5-gssapi.pc - | `-- mit-krb5.pc - |-- sbin - | |-- gss-server - | |-- kadmin.local - | |-- kadmind - | |-- kdb5_util - | |-- kprop - | |-- kpropd - | |-- kproplog - | |-- krb5-send-pr - | |-- krb5kdc - | |-- sim_server - | |-- sserver - | `-- uuserver - |-- share - | |-- examples - | | `-- krb5 - | | |-- kdc.conf - | | |-- krb5.conf - | | `-- services.append - | `-- man - | |-- cat1 - | |-- cat5 - | |-- cat7 - | |-- cat8 - | |-- man1 - | | |-- k5srvutil.1 - | | |-- kadmin.1 - | | |-- kdestroy.1 - | | |-- kinit.1 - | | |-- klist.1 - | | |-- kpasswd.1 - | | |-- krb5-config.1 - | | |-- ksu.1 - | | |-- kswitch.1 - | | |-- ktutil.1 - | | |-- kvno.1 - | | `-- sclient.1 - | |-- man5 - | | |-- k5identity.5 - | | |-- k5login.5 - | | |-- kadm5.acl.5 - | | |-- kdc.conf.5 - | | `-- krb5.conf.5 - | |-- man7 - | | `-- kerberos.7 - | `-- man8 - | |-- kadmin.local.8 - | |-- kadmind.8 - | |-- kdb5_ldap_util.8 - | |-- kdb5_util.8 - | |-- kprop.8 - | |-- kpropd.8 - | |-- kproplog.8 - | |-- krb5kdc.8 - | `-- sserver.8 - `-- var - |-- krb5kdc - `-- run - `-- krb5kdc +/out + └── usr + ├── include + │ ├── gssapi + │ │ ├── gssapi.h + │ │ ├── gssapi_alloc.h + │ │ ├── gssapi_ext.h + │ │ ├── gssapi_generic.h + │ │ ├── gssapi_krb5.h + │ │ └── mechglue.h + │ ├── gssapi.h + │ ├── gssrpc + │ │ ├── auth.h + │ │ ├── auth_gss.h + │ │ ├── auth_gssapi.h + │ │ ├── auth_unix.h + │ │ ├── clnt.h + │ │ ├── netdb.h + │ │ ├── pmap_clnt.h + │ │ ├── pmap_prot.h + │ │ ├── pmap_rmt.h + │ │ ├── rename.h + │ │ ├── rpc.h + │ │ ├── rpc_msg.h + │ │ ├── svc.h + │ │ ├── svc_auth.h + │ │ ├── types.h + │ │ └── xdr.h + │ ├── kadm5 + │ │ ├── admin.h + │ │ ├── chpass_util_strings.h + │ │ └── kadm_err.h + │ ├── kdb.h + │ ├── krad.h + │ ├── krb5 + │ │ ├── ccselect_plugin.h + │ │ ├── certauth_plugin.h + │ │ ├── clpreauth_plugin.h + │ │ ├── hostrealm_plugin.h + │ │ ├── kadm5_auth_plugin.h + │ │ ├── kadm5_hook_plugin.h + │ │ ├── kdcpolicy_plugin.h + │ │ ├── kdcpreauth_plugin.h + │ │ ├── krb5.h + │ │ ├── localauth_plugin.h + │ │ ├── locate_plugin.h + │ │ ├── plugin.h + │ │ ├── preauth_plugin.h + │ │ └── pwqual_plugin.h + │ ├── krb5.h + │ ├── profile.h + │ ├── verto-module.h + │ └── verto.h + └── lib64 + ├── krb5 + │ └── plugins + │ ├── authdata + │ ├── kdb + │ ├── libkrb5 + │ ├── preauth + │ └── tls + ├── libgssapi_krb5.a + ├── libgssrpc.a + ├── libk5crypto.a + ├── libkadm5clnt.a -> libkadm5clnt_mit.a + ├── libkadm5clnt_mit.a + ├── libkadm5srv.a -> libkadm5srv_mit.a + ├── libkadm5srv_mit.a + ├── libkdb5.a + ├── libkrad.a + ├── libkrb5.a + ├── libkrb5_db2.a + ├── libkrb5_k5tls.a + ├── libkrb5_otp.a + ├── libkrb5_pkinit.a + ├── libkrb5_spake.a + ├── libkrb5_test.a + ├── libkrb5support.a + ├── libverto.a + └── pkgconfig + ├── gssrpc.pc + ├── kadm-client.pc + ├── kadm-server.pc + ├── kdb.pc + ├── krb5-gssapi.pc + ├── krb5.pc + ├── mit-krb5-gssapi.pc + └── mit-krb5.pc + 16 directories, 72 files ``` \ No newline at end of file From bdd0b5c757612b3c49f7d9089f3322b304094465 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Tue, 2 Sep 2025 11:41:43 +0300 Subject: [PATCH 24/64] thin images Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/werf.inc.yaml | 4 ++-- images/packages/lz4/werf.inc.yaml | 11 +++++++---- images/packages/lzo/werf.inc.yaml | 11 +++++++---- images/packages/xz/werf.inc.yaml | 10 +++++++--- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/images/packages/krb5/werf.inc.yaml b/images/packages/krb5/werf.inc.yaml index 564161dd17..4a68d24957 100644 --- a/images/packages/krb5/werf.inc.yaml +++ b/images/packages/krb5/werf.inc.yaml @@ -28,7 +28,7 @@ shell: --- {{- $name := print $.ImageName "-dependencies" -}} {{- define "$name" -}} -packages: +altPackages: - git gcc automake make tree - flex libcom_err-devel libkeyutils-devel bison - libncurses-devel libss-devel libssl-devel libtinfo-devel @@ -50,7 +50,7 @@ shell: {{- include "alt packages proxy" . | nindent 2 }} - | apt-get install -y \ - {{ $builderDependencies.packages | join " " }} + {{ $builderDependencies.altPackages | join " " }} {{- include "alt packages clean" . | nindent 2 }} diff --git a/images/packages/lz4/werf.inc.yaml b/images/packages/lz4/werf.inc.yaml index 562c22b04c..dfc68fcb9f 100644 --- a/images/packages/lz4/werf.inc.yaml +++ b/images/packages/lz4/werf.inc.yaml @@ -5,7 +5,7 @@ fromImage: builder/scratch import: - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder add: /out - to: /lz4 + to: /{{ $.ImageName }} before: setup --- @@ -28,8 +28,8 @@ shell: --- {{- $name := print $.ImageName "-dependencies" -}} {{- define "$name" -}} -packages: -- git gcc automake make +altPackages: +- git gcc automake make tree {{- end -}} {{ $builderDependencies := include "$name" . | fromYaml }} @@ -47,7 +47,7 @@ shell: {{- include "alt packages proxy" . | nindent 2 }} - | apt-get install -y \ - {{ $builderDependencies.packages | join " " }} + {{ $builderDependencies.altPackages | join " " }} {{- include "alt packages clean" . | nindent 2 }} @@ -60,3 +60,6 @@ shell: make -j$(nproc) make DESTDIR=$OUTDIR install mv /out/usr/local/lib/ /out/usr/lib64 + + rm -rf $OUTDIR/usr/local + tree $OUTDIR diff --git a/images/packages/lzo/werf.inc.yaml b/images/packages/lzo/werf.inc.yaml index 5c42c92f0d..c515d100ba 100644 --- a/images/packages/lzo/werf.inc.yaml +++ b/images/packages/lzo/werf.inc.yaml @@ -5,7 +5,7 @@ fromImage: builder/scratch import: - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder add: /out - to: /lzo + to: /{{ $.ImageName }} before: setup --- @@ -28,8 +28,8 @@ shell: --- {{- $name := print $.ImageName "-dependencies" -}} {{- define "$name" -}} -packages: -- git gcc make +altPackages: +- git gcc make tree {{- end -}} {{ $builderDependencies := include "$name" . | fromYaml }} @@ -47,7 +47,7 @@ shell: {{- include "alt packages proxy" . | nindent 2 }} - | apt-get install -y \ - {{ $builderDependencies.packages | join " " }} + {{ $builderDependencies.altPackages | join " " }} {{- include "alt packages clean" . | nindent 2 }} @@ -64,3 +64,6 @@ shell: --disable-silent-rules make -j$(nproc) make DESTDIR=$OUTDIR install + + rm -rf $OUTDIR/usr/share + tree $OUTDIR diff --git a/images/packages/xz/werf.inc.yaml b/images/packages/xz/werf.inc.yaml index 7f5f5387c0..ba4b8d6d7b 100644 --- a/images/packages/xz/werf.inc.yaml +++ b/images/packages/xz/werf.inc.yaml @@ -5,7 +5,7 @@ fromImage: builder/scratch import: - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder add: /out - to: /xz + to: /{{ $.ImageName }} before: setup --- @@ -28,10 +28,11 @@ shell: --- {{- $name := print $.ImageName "-dependencies" -}} {{- define "$name" -}} -packages: +altPackages: - git gcc automake make - glibc-devel-static gettext-devel - libtool po4a doxygen +- tree {{- end -}} {{ $builderDependencies := include "$name" . | fromYaml }} @@ -49,7 +50,7 @@ shell: {{- include "alt packages proxy" . | nindent 2 }} - | apt-get install -y \ - {{ $builderDependencies.packages | join " " }} + {{ $builderDependencies.altPackages | join " " }} {{- include "alt packages clean" . | nindent 2 }} @@ -68,3 +69,6 @@ shell: make -j$(nproc) make DESTDIR=$OUTDIR install + + rm -rf /$OUTDIR/usr/share + tree $OUTDIR From 9747ca41c521d3a03b0079b567e41b49783cbfa9 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Tue, 2 Sep 2025 12:04:44 +0300 Subject: [PATCH 25/64] change readme Signed-off-by: Valeriy Khorunzhin --- images/packages/lz4/README.md | 36 +--- images/packages/lzo/README.md | 61 +++---- images/packages/xz/README.md | 315 ++++------------------------------ 3 files changed, 73 insertions(+), 339 deletions(-) diff --git a/images/packages/lz4/README.md b/images/packages/lz4/README.md index 89afd8d54d..88a91f482e 100644 --- a/images/packages/lz4/README.md +++ b/images/packages/lz4/README.md @@ -1,32 +1,14 @@ # lz4 /lz4 ``` -`-- usr - |-- lib64 - | |-- liblz4.a - | |-- liblz4.so -> liblz4.so.1.9.4 - | |-- liblz4.so.1 -> liblz4.so.1.9.4 - | |-- liblz4.so.1.9.4 - | `-- pkgconfig - | `-- liblz4.pc - `-- local - |-- bin - | |-- lz4 - | |-- lz4c -> lz4 - | |-- lz4cat -> lz4 - | `-- unlz4 -> lz4 - |-- include - | |-- lz4.h - | |-- lz4frame.h - | |-- lz4frame_static.h - | `-- lz4hc.h - `-- share - `-- man - `-- man1 - |-- lz4.1 - |-- lz4c.1 -> lz4.1 - |-- lz4cat.1 -> lz4.1 - `-- unlz4.1 -> lz4.1 +└── usr + └── lib64 + ├── liblz4.a + ├── liblz4.so -> liblz4.so.1.9.4 + ├── liblz4.so.1 -> liblz4.so.1.9.4 + ├── liblz4.so.1.9.4 + └── pkgconfig + └── liblz4.pc -10 directories, 17 files +4 directories, 5 files ``` \ No newline at end of file diff --git a/images/packages/lzo/README.md b/images/packages/lzo/README.md index 03a7fed186..c4780b1bed 100644 --- a/images/packages/lzo/README.md +++ b/images/packages/lzo/README.md @@ -1,40 +1,31 @@ # lzo /lzo ``` -`-- usr - |-- include - | `-- lzo - | |-- lzo1.h - | |-- lzo1a.h - | |-- lzo1b.h - | |-- lzo1c.h - | |-- lzo1f.h - | |-- lzo1x.h - | |-- lzo1y.h - | |-- lzo1z.h - | |-- lzo2a.h - | |-- lzo_asm.h - | |-- lzoconf.h - | |-- lzodefs.h - | `-- lzoutil.h - |-- lib64 - | |-- liblzo2.a - | |-- liblzo2.la - | |-- liblzo2.so -> liblzo2.so.2.0.0 - | |-- liblzo2.so.2 -> liblzo2.so.2.0.0 - | |-- liblzo2.so.2.0.0 - | `-- pkgconfig - | `-- lzo2.pc - `-- share - `-- doc - `-- lzo - |-- AUTHORS - |-- COPYING - |-- LZO.FAQ - |-- LZO.TXT - |-- LZOAPI.TXT - |-- NEWS - `-- THANKS +/out +└── usr + ├── include + │ └── lzo + │ ├── lzo1.h + │ ├── lzo1a.h + │ ├── lzo1b.h + │ ├── lzo1c.h + │ ├── lzo1f.h + │ ├── lzo1x.h + │ ├── lzo1y.h + │ ├── lzo1z.h + │ ├── lzo2a.h + │ ├── lzo_asm.h + │ ├── lzoconf.h + │ ├── lzodefs.h + │ └── lzoutil.h + └── lib64 + ├── liblzo2.a + ├── liblzo2.la + ├── liblzo2.so -> liblzo2.so.2.0.0 + ├── liblzo2.so.2 -> liblzo2.so.2.0.0 + ├── liblzo2.so.2.0.0 + └── pkgconfig + └── lzo2.pc -9 directories, 26 files +6 directories, 19 files ``` \ No newline at end of file diff --git a/images/packages/xz/README.md b/images/packages/xz/README.md index 4938006afb..c1da2057c7 100644 --- a/images/packages/xz/README.md +++ b/images/packages/xz/README.md @@ -1,282 +1,43 @@ # xz /xz ``` -`-- usr - |-- bin - | |-- lzcat -> xz - | |-- lzma -> xz - | |-- lzmadec - | |-- lzmainfo - | |-- unlzma -> xz - | |-- unxz -> xz - | |-- xz - | |-- xzcat -> xz - | `-- xzdec - |-- include - | |-- lzma - | | |-- base.h - | | |-- bcj.h - | | |-- block.h - | | |-- check.h - | | |-- container.h - | | |-- delta.h - | | |-- filter.h - | | |-- hardware.h - | | |-- index.h - | | |-- index_hash.h - | | |-- lzma12.h - | | |-- stream_flags.h - | | |-- version.h - | | `-- vli.h - | `-- lzma.h - |-- lib64 - | |-- liblzma.a - | |-- liblzma.la - | |-- liblzma.so -> liblzma.so.5.4.5 - | |-- liblzma.so.5 -> liblzma.so.5.4.5 - | |-- liblzma.so.5.4.5 - | `-- pkgconfig - | `-- liblzma.pc - `-- share - |-- doc - | `-- xz - | |-- AUTHORS - | |-- COPYING - | |-- COPYING.GPLv2 - | |-- NEWS - | |-- README - | |-- THANKS - | |-- TODO - | |-- api - | | |-- annotated.html - | | |-- base_8h.html - | | |-- bc_s.png - | | |-- bc_sd.png - | | |-- bcj_8h.html - | | |-- block_8h.html - | | |-- check_8h.html - | | |-- classes.html - | | |-- closed.png - | | |-- container_8h.html - | | |-- delta_8h.html - | | |-- dir_b17a1d403082bd69a703ed987cf158fb.html - | | |-- doc.svg - | | |-- docd.svg - | | |-- doxygen.css - | | |-- doxygen.svg - | | |-- doxygen_crawl.html - | | |-- files.html - | | |-- filter_8h.html - | | |-- folderclosed.svg - | | |-- folderclosedd.svg - | | |-- folderopen.svg - | | |-- folderopend.svg - | | |-- functions.html - | | |-- functions_vars.html - | | |-- globals.html - | | |-- globals_defs.html - | | |-- globals_enum.html - | | |-- globals_eval.html - | | |-- globals_func.html - | | |-- globals_type.html - | | |-- hardware_8h.html - | | |-- index.html - | | |-- index_8h.html - | | |-- index__hash_8h.html - | | |-- lzma12_8h.html - | | |-- lzma_8h.html - | | |-- minus.svg - | | |-- minusd.svg - | | |-- nav_f.png - | | |-- nav_fd.png - | | |-- nav_g.png - | | |-- nav_h.png - | | |-- nav_hd.png - | | |-- navtree.css - | | |-- open.png - | | |-- plus.svg - | | |-- plusd.svg - | | |-- splitbar.png - | | |-- splitbard.png - | | |-- stream__flags_8h.html - | | |-- structlzma__allocator.html - | | |-- structlzma__block.html - | | |-- structlzma__filter.html - | | |-- structlzma__index__iter.html - | | |-- structlzma__mt.html - | | |-- structlzma__options__bcj.html - | | |-- structlzma__options__delta.html - | | |-- structlzma__options__lzma.html - | | |-- structlzma__stream.html - | | |-- structlzma__stream__flags.html - | | |-- sync_off.png - | | |-- sync_on.png - | | |-- tab_a.png - | | |-- tab_ad.png - | | |-- tab_b.png - | | |-- tab_bd.png - | | |-- tab_h.png - | | |-- tab_hd.png - | | |-- tab_s.png - | | |-- tab_sd.png - | | |-- tabs.css - | | |-- version_8h.html - | | `-- vli_8h.html - | |-- examples - | | |-- 00_README.txt - | | |-- 01_compress_easy.c - | | |-- 02_decompress.c - | | |-- 03_compress_custom.c - | | |-- 04_compress_easy_mt.c - | | `-- Makefile - | |-- examples_old - | | |-- xz_pipe_comp.c - | | `-- xz_pipe_decomp.c - | |-- faq.txt - | |-- history.txt - | |-- lzma-file-format.txt - | `-- xz-file-format.txt - |-- locale - | |-- ca - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- cs - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- da - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- de - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- eo - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- es - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- fi - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- fr - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- hr - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- hu - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- it - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- ko - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- pl - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- pt - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- pt_BR - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- ro - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- sr - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- sv - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- tr - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- uk - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- vi - | | `-- LC_MESSAGES - | | `-- xz.mo - | |-- zh_CN - | | `-- LC_MESSAGES - | | `-- xz.mo - | `-- zh_TW - | `-- LC_MESSAGES - | `-- xz.mo - `-- man - |-- de - | `-- man1 - | |-- lzcat.1 -> xz.1 - | |-- lzma.1 -> xz.1 - | |-- lzmadec.1 -> xzdec.1 - | |-- unlzma.1 -> xz.1 - | |-- unxz.1 -> xz.1 - | |-- xz.1 - | |-- xzcat.1 -> xz.1 - | `-- xzdec.1 - |-- fr - | `-- man1 - | |-- lzcat.1 -> xz.1 - | |-- lzma.1 -> xz.1 - | |-- lzmadec.1 -> xzdec.1 - | |-- unlzma.1 -> xz.1 - | |-- unxz.1 -> xz.1 - | |-- xz.1 - | |-- xzcat.1 -> xz.1 - | `-- xzdec.1 - |-- ko - | `-- man1 - | |-- lzcat.1 -> xz.1 - | |-- lzma.1 -> xz.1 - | |-- lzmadec.1 -> xzdec.1 - | |-- unlzma.1 -> xz.1 - | |-- unxz.1 -> xz.1 - | |-- xz.1 - | |-- xzcat.1 -> xz.1 - | `-- xzdec.1 - |-- man1 - | |-- lzcat.1 -> xz.1 - | |-- lzma.1 -> xz.1 - | |-- lzmadec.1 -> xzdec.1 - | |-- lzmainfo.1 - | |-- unlzma.1 -> xz.1 - | |-- unxz.1 -> xz.1 - | |-- xz.1 - | |-- xzcat.1 -> xz.1 - | `-- xzdec.1 - |-- pt_BR - | `-- man1 - | |-- lzcat.1 -> xz.1 - | |-- lzma.1 -> xz.1 - | |-- lzmadec.1 -> xzdec.1 - | |-- unlzma.1 -> xz.1 - | |-- unxz.1 -> xz.1 - | |-- xz.1 - | |-- xzcat.1 -> xz.1 - | `-- xzdec.1 - |-- ro - | `-- man1 - | |-- lzcat.1 -> xz.1 - | |-- lzma.1 -> xz.1 - | |-- lzmadec.1 -> xzdec.1 - | |-- unlzma.1 -> xz.1 - | |-- unxz.1 -> xz.1 - | |-- xz.1 - | |-- xzcat.1 -> xz.1 - | `-- xzdec.1 - `-- uk - `-- man1 - |-- lzcat.1 -> xz.1 - |-- lzma.1 -> xz.1 - |-- lzmadec.1 -> xzdec.1 - |-- unlzma.1 -> xz.1 - |-- unxz.1 -> xz.1 - |-- xz.1 - |-- xzcat.1 -> xz.1 - `-- xzdec.1 +/out +└── usr + ├── bin + │ ├── lzcat -> xz + │ ├── lzma -> xz + │ ├── lzmadec + │ ├── lzmainfo + │ ├── unlzma -> xz + │ ├── unxz -> xz + │ ├── xz + │ ├── xzcat -> xz + │ └── xzdec + ├── include + │ ├── lzma + │ │ ├── base.h + │ │ ├── bcj.h + │ │ ├── block.h + │ │ ├── check.h + │ │ ├── container.h + │ │ ├── delta.h + │ │ ├── filter.h + │ │ ├── hardware.h + │ │ ├── index.h + │ │ ├── index_hash.h + │ │ ├── lzma12.h + │ │ ├── stream_flags.h + │ │ ├── version.h + │ │ └── vli.h + │ └── lzma.h + └── lib64 + ├── liblzma.a + ├── liblzma.la + ├── liblzma.so -> liblzma.so.5.4.5 + ├── liblzma.so.5 -> liblzma.so.5.4.5 + ├── liblzma.so.5.4.5 + └── pkgconfig + └── liblzma.pc -74 directories, 203 files +7 directories, 30 files ``` \ No newline at end of file From 3dbbef6f097d355d3113f5a5a3462176a3eebf72 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Tue, 2 Sep 2025 15:07:08 +0300 Subject: [PATCH 26/64] Update images/packages/xz/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Valeriy Khorunzhin --- images/packages/xz/werf.inc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/packages/xz/werf.inc.yaml b/images/packages/xz/werf.inc.yaml index ba4b8d6d7b..c275ff930a 100644 --- a/images/packages/xz/werf.inc.yaml +++ b/images/packages/xz/werf.inc.yaml @@ -71,4 +71,4 @@ shell: make DESTDIR=$OUTDIR install rm -rf /$OUTDIR/usr/share - tree $OUTDIR + tree -sp $OUTDIR From 4c64e50e82c3cbc2a4e23dd05741558840e0e0bd Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Tue, 2 Sep 2025 15:20:58 +0300 Subject: [PATCH 27/64] Update images/cdi-importer/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Valeriy Khorunzhin --- images/cdi-importer/werf.inc.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/cdi-importer/werf.inc.yaml b/images/cdi-importer/werf.inc.yaml index be6a02c29c..0f6cdcb84e 100644 --- a/images/cdi-importer/werf.inc.yaml +++ b/images/cdi-importer/werf.inc.yaml @@ -54,8 +54,7 @@ import: add: /qemu-img to: /relocate before: setup -{{- $images := list "nbdkit" "libnbd" "xz" -}} -{{- include "importPackageImages" (list . $images "install") -}} +{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}} shell: install: {{- include "alt packages proxy" . | nindent 2 }} From e655f09e409e441478c81997b14bf10b2d77f81d Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Tue, 2 Sep 2025 15:21:26 +0300 Subject: [PATCH 28/64] Update images/packages/lz4/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Valeriy Khorunzhin --- images/packages/lz4/werf.inc.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/images/packages/lz4/werf.inc.yaml b/images/packages/lz4/werf.inc.yaml index dfc68fcb9f..37eda64e29 100644 --- a/images/packages/lz4/werf.inc.yaml +++ b/images/packages/lz4/werf.inc.yaml @@ -21,7 +21,6 @@ secrets: shell: install: - | - mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src From 1eba41aca9f3d9b4833ecf8bbe32cec80c6943fe Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 10:36:22 +0300 Subject: [PATCH 29/64] remove not used Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/werf.inc.yaml | 5 +---- images/packages/lz4/werf.inc.yaml | 4 +--- images/packages/lzo/werf.inc.yaml | 5 +---- images/packages/xz/werf.inc.yaml | 5 +---- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/images/packages/krb5/werf.inc.yaml b/images/packages/krb5/werf.inc.yaml index 4a68d24957..7b9c62189a 100644 --- a/images/packages/krb5/werf.inc.yaml +++ b/images/packages/krb5/werf.inc.yaml @@ -20,10 +20,7 @@ secrets: value: {{ $.SOURCE_REPO_GIT }} shell: install: - - | - mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config - - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src + - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src --- {{- $name := print $.ImageName "-dependencies" -}} diff --git a/images/packages/lz4/werf.inc.yaml b/images/packages/lz4/werf.inc.yaml index 37eda64e29..43fd4f970e 100644 --- a/images/packages/lz4/werf.inc.yaml +++ b/images/packages/lz4/werf.inc.yaml @@ -20,9 +20,7 @@ secrets: value: {{ $.SOURCE_REPO_GIT }} shell: install: - - | - - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src + - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src --- {{- $name := print $.ImageName "-dependencies" -}} diff --git a/images/packages/lzo/werf.inc.yaml b/images/packages/lzo/werf.inc.yaml index c515d100ba..072bab8353 100644 --- a/images/packages/lzo/werf.inc.yaml +++ b/images/packages/lzo/werf.inc.yaml @@ -20,10 +20,7 @@ secrets: value: {{ $.SOURCE_REPO_GIT }} shell: install: - - | - mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config - - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src + - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src --- {{- $name := print $.ImageName "-dependencies" -}} diff --git a/images/packages/xz/werf.inc.yaml b/images/packages/xz/werf.inc.yaml index c275ff930a..c252fe039e 100644 --- a/images/packages/xz/werf.inc.yaml +++ b/images/packages/xz/werf.inc.yaml @@ -20,10 +20,7 @@ secrets: value: {{ $.SOURCE_REPO_GIT }} shell: install: - - | - mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config - - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src + - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src --- {{- $name := print $.ImageName "-dependencies" -}} From 174413ee3db1947060bfe501e742f11e722a6213 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 10:49:32 +0300 Subject: [PATCH 30/64] back cdi-importer Signed-off-by: Valeriy Khorunzhin --- images/cdi-importer/werf.inc.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/cdi-importer/werf.inc.yaml b/images/cdi-importer/werf.inc.yaml index 0f6cdcb84e..078f2b2b30 100644 --- a/images/cdi-importer/werf.inc.yaml +++ b/images/cdi-importer/werf.inc.yaml @@ -54,7 +54,8 @@ import: add: /qemu-img to: /relocate before: setup -{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}} +{{- $images := list "nbdkit" "libnbd" -}} +{{- include "importPackageImages" (list . $images "install") -}} shell: install: {{- include "alt packages proxy" . | nindent 2 }} From 4e214c0a64878fce3ed78cbe2d076ae6ddfe5bf7 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 11:33:05 +0300 Subject: [PATCH 31/64] fix file Signed-off-by: Valeriy Khorunzhin --- images/packages/file/werf.inc.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/images/packages/file/werf.inc.yaml b/images/packages/file/werf.inc.yaml index 5ade730fc4..d885b9a088 100644 --- a/images/packages/file/werf.inc.yaml +++ b/images/packages/file/werf.inc.yaml @@ -69,13 +69,6 @@ shell: done - | - # Install packages - PKGS="{{ $builderDependencies.packages | join " " }}" - for pkg in $PKGS; do - cp -a /$pkg/. / - rm -rf /$pkg - done - OUTDIR=/out cd /src From 9f573beef83f9df5173c87805acf0d569daf58d5 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 11:42:06 +0300 Subject: [PATCH 32/64] fix libcurl Signed-off-by: Valeriy Khorunzhin --- images/packages/libcurl/werf.inc.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/images/packages/libcurl/werf.inc.yaml b/images/packages/libcurl/werf.inc.yaml index a2c2f316f0..18519b7e2c 100644 --- a/images/packages/libcurl/werf.inc.yaml +++ b/images/packages/libcurl/werf.inc.yaml @@ -58,12 +58,6 @@ secrets: - id: SOURCE_REPO value: {{ $.SOURCE_REPO_GIT }} import: -- image: {{ .ModuleNamePrefix }}packages/openldap - add: /openldap - to: / - before: install - includePaths: - - usr/lib64/libldap.so.2 - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact add: /src to: /src From 030ea010cec44d6ca1165866597dbd794ab8a43b Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 12:36:05 +0300 Subject: [PATCH 33/64] fix qemu Signed-off-by: Valeriy Khorunzhin --- images/qemu/werf.inc.yaml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/images/qemu/werf.inc.yaml b/images/qemu/werf.inc.yaml index fe324c75bb..3c0c7d5460 100644 --- a/images/qemu/werf.inc.yaml +++ b/images/qemu/werf.inc.yaml @@ -65,21 +65,10 @@ shell: {{- $name := print $.ImageName "-dependencies" -}} {{- define "$name" -}} packages: -- dmidecode -- libgcrypt -- nettle -- libcap-ng -- libcapstone -- openssl -- libcurl -- e2fsprogs -- libxcrypt -- numactl -- lzo -- lz4 -- krb5 -- openldap -- xz +- dmidecode libgcrypt nettle libcap-ng libcapstone +- openssl libcurl e2fsprogs libxcrypt numactl +- zlib +- lzo lz4 krb5 openldap xz altPackages: - binutils - pkgconfig pkg-config From 1d59ecb7a1868784324183561c6a6df1c1f7e25e Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 14:26:41 +0300 Subject: [PATCH 34/64] file refactoring Signed-off-by: Valeriy Khorunzhin --- images/packages/file/werf.inc.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/packages/file/werf.inc.yaml b/images/packages/file/werf.inc.yaml index d885b9a088..dd96f3471c 100644 --- a/images/packages/file/werf.inc.yaml +++ b/images/packages/file/werf.inc.yaml @@ -67,8 +67,7 @@ shell: cp -a /$pkg/. / rm -rf /$pkg done - - - | + OUTDIR=/out cd /src From 8e11ec771f918017be05a61bebb5a059acc594b0 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 14:34:13 +0300 Subject: [PATCH 35/64] qemu fix Signed-off-by: Valeriy Khorunzhin --- images/qemu/werf.inc.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/images/qemu/werf.inc.yaml b/images/qemu/werf.inc.yaml index 3c0c7d5460..7aa7804954 100644 --- a/images/qemu/werf.inc.yaml +++ b/images/qemu/werf.inc.yaml @@ -64,11 +64,6 @@ shell: --- {{- $name := print $.ImageName "-dependencies" -}} {{- define "$name" -}} -packages: -- dmidecode libgcrypt nettle libcap-ng libcapstone -- openssl libcurl e2fsprogs libxcrypt numactl -- zlib -- lzo lz4 krb5 openldap xz altPackages: - binutils - pkgconfig pkg-config @@ -131,6 +126,7 @@ packages: - zlib zstd linux-pam - libssh libssh2 - openldap keyutils +- xz lz4 lzo krb5 - libpixman libpsl libpng libqpl rdma-core - pcre2 {{- end -}} @@ -182,7 +178,6 @@ shell: - | # Install packages PKGS="{{ $builderDependencies.packages | join " " }}" - PKGS="{{ $builderDependencies.packages | join " " }}" for pkg in $PKGS; do cp -a /$pkg/. / rm -rf /$pkg From 5c204c058f9fe51afab3eb577d295fae11aa985f Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 14:38:58 +0300 Subject: [PATCH 36/64] virt-launcher fix Signed-off-by: Valeriy Khorunzhin --- images/virt-launcher/werf.inc.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index 35b34546be..c6c46cfa67 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -210,6 +210,8 @@ import: - node-labeller - vlctl +{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}} + # Statically builded - image: {{ .ModuleNamePrefix }}packages/openssl add: /openssl @@ -240,7 +242,6 @@ import: before: setup includePaths: - temp_pod -{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}} shell: beforeInstall: {{- include "alt packages proxy" . | nindent 2 }} @@ -404,8 +405,7 @@ git: install: - '**/*' import: -{{- $images := list "libcap-ng" "e2fsprogs" "libxcrypt" "openssl" "xz" "krb5" -}} -{{- include "importPackageImages" (list . $images "install") -}} +{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}} secrets: - id: GOPROXY value: {{ .GOPROXY }} @@ -423,7 +423,7 @@ shell: {{- end }} - | # Install packages - PKGS="{{ $images | join " " }}" + PKGS="{{ $builderDependencies.packages | join " " }}" for pkg in $PKGS; do cp -a /$pkg/. / rm -rf /$pkg From 3172cf1298284cbe850ff39328f7cca21b8904c9 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 14:52:16 +0300 Subject: [PATCH 37/64] improve tree output Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/werf.inc.yaml | 3 ++- images/packages/lz4/werf.inc.yaml | 2 +- images/packages/lzo/werf.inc.yaml | 2 +- images/packages/xz/werf.inc.yaml | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/images/packages/krb5/werf.inc.yaml b/images/packages/krb5/werf.inc.yaml index 7b9c62189a..86121d301f 100644 --- a/images/packages/krb5/werf.inc.yaml +++ b/images/packages/krb5/werf.inc.yaml @@ -74,8 +74,9 @@ shell: make -j$(nproc) make DESTDIR=$OUTDIR install + rm -rf $OUTDIR/usr/bin rm -rf $OUTDIR/usr/share rm -rf $OUTDIR/usr/sbin rm -rf $OUTDIR/usr/var - tree $OUTDIR + tree -sp $OUTDIR diff --git a/images/packages/lz4/werf.inc.yaml b/images/packages/lz4/werf.inc.yaml index 43fd4f970e..ca7703b7c0 100644 --- a/images/packages/lz4/werf.inc.yaml +++ b/images/packages/lz4/werf.inc.yaml @@ -59,4 +59,4 @@ shell: mv /out/usr/local/lib/ /out/usr/lib64 rm -rf $OUTDIR/usr/local - tree $OUTDIR + tree -sp $OUTDIR diff --git a/images/packages/lzo/werf.inc.yaml b/images/packages/lzo/werf.inc.yaml index 072bab8353..b8edcec4a0 100644 --- a/images/packages/lzo/werf.inc.yaml +++ b/images/packages/lzo/werf.inc.yaml @@ -63,4 +63,4 @@ shell: make DESTDIR=$OUTDIR install rm -rf $OUTDIR/usr/share - tree $OUTDIR + tree -sp $OUTDIR diff --git a/images/packages/xz/werf.inc.yaml b/images/packages/xz/werf.inc.yaml index c252fe039e..cfe658b0ff 100644 --- a/images/packages/xz/werf.inc.yaml +++ b/images/packages/xz/werf.inc.yaml @@ -58,6 +58,7 @@ shell: cd /src ./autogen.sh + ./configure \ --prefix=/usr \ --libdir=/usr/lib64 \ From 9c81137440e9ee66c56edbcf799b32e03e0b4a17 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 15:05:15 +0300 Subject: [PATCH 38/64] update readme output Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/README.md | 178 ++++++++++++++++----------------- images/packages/lz4/README.md | 16 +-- images/packages/lzo/README.md | 49 +++++---- images/packages/xz/README.md | 73 +++++++------- 4 files changed, 157 insertions(+), 159 deletions(-) diff --git a/images/packages/krb5/README.md b/images/packages/krb5/README.md index 16bd362866..5dfcf37777 100644 --- a/images/packages/krb5/README.md +++ b/images/packages/krb5/README.md @@ -1,93 +1,93 @@ # krb5 /libkrb5 ``` -/out - └── usr - ├── include - │ ├── gssapi - │ │ ├── gssapi.h - │ │ ├── gssapi_alloc.h - │ │ ├── gssapi_ext.h - │ │ ├── gssapi_generic.h - │ │ ├── gssapi_krb5.h - │ │ └── mechglue.h - │ ├── gssapi.h - │ ├── gssrpc - │ │ ├── auth.h - │ │ ├── auth_gss.h - │ │ ├── auth_gssapi.h - │ │ ├── auth_unix.h - │ │ ├── clnt.h - │ │ ├── netdb.h - │ │ ├── pmap_clnt.h - │ │ ├── pmap_prot.h - │ │ ├── pmap_rmt.h - │ │ ├── rename.h - │ │ ├── rpc.h - │ │ ├── rpc_msg.h - │ │ ├── svc.h - │ │ ├── svc_auth.h - │ │ ├── types.h - │ │ └── xdr.h - │ ├── kadm5 - │ │ ├── admin.h - │ │ ├── chpass_util_strings.h - │ │ └── kadm_err.h - │ ├── kdb.h - │ ├── krad.h - │ ├── krb5 - │ │ ├── ccselect_plugin.h - │ │ ├── certauth_plugin.h - │ │ ├── clpreauth_plugin.h - │ │ ├── hostrealm_plugin.h - │ │ ├── kadm5_auth_plugin.h - │ │ ├── kadm5_hook_plugin.h - │ │ ├── kdcpolicy_plugin.h - │ │ ├── kdcpreauth_plugin.h - │ │ ├── krb5.h - │ │ ├── localauth_plugin.h - │ │ ├── locate_plugin.h - │ │ ├── plugin.h - │ │ ├── preauth_plugin.h - │ │ └── pwqual_plugin.h - │ ├── krb5.h - │ ├── profile.h - │ ├── verto-module.h - │ └── verto.h - └── lib64 - ├── krb5 - │ └── plugins - │ ├── authdata - │ ├── kdb - │ ├── libkrb5 - │ ├── preauth - │ └── tls - ├── libgssapi_krb5.a - ├── libgssrpc.a - ├── libk5crypto.a - ├── libkadm5clnt.a -> libkadm5clnt_mit.a - ├── libkadm5clnt_mit.a - ├── libkadm5srv.a -> libkadm5srv_mit.a - ├── libkadm5srv_mit.a - ├── libkdb5.a - ├── libkrad.a - ├── libkrb5.a - ├── libkrb5_db2.a - ├── libkrb5_k5tls.a - ├── libkrb5_otp.a - ├── libkrb5_pkinit.a - ├── libkrb5_spake.a - ├── libkrb5_test.a - ├── libkrb5support.a - ├── libverto.a - └── pkgconfig - ├── gssrpc.pc - ├── kadm-client.pc - ├── kadm-server.pc - ├── kdb.pc - ├── krb5-gssapi.pc - ├── krb5.pc - ├── mit-krb5-gssapi.pc - └── mit-krb5.pc - 16 directories, 72 files +└── [drwxr-xr-x 4] usr + ├── [drwxr-xr-x 13] include + │ ├── [drwxr-xr-x 8] gssapi + │ │ ├── [-rw-r--r-- 30083] gssapi.h + │ │ ├── [-rw-r--r-- 2640] gssapi_alloc.h + │ │ ├── [-rw-r--r-- 21165] gssapi_ext.h + │ │ ├── [-rw-r--r-- 2217] gssapi_generic.h + │ │ ├── [-rw-r--r-- 12027] gssapi_krb5.h + │ │ └── [-rw-r--r-- 1652] mechglue.h + │ ├── [-rw-r--r-- 181] gssapi.h + │ ├── [drwxr-xr-x 18] gssrpc + │ │ ├── [-rw-r--r-- 6441] auth.h + │ │ ├── [-rw-r--r-- 4840] auth_gss.h + │ │ ├── [-rw-r--r-- 4333] auth_gssapi.h + │ │ ├── [-rw-r--r-- 2896] auth_unix.h + │ │ ├── [-rw-r--r-- 9654] clnt.h + │ │ ├── [-rw-r--r-- 2442] netdb.h + │ │ ├── [-rw-r--r-- 3429] pmap_clnt.h + │ │ ├── [-rw-r--r-- 3841] pmap_prot.h + │ │ ├── [-rw-r--r-- 2303] pmap_rmt.h + │ │ ├── [-rw-r--r-- 10034] rename.h + │ │ ├── [-rw-r--r-- 3143] rpc.h + │ │ ├── [-rw-r--r-- 5107] rpc_msg.h + │ │ ├── [-rw-r--r-- 11402] svc.h + │ │ ├── [-rw-r--r-- 3976] svc_auth.h + │ │ ├── [-rw-r--r-- 3628] types.h + │ │ └── [-rw-r--r-- 11781] xdr.h + │ ├── [drwxr-xr-x 5] kadm5 + │ │ ├── [-rw-r--r-- 20688] admin.h + │ │ ├── [-rw-r--r-- 1548] chpass_util_strings.h + │ │ └── [-rw-r--r-- 4345] kadm_err.h + │ ├── [-rw-r--r-- 64259] kdb.h + │ ├── [-rw-r--r-- 8933] krad.h + │ ├── [drwxr-xr-x 16] krb5 + │ │ ├── [-rw-r--r-- 4213] ccselect_plugin.h + │ │ ├── [-rw-r--r-- 5864] certauth_plugin.h + │ │ ├── [-rw-r--r-- 15529] clpreauth_plugin.h + │ │ ├── [-rw-r--r-- 5460] hostrealm_plugin.h + │ │ ├── [-rw-r--r-- 12482] kadm5_auth_plugin.h + │ │ ├── [-rw-r--r-- 6161] kadm5_hook_plugin.h + │ │ ├── [-rw-r--r-- 5320] kdcpolicy_plugin.h + │ │ ├── [-rw-r--r-- 18241] kdcpreauth_plugin.h + │ │ ├── [-rw-r--r-- 348689] krb5.h + │ │ ├── [-rw-r--r-- 5881] localauth_plugin.h + │ │ ├── [-rw-r--r-- 2686] locate_plugin.h + │ │ ├── [-rw-r--r-- 2090] plugin.h + │ │ ├── [-rw-r--r-- 1774] preauth_plugin.h + │ │ └── [-rw-r--r-- 4426] pwqual_plugin.h + │ ├── [-rw-r--r-- 402] krb5.h + │ ├── [-rw-r--r-- 12154] profile.h + │ ├── [-rw-r--r-- 6640] verto-module.h + │ └── [-rw-r--r-- 19437] verto.h + └── [drwxr-xr-x 22] lib64 + ├── [drwxr-xr-x 3] krb5 + │ └── [drwxr-xr-x 7] plugins + │ ├── [drwxr-xr-x 2] authdata + │ ├── [drwxr-xr-x 2] kdb + │ ├── [drwxr-xr-x 2] libkrb5 + │ ├── [drwxr-xr-x 2] preauth + │ └── [drwxr-xr-x 2] tls + ├── [-rw-r--r-- 750918] libgssapi_krb5.a + ├── [-rw-r--r-- 266928] libgssrpc.a + ├── [-rw-r--r-- 365058] libk5crypto.a + ├── [lrwxrwxrwx 18] libkadm5clnt.a -> libkadm5clnt_mit.a + ├── [-rw-r--r-- 130084] libkadm5clnt_mit.a + ├── [lrwxrwxrwx 17] libkadm5srv.a -> libkadm5srv_mit.a + ├── [-rw-r--r-- 177916] libkadm5srv_mit.a + ├── [-rw-r--r-- 108234] libkdb5.a + ├── [-rw-r--r-- 48664] libkrad.a + ├── [-rw-r--r-- 1706266] libkrb5.a + ├── [-rw-r--r-- 196998] libkrb5_db2.a + ├── [-rw-r--r-- 16534] libkrb5_k5tls.a + ├── [-rw-r--r-- 23284] libkrb5_otp.a + ├── [-rw-r--r-- 194888] libkrb5_pkinit.a + ├── [-rw-r--r-- 98422] libkrb5_spake.a + ├── [-rw-r--r-- 17942] libkrb5_test.a + ├── [-rw-r--r-- 94434] libkrb5support.a + ├── [-rw-r--r-- 49220] libverto.a + └── [drwxr-xr-x 10] pkgconfig + ├── [-rw-r--r-- 246] gssrpc.pc + ├── [-rw-r--r-- 267] kadm-client.pc + ├── [-rw-r--r-- 263] kadm-server.pc + ├── [-rw-r--r-- 298] kdb.pc + ├── [-rw-r--r-- 204] krb5-gssapi.pc + ├── [-rw-r--r-- 329] krb5.pc + ├── [-rw-r--r-- 254] mit-krb5-gssapi.pc + └── [-rw-r--r-- 401] mit-krb5.pc + +16 directories, 72 files ``` \ No newline at end of file diff --git a/images/packages/lz4/README.md b/images/packages/lz4/README.md index 88a91f482e..ec1ff9230b 100644 --- a/images/packages/lz4/README.md +++ b/images/packages/lz4/README.md @@ -1,14 +1,14 @@ # lz4 /lz4 ``` -└── usr - └── lib64 - ├── liblz4.a - ├── liblz4.so -> liblz4.so.1.9.4 - ├── liblz4.so.1 -> liblz4.so.1.9.4 - ├── liblz4.so.1.9.4 - └── pkgconfig - └── liblz4.pc +└── [drwxr-xr-x 3] usr + └── [drwxr-xr-x 7] lib64 + ├── [-rw-r--r-- 263272] liblz4.a + ├── [lrwxrwxrwx 15] liblz4.so -> liblz4.so.1.9.4 + ├── [lrwxrwxrwx 15] liblz4.so.1 -> liblz4.so.1.9.4 + ├── [-rwxr-xr-x 237024] liblz4.so.1.9.4 + └── [drwxr-xr-x 3] pkgconfig + └── [-rw-r--r-- 395] liblz4.pc 4 directories, 5 files ``` \ No newline at end of file diff --git a/images/packages/lzo/README.md b/images/packages/lzo/README.md index c4780b1bed..001ac7d617 100644 --- a/images/packages/lzo/README.md +++ b/images/packages/lzo/README.md @@ -1,31 +1,30 @@ # lzo /lzo ``` -/out -└── usr - ├── include - │ └── lzo - │ ├── lzo1.h - │ ├── lzo1a.h - │ ├── lzo1b.h - │ ├── lzo1c.h - │ ├── lzo1f.h - │ ├── lzo1x.h - │ ├── lzo1y.h - │ ├── lzo1z.h - │ ├── lzo2a.h - │ ├── lzo_asm.h - │ ├── lzoconf.h - │ ├── lzodefs.h - │ └── lzoutil.h - └── lib64 - ├── liblzo2.a - ├── liblzo2.la - ├── liblzo2.so -> liblzo2.so.2.0.0 - ├── liblzo2.so.2 -> liblzo2.so.2.0.0 - ├── liblzo2.so.2.0.0 - └── pkgconfig - └── lzo2.pc +└── [drwxr-xr-x 4] usr + ├── [drwxr-xr-x 3] include + │ └── [drwxr-xr-x 15] lzo + │ ├── [-rw-r--r-- 2634] lzo1.h + │ ├── [-rw-r--r-- 2638] lzo1a.h + │ ├── [-rw-r--r-- 5387] lzo1b.h + │ ├── [-rw-r--r-- 5384] lzo1c.h + │ ├── [-rw-r--r-- 3073] lzo1f.h + │ ├── [-rw-r--r-- 5873] lzo1x.h + │ ├── [-rw-r--r-- 4641] lzo1y.h + │ ├── [-rw-r--r-- 3771] lzo1z.h + │ ├── [-rw-r--r-- 2525] lzo2a.h + │ ├── [-rw-r--r-- 5566] lzo_asm.h + │ ├── [-rw-r--r-- 16006] lzoconf.h + │ ├── [-rw-r--r-- 127289] lzodefs.h + │ └── [-rw-r--r-- 1823] lzoutil.h + └── [drwxr-xr-x 8] lib64 + ├── [-rw-r--r-- 825068] liblzo2.a + ├── [-rwxr-xr-x 916] liblzo2.la + ├── [lrwxrwxrwx 16] liblzo2.so -> liblzo2.so.2.0.0 + ├── [lrwxrwxrwx 16] liblzo2.so.2 -> liblzo2.so.2.0.0 + ├── [-rwxr-xr-x 591976] liblzo2.so.2.0.0 + └── [drwxr-xr-x 3] pkgconfig + └── [-rw-r--r-- 512] lzo2.pc 6 directories, 19 files ``` \ No newline at end of file diff --git a/images/packages/xz/README.md b/images/packages/xz/README.md index c1da2057c7..580ed09871 100644 --- a/images/packages/xz/README.md +++ b/images/packages/xz/README.md @@ -1,43 +1,42 @@ # xz /xz ``` -/out -└── usr - ├── bin - │ ├── lzcat -> xz - │ ├── lzma -> xz - │ ├── lzmadec - │ ├── lzmainfo - │ ├── unlzma -> xz - │ ├── unxz -> xz - │ ├── xz - │ ├── xzcat -> xz - │ └── xzdec - ├── include - │ ├── lzma - │ │ ├── base.h - │ │ ├── bcj.h - │ │ ├── block.h - │ │ ├── check.h - │ │ ├── container.h - │ │ ├── delta.h - │ │ ├── filter.h - │ │ ├── hardware.h - │ │ ├── index.h - │ │ ├── index_hash.h - │ │ ├── lzma12.h - │ │ ├── stream_flags.h - │ │ ├── version.h - │ │ └── vli.h - │ └── lzma.h - └── lib64 - ├── liblzma.a - ├── liblzma.la - ├── liblzma.so -> liblzma.so.5.4.5 - ├── liblzma.so.5 -> liblzma.so.5.4.5 - ├── liblzma.so.5.4.5 - └── pkgconfig - └── liblzma.pc +└── [drwxr-xr-x 5] usr + ├── [drwxr-xr-x 11] bin + │ ├── [lrwxrwxrwx 2] lzcat -> xz + │ ├── [lrwxrwxrwx 2] lzma -> xz + │ ├── [-rwxr-xr-x 33272] lzmadec + │ ├── [-rwxr-xr-x 34560] lzmainfo + │ ├── [lrwxrwxrwx 2] unlzma -> xz + │ ├── [lrwxrwxrwx 2] unxz -> xz + │ ├── [-rwxr-xr-x 280352] xz + │ ├── [lrwxrwxrwx 2] xzcat -> xz + │ └── [-rwxr-xr-x 33200] xzdec + ├── [drwxr-xr-x 4] include + │ ├── [drwxr-xr-x 16] lzma + │ │ ├── [-rw-r--r-- 28145] base.h + │ │ ├── [-rw-r--r-- 2790] bcj.h + │ │ ├── [-rw-r--r-- 26028] block.h + │ │ ├── [-rw-r--r-- 4904] check.h + │ │ ├── [-rw-r--r-- 40821] container.h + │ │ ├── [-rw-r--r-- 2251] delta.h + │ │ ├── [-rw-r--r-- 31810] filter.h + │ │ ├── [-rw-r--r-- 2614] hardware.h + │ │ ├── [-rw-r--r-- 30371] index.h + │ │ ├── [-rw-r--r-- 4735] index_hash.h + │ │ ├── [-rw-r--r-- 20882] lzma12.h + │ │ ├── [-rw-r--r-- 9303] stream_flags.h + │ │ ├── [-rw-r--r-- 3936] version.h + │ │ └── [-rw-r--r-- 6699] vli.h + │ └── [-rw-r--r-- 9959] lzma.h + └── [drwxr-xr-x 8] lib64 + ├── [-rw-r--r-- 1520394] liblzma.a + ├── [-rwxr-xr-x 931] liblzma.la + ├── [lrwxrwxrwx 16] liblzma.so -> liblzma.so.5.4.5 + ├── [lrwxrwxrwx 16] liblzma.so.5 -> liblzma.so.5.4.5 + ├── [-rwxr-xr-x 946784] liblzma.so.5.4.5 + └── [drwxr-xr-x 3] pkgconfig + └── [-rw-r--r-- 426] liblzma.pc 7 directories, 30 files ``` \ No newline at end of file From 4d8f496a4411537d92a6a5830dcefaf9d589b721 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 15:16:10 +0300 Subject: [PATCH 39/64] add params Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/werf.inc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/packages/krb5/werf.inc.yaml b/images/packages/krb5/werf.inc.yaml index 86121d301f..1118a3dd8c 100644 --- a/images/packages/krb5/werf.inc.yaml +++ b/images/packages/krb5/werf.inc.yaml @@ -64,6 +64,7 @@ shell: ./configure \ --prefix=/usr \ --libdir=/usr/lib64 \ + --exec-prefix=/usr --disable-shared --enable-static \ --enable-dns-for-realm \ --enable-pkinit \ From 4d71919dbe511c7f839eb5ef95f6caefd520db12 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 15:25:08 +0300 Subject: [PATCH 40/64] fix krb5 Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/werf.inc.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/packages/krb5/werf.inc.yaml b/images/packages/krb5/werf.inc.yaml index 1118a3dd8c..3eebd512fc 100644 --- a/images/packages/krb5/werf.inc.yaml +++ b/images/packages/krb5/werf.inc.yaml @@ -64,8 +64,8 @@ shell: ./configure \ --prefix=/usr \ --libdir=/usr/lib64 \ - --exec-prefix=/usr - --disable-shared --enable-static \ + --exec-prefix=/usr \ + --enable-shared --disable-static \ --enable-dns-for-realm \ --enable-pkinit \ --with-system-et \ From 3e62ca25793c205095ba86ac1c19d2357f5ac449 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 15:28:10 +0300 Subject: [PATCH 41/64] update readme Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/README.md | 108 +++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 46 deletions(-) diff --git a/images/packages/krb5/README.md b/images/packages/krb5/README.md index 5dfcf37777..1071b3c781 100644 --- a/images/packages/krb5/README.md +++ b/images/packages/krb5/README.md @@ -1,9 +1,6 @@ -# krb5 -/libkrb5 -``` -└── [drwxr-xr-x 4] usr - ├── [drwxr-xr-x 13] include - │ ├── [drwxr-xr-x 8] gssapi +└── [drwxr-xr-x 4096] usr + ├── [drwxr-xr-x 4096] include + │ ├── [drwxr-xr-x 4096] gssapi │ │ ├── [-rw-r--r-- 30083] gssapi.h │ │ ├── [-rw-r--r-- 2640] gssapi_alloc.h │ │ ├── [-rw-r--r-- 21165] gssapi_ext.h @@ -11,7 +8,7 @@ │ │ ├── [-rw-r--r-- 12027] gssapi_krb5.h │ │ └── [-rw-r--r-- 1652] mechglue.h │ ├── [-rw-r--r-- 181] gssapi.h - │ ├── [drwxr-xr-x 18] gssrpc + │ ├── [drwxr-xr-x 4096] gssrpc │ │ ├── [-rw-r--r-- 6441] auth.h │ │ ├── [-rw-r--r-- 4840] auth_gss.h │ │ ├── [-rw-r--r-- 4333] auth_gssapi.h @@ -28,13 +25,13 @@ │ │ ├── [-rw-r--r-- 3976] svc_auth.h │ │ ├── [-rw-r--r-- 3628] types.h │ │ └── [-rw-r--r-- 11781] xdr.h - │ ├── [drwxr-xr-x 5] kadm5 + │ ├── [drwxr-xr-x 4096] kadm5 │ │ ├── [-rw-r--r-- 20688] admin.h │ │ ├── [-rw-r--r-- 1548] chpass_util_strings.h │ │ └── [-rw-r--r-- 4345] kadm_err.h │ ├── [-rw-r--r-- 64259] kdb.h │ ├── [-rw-r--r-- 8933] krad.h - │ ├── [drwxr-xr-x 16] krb5 + │ ├── [drwxr-xr-x 4096] krb5 │ │ ├── [-rw-r--r-- 4213] ccselect_plugin.h │ │ ├── [-rw-r--r-- 5864] certauth_plugin.h │ │ ├── [-rw-r--r-- 15529] clpreauth_plugin.h @@ -53,41 +50,60 @@ │ ├── [-rw-r--r-- 12154] profile.h │ ├── [-rw-r--r-- 6640] verto-module.h │ └── [-rw-r--r-- 19437] verto.h - └── [drwxr-xr-x 22] lib64 - ├── [drwxr-xr-x 3] krb5 - │ └── [drwxr-xr-x 7] plugins - │ ├── [drwxr-xr-x 2] authdata - │ ├── [drwxr-xr-x 2] kdb - │ ├── [drwxr-xr-x 2] libkrb5 - │ ├── [drwxr-xr-x 2] preauth - │ └── [drwxr-xr-x 2] tls - ├── [-rw-r--r-- 750918] libgssapi_krb5.a - ├── [-rw-r--r-- 266928] libgssrpc.a - ├── [-rw-r--r-- 365058] libk5crypto.a - ├── [lrwxrwxrwx 18] libkadm5clnt.a -> libkadm5clnt_mit.a - ├── [-rw-r--r-- 130084] libkadm5clnt_mit.a - ├── [lrwxrwxrwx 17] libkadm5srv.a -> libkadm5srv_mit.a - ├── [-rw-r--r-- 177916] libkadm5srv_mit.a - ├── [-rw-r--r-- 108234] libkdb5.a - ├── [-rw-r--r-- 48664] libkrad.a - ├── [-rw-r--r-- 1706266] libkrb5.a - ├── [-rw-r--r-- 196998] libkrb5_db2.a - ├── [-rw-r--r-- 16534] libkrb5_k5tls.a - ├── [-rw-r--r-- 23284] libkrb5_otp.a - ├── [-rw-r--r-- 194888] libkrb5_pkinit.a - ├── [-rw-r--r-- 98422] libkrb5_spake.a - ├── [-rw-r--r-- 17942] libkrb5_test.a - ├── [-rw-r--r-- 94434] libkrb5support.a - ├── [-rw-r--r-- 49220] libverto.a - └── [drwxr-xr-x 10] pkgconfig - ├── [-rw-r--r-- 246] gssrpc.pc - ├── [-rw-r--r-- 267] kadm-client.pc - ├── [-rw-r--r-- 263] kadm-server.pc - ├── [-rw-r--r-- 298] kdb.pc - ├── [-rw-r--r-- 204] krb5-gssapi.pc - ├── [-rw-r--r-- 329] krb5.pc - ├── [-rw-r--r-- 254] mit-krb5-gssapi.pc - └── [-rw-r--r-- 401] mit-krb5.pc + └── [drwxr-xr-x 4096] lib64 + ├── [drwxr-xr-x 4096] krb5 + │ └── [drwxr-xr-x 4096] plugins + │ ├── [drwxr-xr-x 4096] authdata + │ ├── [drwxr-xr-x 4096] kdb + │ │ └── [-rwxr-xr-x 112496] db2.so + │ ├── [drwxr-xr-x 4096] libkrb5 + │ ├── [drwxr-xr-x 4096] preauth + │ │ ├── [-rwxr-xr-x 32520] otp.so + │ │ ├── [-rwxr-xr-x 154992] pkinit.so + │ │ ├── [-rwxr-xr-x 93936] spake.so + │ │ └── [-rwxr-xr-x 21824] test.so + │ └── [drwxr-xr-x 4096] tls + │ └── [-rwxr-xr-x 29120] k5tls.so + ├── [lrwxrwxrwx 21] libgssapi_krb5.so -> libgssapi_krb5.so.2.2 + ├── [lrwxrwxrwx 21] libgssapi_krb5.so.2 -> libgssapi_krb5.so.2.2 + ├── [-rwxr-xr-x 392192] libgssapi_krb5.so.2.2 + ├── [lrwxrwxrwx 16] libgssrpc.so -> libgssrpc.so.4.2 + ├── [lrwxrwxrwx 16] libgssrpc.so.4 -> libgssrpc.so.4.2 + ├── [-rwxr-xr-x 145832] libgssrpc.so.4.2 + ├── [lrwxrwxrwx 18] libk5crypto.so -> libk5crypto.so.3.1 + ├── [lrwxrwxrwx 18] libk5crypto.so.3 -> libk5crypto.so.3.1 + ├── [-rwxr-xr-x 201744] libk5crypto.so.3.1 + ├── [lrwxrwxrwx 19] libkadm5clnt.so -> libkadm5clnt_mit.so + ├── [lrwxrwxrwx 24] libkadm5clnt_mit.so -> libkadm5clnt_mit.so.12.0 + ├── [lrwxrwxrwx 24] libkadm5clnt_mit.so.12 -> libkadm5clnt_mit.so.12.0 + ├── [-rwxr-xr-x 105088] libkadm5clnt_mit.so.12.0 + ├── [lrwxrwxrwx 18] libkadm5srv.so -> libkadm5srv_mit.so + ├── [lrwxrwxrwx 23] libkadm5srv_mit.so -> libkadm5srv_mit.so.12.0 + ├── [lrwxrwxrwx 23] libkadm5srv_mit.so.12 -> libkadm5srv_mit.so.12.0 + ├── [-rwxr-xr-x 137216] libkadm5srv_mit.so.12.0 + ├── [lrwxrwxrwx 15] libkdb5.so -> libkdb5.so.10.0 + ├── [lrwxrwxrwx 15] libkdb5.so.10 -> libkdb5.so.10.0 + ├── [-rwxr-xr-x 96008] libkdb5.so.10.0 + ├── [lrwxrwxrwx 14] libkrad.so -> libkrad.so.0.0 + ├── [lrwxrwxrwx 14] libkrad.so.0 -> libkrad.so.0.0 + ├── [-rwxr-xr-x 44456] libkrad.so.0.0 + ├── [lrwxrwxrwx 14] libkrb5.so -> libkrb5.so.3.3 + ├── [lrwxrwxrwx 14] libkrb5.so.3 -> libkrb5.so.3.3 + ├── [-rwxr-xr-x 1054216] libkrb5.so.3.3 + ├── [lrwxrwxrwx 21] libkrb5support.so -> libkrb5support.so.0.1 + ├── [lrwxrwxrwx 21] libkrb5support.so.0 -> libkrb5support.so.0.1 + ├── [-rwxr-xr-x 63408] libkrb5support.so.0.1 + ├── [lrwxrwxrwx 15] libverto.so -> libverto.so.0.0 + ├── [lrwxrwxrwx 15] libverto.so.0 -> libverto.so.0.0 + ├── [-rwxr-xr-x 47696] libverto.so.0.0 + └── [drwxr-xr-x 4096] pkgconfig + ├── [-rw-r--r-- 241] gssrpc.pc + ├── [-rw-r--r-- 262] kadm-client.pc + ├── [-rw-r--r-- 258] kadm-server.pc + ├── [-rw-r--r-- 293] kdb.pc + ├── [-rw-r--r-- 199] krb5-gssapi.pc + ├── [-rw-r--r-- 324] krb5.pc + ├── [-rw-r--r-- 249] mit-krb5-gssapi.pc + └── [-rw-r--r-- 396] mit-krb5.pc -16 directories, 72 files -``` \ No newline at end of file +16 directories, 92 files \ No newline at end of file From 54808de190c15688f595b39820bf04a16e6e3f38 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 21:22:56 +0300 Subject: [PATCH 42/64] Update images/packages/krb5/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/werf.inc.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/packages/krb5/werf.inc.yaml b/images/packages/krb5/werf.inc.yaml index 3eebd512fc..d0af54660f 100644 --- a/images/packages/krb5/werf.inc.yaml +++ b/images/packages/krb5/werf.inc.yaml @@ -76,8 +76,6 @@ shell: make -j$(nproc) make DESTDIR=$OUTDIR install - rm -rf $OUTDIR/usr/bin rm -rf $OUTDIR/usr/share - rm -rf $OUTDIR/usr/sbin rm -rf $OUTDIR/usr/var tree -sp $OUTDIR From 8ed30683ce80e366caf6cf703ef208763d14026d Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 21:23:09 +0300 Subject: [PATCH 43/64] Update images/packages/xz/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Valeriy Khorunzhin --- images/packages/xz/werf.inc.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/images/packages/xz/werf.inc.yaml b/images/packages/xz/werf.inc.yaml index cfe658b0ff..c252fe039e 100644 --- a/images/packages/xz/werf.inc.yaml +++ b/images/packages/xz/werf.inc.yaml @@ -58,7 +58,6 @@ shell: cd /src ./autogen.sh - ./configure \ --prefix=/usr \ --libdir=/usr/lib64 \ From 346cf5e2613d875a3004dec6310855ca28e44600 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 21:23:23 +0300 Subject: [PATCH 44/64] Update images/packages/lz4/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Valeriy Khorunzhin --- images/packages/lz4/werf.inc.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/images/packages/lz4/werf.inc.yaml b/images/packages/lz4/werf.inc.yaml index ca7703b7c0..846832a034 100644 --- a/images/packages/lz4/werf.inc.yaml +++ b/images/packages/lz4/werf.inc.yaml @@ -54,9 +54,7 @@ shell: cd /src + export PREFIX=/usr make -j$(nproc) make DESTDIR=$OUTDIR install - mv /out/usr/local/lib/ /out/usr/lib64 - - rm -rf $OUTDIR/usr/local tree -sp $OUTDIR From 5c333244e0d17933cdae7b9f6357a5167c3083a1 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 3 Sep 2025 22:32:35 +0300 Subject: [PATCH 45/64] update lz4 readme Signed-off-by: Valeriy Khorunzhin --- images/packages/lz4/README.md | 37 ++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/images/packages/lz4/README.md b/images/packages/lz4/README.md index ec1ff9230b..ea7018725b 100644 --- a/images/packages/lz4/README.md +++ b/images/packages/lz4/README.md @@ -1,14 +1,29 @@ # lz4 -/lz4 -``` -└── [drwxr-xr-x 3] usr - └── [drwxr-xr-x 7] lib64 - ├── [-rw-r--r-- 263272] liblz4.a - ├── [lrwxrwxrwx 15] liblz4.so -> liblz4.so.1.9.4 - ├── [lrwxrwxrwx 15] liblz4.so.1 -> liblz4.so.1.9.4 - ├── [-rwxr-xr-x 237024] liblz4.so.1.9.4 - └── [drwxr-xr-x 3] pkgconfig - └── [-rw-r--r-- 395] liblz4.pc +└── [drwxr-xr-x 4096] usr + ├── [drwxr-xr-x 4096] bin + │ ├── [-rwxr-xr-x 324192] lz4 + │ ├── [lrwxrwxrwx 3] lz4c -> lz4 + │ ├── [lrwxrwxrwx 3] lz4cat -> lz4 + │ └── [lrwxrwxrwx 3] unlz4 -> lz4 + ├── [drwxr-xr-x 4096] include + │ ├── [-rw-r--r-- 43263] lz4.h + │ ├── [-rw-r--r-- 32749] lz4frame.h + │ ├── [-rw-r--r-- 2044] lz4frame_static.h + │ └── [-rw-r--r-- 20179] lz4hc.h + ├── [drwxr-xr-x 4096] lib + │ ├── [-rw-r--r-- 263272] liblz4.a + │ ├── [lrwxrwxrwx 15] liblz4.so -> liblz4.so.1.9.4 + │ ├── [lrwxrwxrwx 15] liblz4.so.1 -> liblz4.so.1.9.4 + │ ├── [-rwxr-xr-x 237024] liblz4.so.1.9.4 + │ └── [drwxr-xr-x 4096] pkgconfig + │ └── [-rw-r--r-- 389] liblz4.pc + └── [drwxr-xr-x 4096] share + └── [drwxr-xr-x 4096] man + └── [drwxr-xr-x 4096] man1 + ├── [-rw-r--r-- 9262] lz4.1 + ├── [lrwxrwxrwx 5] lz4c.1 -> lz4.1 + ├── [lrwxrwxrwx 5] lz4cat.1 -> lz4.1 + └── [lrwxrwxrwx 5] unlz4.1 -> lz4.1 -4 directories, 5 files +9 directories, 17 files ``` \ No newline at end of file From df92912ad490f1e4ef00d585b643d4cee82e151a Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 4 Sep 2025 09:14:53 +0300 Subject: [PATCH 46/64] try to libdir Signed-off-by: Valeriy Khorunzhin --- images/packages/lz4/werf.inc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/packages/lz4/werf.inc.yaml b/images/packages/lz4/werf.inc.yaml index 846832a034..37ce63fdf1 100644 --- a/images/packages/lz4/werf.inc.yaml +++ b/images/packages/lz4/werf.inc.yaml @@ -55,6 +55,7 @@ shell: cd /src export PREFIX=/usr + export LIBDIR=/usr/lib64 make -j$(nproc) make DESTDIR=$OUTDIR install tree -sp $OUTDIR From 77d07a0c9a5fe7c224a1bf17828bbeb2629ec4a5 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 4 Sep 2025 09:19:06 +0300 Subject: [PATCH 47/64] update lz4 readme Signed-off-by: Valeriy Khorunzhin --- images/packages/lz4/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/packages/lz4/README.md b/images/packages/lz4/README.md index ea7018725b..807e9daf2d 100644 --- a/images/packages/lz4/README.md +++ b/images/packages/lz4/README.md @@ -10,13 +10,13 @@ │ ├── [-rw-r--r-- 32749] lz4frame.h │ ├── [-rw-r--r-- 2044] lz4frame_static.h │ └── [-rw-r--r-- 20179] lz4hc.h - ├── [drwxr-xr-x 4096] lib + ├── [drwxr-xr-x 4096] lib64 │ ├── [-rw-r--r-- 263272] liblz4.a │ ├── [lrwxrwxrwx 15] liblz4.so -> liblz4.so.1.9.4 │ ├── [lrwxrwxrwx 15] liblz4.so.1 -> liblz4.so.1.9.4 │ ├── [-rwxr-xr-x 237024] liblz4.so.1.9.4 │ └── [drwxr-xr-x 4096] pkgconfig - │ └── [-rw-r--r-- 389] liblz4.pc + │ └── [-rw-r--r-- 391] liblz4.pc └── [drwxr-xr-x 4096] share └── [drwxr-xr-x 4096] man └── [drwxr-xr-x 4096] man1 From 97074a79f66eafa9a445ec0a0639697d784f7276 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 4 Sep 2025 09:33:23 +0300 Subject: [PATCH 48/64] Update images/packages/lz4/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Valeriy Khorunzhin --- images/packages/lz4/werf.inc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/packages/lz4/werf.inc.yaml b/images/packages/lz4/werf.inc.yaml index 37ce63fdf1..150621426c 100644 --- a/images/packages/lz4/werf.inc.yaml +++ b/images/packages/lz4/werf.inc.yaml @@ -58,4 +58,5 @@ shell: export LIBDIR=/usr/lib64 make -j$(nproc) make DESTDIR=$OUTDIR install + rm -rf $OUTDIR/usr/share tree -sp $OUTDIR From be998138c3940fa92b6f48da0a7faf8a1b84358e Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 4 Sep 2025 09:44:03 +0300 Subject: [PATCH 49/64] update lz4 readme Signed-off-by: Valeriy Khorunzhin --- images/packages/lz4/README.md | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/images/packages/lz4/README.md b/images/packages/lz4/README.md index 807e9daf2d..b190581e58 100644 --- a/images/packages/lz4/README.md +++ b/images/packages/lz4/README.md @@ -10,20 +10,13 @@ │ ├── [-rw-r--r-- 32749] lz4frame.h │ ├── [-rw-r--r-- 2044] lz4frame_static.h │ └── [-rw-r--r-- 20179] lz4hc.h - ├── [drwxr-xr-x 4096] lib64 - │ ├── [-rw-r--r-- 263272] liblz4.a - │ ├── [lrwxrwxrwx 15] liblz4.so -> liblz4.so.1.9.4 - │ ├── [lrwxrwxrwx 15] liblz4.so.1 -> liblz4.so.1.9.4 - │ ├── [-rwxr-xr-x 237024] liblz4.so.1.9.4 - │ └── [drwxr-xr-x 4096] pkgconfig - │ └── [-rw-r--r-- 391] liblz4.pc - └── [drwxr-xr-x 4096] share - └── [drwxr-xr-x 4096] man - └── [drwxr-xr-x 4096] man1 - ├── [-rw-r--r-- 9262] lz4.1 - ├── [lrwxrwxrwx 5] lz4c.1 -> lz4.1 - ├── [lrwxrwxrwx 5] lz4cat.1 -> lz4.1 - └── [lrwxrwxrwx 5] unlz4.1 -> lz4.1 + └── [drwxr-xr-x 4096] lib64 + ├── [-rw-r--r-- 263272] liblz4.a + ├── [lrwxrwxrwx 15] liblz4.so -> liblz4.so.1.9.4 + ├── [lrwxrwxrwx 15] liblz4.so.1 -> liblz4.so.1.9.4 + ├── [-rwxr-xr-x 237024] liblz4.so.1.9.4 + └── [drwxr-xr-x 4096] pkgconfig + └── [-rw-r--r-- 391] liblz4.pc -9 directories, 17 files +6 directories, 13 files ``` \ No newline at end of file From 558b268e22c732649a29d6cc81d8374b8d781442 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 8 Sep 2025 16:12:16 +0300 Subject: [PATCH 50/64] Update images/qemu/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Valeriy Khorunzhin --- images/qemu/werf.inc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/qemu/werf.inc.yaml b/images/qemu/werf.inc.yaml index 7aa7804954..a32c00757f 100644 --- a/images/qemu/werf.inc.yaml +++ b/images/qemu/werf.inc.yaml @@ -152,7 +152,7 @@ import: includePaths: - install-qemu.sh - relocate_binaries.sh - {{- include "importPackageImages" (list . $builderDependencies.packages "install") -}} +{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}} secrets: - id: SOURCE_REPO value: {{ $.SOURCE_REPO_GIT }} From b2a9bb7deed7f786a37864f7dbbf00465919b558 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 8 Sep 2025 16:12:26 +0300 Subject: [PATCH 51/64] Update images/packages/libnbd/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Valeriy Khorunzhin --- images/packages/libnbd/werf.inc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/packages/libnbd/werf.inc.yaml b/images/packages/libnbd/werf.inc.yaml index 1b631e097e..ebd29e4277 100644 --- a/images/packages/libnbd/werf.inc.yaml +++ b/images/packages/libnbd/werf.inc.yaml @@ -30,7 +30,7 @@ altPackages: - gcc gcc-c++ make git autoconf libtool gettext-tools - automake pkgconf glibc-devel - bash-completion hardlink libfuse3-devel -- liburing-devel libxml2-devel perl-podlators +- liburing-devel perl-podlators - ocaml ocaml-findlib ocaml-ocamldoc packages: - gnutls libidn2 libgmp ubdsrv xz From 23cf5458d12467c0fe53479df371533677cf333b Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 8 Sep 2025 16:12:38 +0300 Subject: [PATCH 52/64] Update images/packages/libnbd/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Valeriy Khorunzhin --- images/packages/libnbd/werf.inc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/packages/libnbd/werf.inc.yaml b/images/packages/libnbd/werf.inc.yaml index ebd29e4277..ecf4087d03 100644 --- a/images/packages/libnbd/werf.inc.yaml +++ b/images/packages/libnbd/werf.inc.yaml @@ -33,7 +33,7 @@ altPackages: - liburing-devel perl-podlators - ocaml ocaml-findlib ocaml-ocamldoc packages: -- gnutls libidn2 libgmp ubdsrv xz +- gnutls libidn2 libgmp ubdsrv xz libxml2 {{- end -}} {{ $builderDependencies := include "$name" . | fromYaml }} From 41f2ed095784e89c6d9e8163d1dc80438cdde5c3 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 8 Sep 2025 16:12:59 +0300 Subject: [PATCH 53/64] Update images/packages/krb5/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/werf.inc.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/packages/krb5/werf.inc.yaml b/images/packages/krb5/werf.inc.yaml index d0af54660f..415c58dd1e 100644 --- a/images/packages/krb5/werf.inc.yaml +++ b/images/packages/krb5/werf.inc.yaml @@ -28,8 +28,9 @@ shell: altPackages: - git gcc automake make tree - flex libcom_err-devel libkeyutils-devel bison -- libncurses-devel libss-devel libssl-devel libtinfo-devel -- libpam-devel +- libncurses-devel libss-devel libtinfo-devel +packages: +- linux-pam openssl {{- end -}} {{ $builderDependencies := include "$name" . | fromYaml }} From a452ef9d9e530c8053ad18b894034bd3e5cf8c29 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 8 Sep 2025 16:13:24 +0300 Subject: [PATCH 54/64] Update images/packages/krb5/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/werf.inc.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/packages/krb5/werf.inc.yaml b/images/packages/krb5/werf.inc.yaml index 415c58dd1e..0fb6763e8d 100644 --- a/images/packages/krb5/werf.inc.yaml +++ b/images/packages/krb5/werf.inc.yaml @@ -54,6 +54,13 @@ shell: install: - | + # Install packages + PKGS="{{ $builderDependencies.packages | join " " }}" + for pkg in $PKGS; do + cp -a /$pkg/. / + rm -rf /$pkg + done + OUTDIR=/out cd /src/src From 1cb761e6f55a6c7f00ae2b1d2b6634a42486c21a Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 8 Sep 2025 16:13:36 +0300 Subject: [PATCH 55/64] Update images/packages/krb5/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/werf.inc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/packages/krb5/werf.inc.yaml b/images/packages/krb5/werf.inc.yaml index 0fb6763e8d..27dc20052a 100644 --- a/images/packages/krb5/werf.inc.yaml +++ b/images/packages/krb5/werf.inc.yaml @@ -43,6 +43,7 @@ import: add: /src to: /src before: install +{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}} shell: beforeInstall: {{- include "alt packages proxy" . | nindent 2 }} From 4229dc3b84d1e0dc843ce72222d7986e2c5f5fb7 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 8 Sep 2025 16:50:36 +0300 Subject: [PATCH 56/64] fix krb build Signed-off-by: Valeriy Khorunzhin --- images/packages/krb5/werf.inc.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/packages/krb5/werf.inc.yaml b/images/packages/krb5/werf.inc.yaml index 27dc20052a..23e0704e94 100644 --- a/images/packages/krb5/werf.inc.yaml +++ b/images/packages/krb5/werf.inc.yaml @@ -55,13 +55,12 @@ shell: install: - | - # Install packages + # Install packages PKGS="{{ $builderDependencies.packages | join " " }}" for pkg in $PKGS; do cp -a /$pkg/. / rm -rf /$pkg done - OUTDIR=/out cd /src/src From 37e4ab76d9022895b8a10722fbf276be20f4ba52 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 8 Sep 2025 18:16:49 +0300 Subject: [PATCH 57/64] fix libxml build Signed-off-by: Valeriy Khorunzhin --- images/packages/libxml2/werf.inc.yaml | 3 +++ images/packages/nbdkit/werf.inc.yaml | 1 + 2 files changed, 4 insertions(+) diff --git a/images/packages/libxml2/werf.inc.yaml b/images/packages/libxml2/werf.inc.yaml index acf0d74479..44046145fe 100644 --- a/images/packages/libxml2/werf.inc.yaml +++ b/images/packages/libxml2/werf.inc.yaml @@ -31,6 +31,7 @@ altPackages: - meson ninja-build - gettext-devel liblzma-devel - xz git +- tree packages: - zlib - openssl @@ -85,3 +86,5 @@ shell: echo "Stripped: $execfile" fi done + + tree -hp /out diff --git a/images/packages/nbdkit/werf.inc.yaml b/images/packages/nbdkit/werf.inc.yaml index 805c56be3f..b3588776c5 100644 --- a/images/packages/nbdkit/werf.inc.yaml +++ b/images/packages/nbdkit/werf.inc.yaml @@ -41,6 +41,7 @@ packages: - zlib - libssh - zstd +- libxml2 {{- end -}} {{ $builderDependencies := include "$name" . | fromYaml }} From 45e6bec51031959437bb6ac4e769a2cae7c9c427 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 8 Sep 2025 18:44:02 +0300 Subject: [PATCH 58/64] fix dvcr Signed-off-by: Valeriy Khorunzhin --- images/dvcr-artifact/werf.inc.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/images/dvcr-artifact/werf.inc.yaml b/images/dvcr-artifact/werf.inc.yaml index e4d285a15d..77f4312626 100644 --- a/images/dvcr-artifact/werf.inc.yaml +++ b/images/dvcr-artifact/werf.inc.yaml @@ -4,9 +4,9 @@ altPackages: - gcc glibc-pthread glibc-devel glibc-devel-static - git golang make binutils -- libxml2-devel packages: - libnbd +- libxml2 {{- end -}} {{ $builderDeps := include "$nameDeps" . | fromYaml }} @@ -68,8 +68,6 @@ shell: --- {{- $name := print $.ImageName "-dependencies" -}} {{- define "$name" -}} -altPackages: -- libxml2-devel binaries: - /usr/local/bin/dvcr-importer - /usr/sbin/nbd* From 1ec9b9c79995c9a677936a1622404c784c05220b Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 8 Sep 2025 18:46:43 +0300 Subject: [PATCH 59/64] fix cdi Signed-off-by: Valeriy Khorunzhin --- images/cdi-artifact/werf.inc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/cdi-artifact/werf.inc.yaml b/images/cdi-artifact/werf.inc.yaml index 9a0eaf70a0..daadb749eb 100644 --- a/images/cdi-artifact/werf.inc.yaml +++ b/images/cdi-artifact/werf.inc.yaml @@ -11,6 +11,7 @@ binaries: packages: - libnbd - xz +- libxml2 {{- end -}} {{ $builderDependencies := include "$name" . | fromYaml }} From a9db4d191921157e007cbb3250ee09de6bf3ef78 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 8 Sep 2025 19:20:05 +0300 Subject: [PATCH 60/64] t Signed-off-by: Valeriy Khorunzhin --- images/dvcr-artifact/werf.inc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/dvcr-artifact/werf.inc.yaml b/images/dvcr-artifact/werf.inc.yaml index 77f4312626..8f4fdeb3ab 100644 --- a/images/dvcr-artifact/werf.inc.yaml +++ b/images/dvcr-artifact/werf.inc.yaml @@ -81,7 +81,7 @@ binaries: - /usr/bin/qemu-nbd - /usr/lib64/libnbd.s* packages: -- bzip2 file nbdkit libnbd xz +- bzip2 file nbdkit libnbd xz libxml2 {{- end -}} {{ $builderDependencies := include "$name" . | fromYaml }} From ebb204debcbb836c8a0d3f34f75aeb388e1bf7da Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 8 Sep 2025 19:58:41 +0300 Subject: [PATCH 61/64] tt Signed-off-by: Valeriy Khorunzhin --- images/dvcr-artifact/werf.inc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/dvcr-artifact/werf.inc.yaml b/images/dvcr-artifact/werf.inc.yaml index 8f4fdeb3ab..f27071db2f 100644 --- a/images/dvcr-artifact/werf.inc.yaml +++ b/images/dvcr-artifact/werf.inc.yaml @@ -80,6 +80,7 @@ binaries: - /usr/bin/qemu-img - /usr/bin/qemu-nbd - /usr/lib64/libnbd.s* +- /usr/lib64/libxml2.s* packages: - bzip2 file nbdkit libnbd xz libxml2 {{- end -}} From 9d6b2ee536cd2d333cd3bd992d2f2aabccd183b0 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Tue, 9 Sep 2025 10:38:52 +0300 Subject: [PATCH 62/64] virt-launcher werf Signed-off-by: Valeriy Khorunzhin --- images/virt-launcher/werf.inc.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index c6c46cfa67..cfe7f0e870 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -85,7 +85,6 @@ altLibs: - systemtap-sdt-devel - glib2-devel - libgio-devel - - libxml2-devel - libtirpc-devel - libclocale - libLLVMSPIRVLib-devel @@ -129,7 +128,7 @@ packages: - zlib zstd p11-kit linux-pam - libssh libssh2 - libpixman libqpl rdma-core -- krb5 xz +- krb5 xz libxml2 {{- end -}} {{ $builderDependencies := include "$name" . | fromYaml }} From f512bc42f818f73a9c0d0ffaf29290ce307c1ff9 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Tue, 9 Sep 2025 11:24:52 +0300 Subject: [PATCH 63/64] t Signed-off-by: Valeriy Khorunzhin --- images/cdi-artifact/werf.inc.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/cdi-artifact/werf.inc.yaml b/images/cdi-artifact/werf.inc.yaml index daadb749eb..9228dd765a 100644 --- a/images/cdi-artifact/werf.inc.yaml +++ b/images/cdi-artifact/werf.inc.yaml @@ -8,6 +8,7 @@ binaries: - /cdi-binaries/cdi-importer - /cdi-binaries/cdi-source-update-poller +- /usr/lib64/libxml2.s* packages: - libnbd - xz @@ -60,7 +61,7 @@ shell: beforeInstall: {{- include "alt packages proxy" . | nindent 2 }} - | - apt-get -qq install -y libxml2-devel \ + apt-get -qq install -y \ git binutils make gcc glibc-pthread glibc-devel glibc-devel-static golang {{- include "alt packages clean" . | nindent 2 }} install: From f633b3ecca64e060ae8b46c473719218c7635fb9 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Tue, 9 Sep 2025 12:31:43 +0300 Subject: [PATCH 64/64] t Signed-off-by: Valeriy Khorunzhin --- images/cdi-artifact/werf.inc.yaml | 1 - images/cdi-importer/werf.inc.yaml | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/images/cdi-artifact/werf.inc.yaml b/images/cdi-artifact/werf.inc.yaml index 9228dd765a..449109ced2 100644 --- a/images/cdi-artifact/werf.inc.yaml +++ b/images/cdi-artifact/werf.inc.yaml @@ -8,7 +8,6 @@ binaries: - /cdi-binaries/cdi-importer - /cdi-binaries/cdi-source-update-poller -- /usr/lib64/libxml2.s* packages: - libnbd - xz diff --git a/images/cdi-importer/werf.inc.yaml b/images/cdi-importer/werf.inc.yaml index 078f2b2b30..5f1edfc716 100644 --- a/images/cdi-importer/werf.inc.yaml +++ b/images/cdi-importer/werf.inc.yaml @@ -50,6 +50,12 @@ import: - cdi-image-size-detection - cdi-importer - cdi-source-update-poller +- image: {{ .ModuleNamePrefix }}cdi-artifact + add: /cdi-binaries + to: /usr/lib64 + before: setup + includePaths: + - libxml2.s* - image: {{ .ModuleNamePrefix }}qemu add: /qemu-img to: /relocate