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..2e0f512cf9 --- /dev/null +++ b/images/packages/binaries/numactl/werf.inc.yaml @@ -0,0 +1,62 @@ +--- +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 +{{- 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/* + + # 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 + diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index 074649323e..0f4d0c8990 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 @@ -113,7 +112,6 @@ libs: - libtirpc-devel - libclocale - libLLVMSPIRVLib-devel - - libswtpm-devel packages: - acl - attr @@ -126,7 +124,6 @@ packages: - iptables - libffi8 - nftables - - numactl - openssl - passt - pcre @@ -151,7 +148,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 -}} @@ -239,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 @@ -263,7 +265,7 @@ shell: 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<