From 466fcb7b6de72164567bfb8945ff86f197c22498 Mon Sep 17 00:00:00 2001 From: Daniil Antoshin Date: Mon, 21 Apr 2025 18:53:34 +0200 Subject: [PATCH 1/6] chore(core): build numactl Signed-off-by: Daniil Antoshin --- component_versions/version_map.yml | 1 + .../packages/binaries/numactl/werf.inc.yaml | 66 +++++++++++++++++++ images/virt-launcher/werf.inc.yaml | 18 ++--- 3 files changed, 77 insertions(+), 8 deletions(-) create mode 100644 images/packages/binaries/numactl/werf.inc.yaml diff --git a/component_versions/version_map.yml b/component_versions/version_map.yml index f1dd5cd5b3..2a037bd241 100644 --- a/component_versions/version_map.yml +++ b/component_versions/version_map.yml @@ -4,3 +4,4 @@ firmware: edk2: stable202411 package: swtpm: 0.10.0 + numactl: 2.0.19 diff --git a/images/packages/binaries/numactl/werf.inc.yaml b/images/packages/binaries/numactl/werf.inc.yaml new file mode 100644 index 0000000000..4f7bb83692 --- /dev/null +++ b/images/packages/binaries/numactl/werf.inc.yaml @@ -0,0 +1,66 @@ +--- +image: {{ $.ImageType }}/{{ $.ImageName }} +final: false +fromImage: builder/scratch +import: +- image: {{ $.ImageType }}/{{ $.ImageName }}-builder + add: /out + to: /numactl + before: setup + +--- +{{- $version := get $.Package $.ImageName }} +{{- $gitRepoUrl := "numactl/numactl.git" }} + +{{- $name := print $.ImageName "-dependencies" -}} +{{- define "$name" -}} +packages: +- gcc +- git pkg-config trousers +- automake autoconf make libtool +- tree +{{- end -}} + +{{ $builderDependencies := include "$name" . | fromYaml }} + +image: {{ $.ImageType }}/{{ $.ImageName }}-builder +final: false +fromImage: builder/alt +secrets: +- id: SOURCE_REPO + value: {{ $.SOURCE_REPO_GIT }} +shell: + beforeInstall: + - | + apt-get update && apt-get install -y \ + {{ $builderDependencies.packages | join " " }} + apt-get clean + rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin + + install: + - | + OUTDIR=/out + mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config + + git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /src + cd /src + + ./autogen.sh + + ./configure --prefix=/usr --libdir=/usr/lib64 --enable-static=no + + make -j$(nproc) + + make DESTDIR=$OUTDIR install + + strip $OUTDIR/usr/bin/* + + tree $OUTDIR + + # We don't need man, test and samples files + rm -rf $OUTDIR/usr/include + rm -rf $OUTDIR/usr/share + rm -rf $OUTDIR/usr/lib64/pkgconfig + rm -rf $OUTDIR/usr/bin/numademo + + tree $OUTDIR diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index 1a3ff8b1b0..e205ab2690 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -70,7 +70,6 @@ libs: - libdaxctl-devel - libfuse3-devel - rdma-core-devel - - libnuma-devel - bzlib-devel - liblzo2-devel - libsnappy-devel @@ -126,7 +125,6 @@ packages: - iptables - libffi8 - nftables - - numactl - openssl - passt - pcre @@ -152,7 +150,7 @@ binaries: # Dmidecode - /usr/sbin/biosdecode /usr/sbin/dmidecode # Numactl - - /usr/bin/memhog /usr/bin/migratepages /usr/bin/migspeed /usr/bin/numactl /usr/bin/numademo /usr/bin/numastat + - /usr/bin/memhog /usr/bin/migratepages /usr/bin/migspeed /usr/bin/numactl /usr/bin/numastat # Hwclock - /usr/sbin/hwclock {{- end -}} @@ -247,6 +245,10 @@ import: before: setup includePaths: - temp_pod +- image: packages/binaries/numactl + add: /numactl + to: / + before: install shell: beforeInstall: - | @@ -268,7 +270,7 @@ shell: echo "find and copy additional libs" FILES=$(find /VBINS/usr/bin/ -type f) FILES+=" $(find /VBINS/usr/sbin/ -type f)" - + LIBS="/usr/lib64/libbsd.so* /usr/lib64/libnbd.so* /usr/lib64/libfuse3.so*" LIBS+=" /usr/lib64/libjson-c.so* /usr/lib64/libssh.so* /usr/lib64/libssh2.so*" LIBS+=" /usr/lib64/libtpms.so*" @@ -276,7 +278,7 @@ shell: echo "Relocate additional libs for files in /VBINS" ./relocate_binaries.sh -i "$FILES" -o /VBINS - + echo "Relocate additional libs to /VBINS" ./relocate_binaries.sh -i "$LIBS" -o /VBINS @@ -358,7 +360,7 @@ shell: echo "List files in /relocate/usr/local/lib64" ls -la usr/local/lib64 - + - | cd /relocate @@ -431,8 +433,8 @@ shell: apt-get update && apt-get install --yes gcc musl-dev musl-tools apt-get clean install: - - | + - | echo "Building simple app that prints I'am temp pod" mkdir -p /bins musl-gcc -static -Os -o /bins/temp_pod temp_pod.c - strip /bins/temp_pod \ No newline at end of file + strip /bins/temp_pod From eaba83f741ab1231f5c58f7a45b24b4c8a19a506 Mon Sep 17 00:00:00 2001 From: Daniil Antoshin Date: Tue, 22 Apr 2025 12:12:54 +0200 Subject: [PATCH 2/6] fix: build Signed-off-by: Daniil Antoshin --- images/virt-launcher/werf.inc.yaml | 20 +++++++++++-------- .../pkg/common/kvvm/kvvm.go | 1 + 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index 3420181e7a..0b7741a6e0 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -112,7 +112,6 @@ libs: - libtirpc-devel - libclocale - libLLVMSPIRVLib-devel - - libswtpm-devel packages: - acl - attr @@ -237,7 +236,12 @@ import: - image: packages/binaries/swtpm add: /swtpm - to: / + to: /swtpm + before: install + +- image: packages/binaries/numactl + add: /numactl + to: /numactl before: install - image: tools/coreutils @@ -255,17 +259,13 @@ import: before: setup includePaths: - temp_pod -- image: packages/binaries/numactl - add: /numactl - to: / - before: install shell: beforeInstall: - | apt-get update && apt-get install -y {{ $virtLauncherDependencies.libs | join " " }} {{ $virtLauncherDependencies.packages | join " " }} # libtpms libtpms-devel require version 0.10 that in sisyphus repo - cat >/etc/apt/sources.list.d/alt-sisyphus.list</etc/apt/sources.list.d/alt-sisyphus.list< Date: Thu, 24 Apr 2025 09:43:22 +0200 Subject: [PATCH 3/6] Update images/packages/binaries/numactl/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Daniil Antoshin --- images/packages/binaries/numactl/werf.inc.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/images/packages/binaries/numactl/werf.inc.yaml b/images/packages/binaries/numactl/werf.inc.yaml index 4f7bb83692..79604326d2 100644 --- a/images/packages/binaries/numactl/werf.inc.yaml +++ b/images/packages/binaries/numactl/werf.inc.yaml @@ -63,4 +63,3 @@ shell: rm -rf $OUTDIR/usr/lib64/pkgconfig rm -rf $OUTDIR/usr/bin/numademo - tree $OUTDIR From b9be5b78e96aad3ff983fc901f58f86a0a9569cd Mon Sep 17 00:00:00 2001 From: Daniil Antoshin Date: Thu, 24 Apr 2025 09:43:27 +0200 Subject: [PATCH 4/6] Update images/packages/binaries/numactl/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Daniil Antoshin --- images/packages/binaries/numactl/werf.inc.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/images/packages/binaries/numactl/werf.inc.yaml b/images/packages/binaries/numactl/werf.inc.yaml index 79604326d2..f59d4da96c 100644 --- a/images/packages/binaries/numactl/werf.inc.yaml +++ b/images/packages/binaries/numactl/werf.inc.yaml @@ -18,7 +18,6 @@ packages: - gcc - git pkg-config trousers - automake autoconf make libtool -- tree {{- end -}} {{ $builderDependencies := include "$name" . | fromYaml }} From 4db88afd70f69e6b9c47747ee4ec87fa062b3a5a Mon Sep 17 00:00:00 2001 From: Daniil Antoshin Date: Thu, 24 Apr 2025 09:43:38 +0200 Subject: [PATCH 5/6] Update images/virt-launcher/werf.inc.yaml Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Signed-off-by: Daniil Antoshin --- images/virt-launcher/werf.inc.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index 0b7741a6e0..0f4d0c8990 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -281,7 +281,6 @@ shell: echo "Create folder hierarchy in VBINS" mkdir -p /VBINS/{etc,root} mkdir -p /VBINS/var/{log/libvirt/qemu,log/swtpm/libvirt/qemu,lib/libvirt/qemu,run/libvirt/qemu} - mkdir -p /VBINS/usr/lib64/swtpm echo "=====Copy libvirt binaries to temp folder======" cp -a /libvirt-bins/. /VBINS/ From f879d458d5d4c1311c01c39c3f2c065a8d6abdad Mon Sep 17 00:00:00 2001 From: Daniil Antoshin Date: Thu, 24 Apr 2025 11:16:08 +0200 Subject: [PATCH 6/6] fix: remove debug Signed-off-by: Daniil Antoshin --- images/packages/binaries/numactl/werf.inc.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/packages/binaries/numactl/werf.inc.yaml b/images/packages/binaries/numactl/werf.inc.yaml index f59d4da96c..2e0f512cf9 100644 --- a/images/packages/binaries/numactl/werf.inc.yaml +++ b/images/packages/binaries/numactl/werf.inc.yaml @@ -54,8 +54,6 @@ shell: strip $OUTDIR/usr/bin/* - tree $OUTDIR - # We don't need man, test and samples files rm -rf $OUTDIR/usr/include rm -rf $OUTDIR/usr/share