Skip to content

chore(core): qemu-img to images #961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
universal-itengineer merged 4 commits into from
Apr 25, 2025
Merged

chore(core): qemu-img to images #961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49b42b0
create separetee qemu img 'pkg'
universal-itengineer Apr 21, 2025
1ae01bd
try import qemu imgs as dedicaded libs and bins
universal-itengineer Apr 21, 2025
d944f80
rm commented bins
universal-itengineer Apr 23, 2025
145d09f
rm package qemu-img
universal-itengineer Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions images/cdi-importer/werf.inc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,10 @@ imageSpec:
libraries:
- libsqlite3
packages:
- qemu-img
- libnbd
- nbd-client
- nbd-server
binaries:
# Qemu-img
- /usr/bin/qemu-img
- /usr/bin/qemu-nbd
# All nbd binaries
- /usr/bin/nbd*
# Mount
Expand Down Expand Up @@ -52,6 +48,10 @@ import:
- cdi-image-size-detection
- cdi-importer
- cdi-source-update-poller
- image: qemu
add: /qemu-img
to: /relocate
before: setup
shell:
install:
- |
Expand Down
8 changes: 5 additions & 3 deletions images/dvcr-artifact/werf.inc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ shell:
{{- define "$name" -}}
binaries:
- /usr/local/bin/dvcr-importer
- /usr/bin/qemu-img
- /usr/bin/qemu-nbd
- /usr/bin/nbd*
- /usr/bin/file
- /usr/share/file/magic
Expand All @@ -58,11 +56,15 @@ import:
add: /out
to: /usr/local/bin
before: setup
- image: qemu
add: /qemu-img
to: /relocate
before: setup
shell:
install:
- |
apt-get update && apt-get install --yes \
qemu-img libnbd file
libnbd file
- apt-get clean
- rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
setup:
Expand Down
320 changes: 143 additions & 177 deletions images/qemu/werf.inc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ git:
stageDependencies:
setup:
- install-qemu.sh

- add: /images/base-alt-p11-binaries
to: /
includePaths:
- relocate_binaries.sh
stageDependencies:
setup:
- '**/*'
shell:
beforeInstall:
- |
Expand Down Expand Up @@ -132,184 +140,135 @@ shell:
--tls-priority="@QEMU,SYSTEM" \
--block-drv-rw-whitelist="qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle,compress,virtio-blk-vhost-vdpa,virtio-blk-vfio-pci,virtio-blk-vhost-user,io_uring,nvme-io_uring" \
--block-drv-ro-whitelist="vdi,vmdk,vhdx,vpc,https" \
--disable-alsa \
--disable-attr \
--disable-auth-pam \
--disable-avx2 \
--disable-avx512bw \
--disable-blkio \
--disable-alsa \
--disable-auth-pam \
--disable-avx2 \
--disable-avx512bw \
--disable-block-drv-whitelist-in-tools \
--disable-bochs \
--disable-bpf \
--disable-brlapi \
--disable-bsd-user \
--disable-bzip2 \
--disable-cap-ng \
--disable-capstone \
--disable-cfi \
--disable-cfi-debug \
--disable-cloop \
--disable-cocoa \
--disable-coreaudio \
--disable-coroutine-pool \
--disable-crypto-afalg \
--disable-curl \
--disable-curses \
--disable-dbus-display \
--disable-debug-info \
--disable-debug-mutex \
--disable-debug-tcg \
--disable-dmg \
--disable-docs \
--disable-dsound \
--disable-fdt \
--disable-fuse \
--disable-fuse-lseek \
--disable-gcrypt \
--disable-gettext \
--disable-gio \
--disable-glusterfs \
--disable-gnutls \
--disable-gtk \
--disable-guest-agent \
--disable-guest-agent-msi \
--disable-hvf \
--disable-iconv \
--disable-jack \
--disable-kvm \
--disable-l2tpv3 \
--disable-libdaxctl \
--disable-libdw \
--disable-libiscsi \
--disable-libnfs \
--disable-libpmem \
--disable-libssh \
--disable-libudev \
--disable-libusb \
--disable-libvduse \
--disable-linux-aio \
--disable-linux-io-uring \
--disable-linux-user \
--disable-lto \
--disable-lzfse \
--disable-lzo \
--disable-malloc-trim \
--disable-membarrier \
--disable-modules \
--disable-module-upgrades \
--disable-mpath \
--disable-multiprocess \
--disable-netmap \
--disable-nettle \
--disable-numa \
--disable-nvmm \
--disable-opengl \
--disable-oss \
--disable-pa \
--disable-parallels \
--disable-pie \
--disable-plugins \
--disable-qcow1 \
--disable-qed \
--disable-qga-vss \
--disable-qom-cast-debug \
--disable-rbd \
--disable-rdma \
--disable-replication \
--disable-rng-none \
--disable-safe-stack \
--disable-sdl \
--disable-sdl-image \
--disable-seccomp \
--disable-selinux \
--disable-slirp \
--disable-slirp-smbd \
--disable-smartcard \
--disable-snappy \
--disable-sndio \
--disable-sparse \
--disable-spice \
--disable-spice-protocol \
--disable-strip \
--disable-system \
--disable-tcg \
--disable-tools \
--disable-tpm \
--disable-u2f \
--disable-usb-redir \
--disable-user \
--disable-vde \
--disable-vdi \
--disable-vduse-blk-export \
--disable-vhost-crypto \
--disable-vhost-kernel \
--disable-vhost-net \
--disable-vhost-user \
--disable-vhost-user-blk-server \
--disable-vhost-vdpa \
--disable-virglrenderer \
--disable-virtfs \
--disable-vnc \
--disable-vnc-jpeg \
--disable-png \
--disable-vnc-sasl \
--disable-vte \
--disable-vvfat \
--disable-werror \
--disable-whpx \
--disable-xen \
--disable-xen-pci-passthrough \
--disable-xkbcommon \
--disable-zstd \
--enable-attr \
--enable-blkio \
--enable-cap-ng \
--enable-capstone \
--enable-coroutine-pool \
--enable-curl \
--enable-dbus-display \
--enable-debug-info \
--enable-fdt=system \
--enable-gio \
--enable-gnutls \
--enable-guest-agent \
--enable-iconv \
--enable-kvm \
--enable-libusb \
--enable-libudev \
--enable-linux-aio \
--enable-linux-io-uring \
--enable-lzo \
--enable-malloc-trim \
--enable-modules \
--enable-mpath \
--enable-numa \
--enable-opengl \
--enable-pa \
--enable-pie \
--enable-rbd \
--enable-rdma \
--enable-seccomp \
--enable-selinux \
--enable-slirp \
--enable-snappy \
--enable-spice-protocol \
--enable-system \
--enable-tcg \
--enable-tools \
--enable-tpm \
--enable-usb-redir \
--enable-vdi \
--enable-vhost-kernel \
--enable-vhost-net \
--enable-vhost-user \
--enable-vhost-user-blk-server \
--enable-vhost-vdpa \
--enable-vnc \
--enable-png \
--enable-vnc-sasl \
--enable-werror \
--enable-xkbcommon \
--disable-bochs \
--disable-bpf \
--disable-brlapi \
--disable-bsd-user \
--disable-bzip2 \
--disable-cfi \
--disable-cfi-debug \
--disable-cloop \
--disable-cocoa \
--disable-coreaudio \
--disable-crypto-afalg \
--disable-curses \
--disable-debug-mutex \
--disable-debug-tcg \
--disable-dmg \
--disable-docs \
--disable-dsound \
--disable-fdt \
--disable-fuse \
--disable-fuse-lseek \
--disable-gcrypt \
--disable-gettext \
--disable-glusterfs \
--disable-gtk \
--disable-guest-agent-msi \
--disable-hvf \
--disable-jack \
--disable-l2tpv3 \
--disable-libdaxctl \
--disable-libdw \
--disable-libiscsi \
--disable-libnfs \
--disable-libpmem \
--disable-libssh \
--disable-libvduse \
--disable-linux-user \
--disable-lto \
--disable-lzfse \
--disable-membarrier \
--disable-module-upgrades \
--disable-multiprocess \
--disable-netmap \
--disable-nettle \
--disable-nvmm \
--disable-oss \
--disable-parallels \
--disable-plugins \
--disable-qcow1 \
--disable-qed \
--disable-qga-vss \
--disable-qom-cast-debug \
--disable-replication \
--disable-rng-none \
--disable-safe-stack \
--disable-sdl \
--disable-sdl-image \
--disable-slirp-smbd \
--disable-smartcard \
--disable-sndio \
--disable-sparse \
--disable-spice \
--disable-strip \
--disable-u2f \
--disable-user \
--disable-vde \
--disable-vduse-blk-export \
--disable-vhost-crypto \
--disable-virglrenderer \
--disable-virtfs \
--disable-vnc-jpeg \
--disable-vte \
--disable-vvfat \
--disable-whpx \
--disable-xen \
--disable-xen-pci-passthrough \
--enable-attr \
--enable-blkio \
--enable-cap-ng \
--enable-capstone \
--enable-coroutine-pool \
--enable-curl \
--enable-dbus-display \
--enable-debug-info \
--enable-fdt=system \
--enable-gio \
--enable-gnutls \
--enable-guest-agent \
--enable-iconv \
--enable-kvm \
--enable-libusb \
--enable-libudev \
--enable-linux-aio \
--enable-linux-io-uring \
--enable-lzo \
--enable-malloc-trim \
--enable-modules \
--enable-mpath \
--enable-numa \
--enable-opengl \
--enable-pa \
--enable-pie \
--enable-rbd \
--enable-rdma \
--enable-seccomp \
--enable-selinux \
--enable-slirp \
--enable-snappy \
--enable-spice-protocol \
--enable-system \
--enable-tcg \
--enable-tools \
--enable-tpm \
--enable-usb-redir \
--enable-vdi \
--enable-vhost-kernel \
--enable-vhost-net \
--enable-vhost-user \
--enable-vhost-user-blk-server \
--enable-vhost-vdpa \
--enable-vnc \
--enable-png \
--enable-vnc-sasl \
--enable-werror \
--enable-xkbcommon \
--enable-zstd

make -j$(nproc)
Expand All @@ -320,3 +279,10 @@ shell:
-s /{{ $gitRepoName }}-{{ $version }} \
-d /BINS \
-b build
# qemu-img
mkdir -p /qemu-img/usr/bin
cp -an /BINS/usr/bin/qemu{-nbd,-img} /qemu-img/usr/bin

LIST="/BINS/usr/bin/qemu-img /BINS/usr/bin/qemu-nbd"

./relocate_binaries.sh -i "$LIST" -o /qemu-img
Loading
Loading