Skip to content

Commit 3531454

Browse files
universal-itengineeruniversal-itengineer
authored
chore(core): qemu-img to images (#961)
Replacing qemu-img and qemu-nbd binary files with self-assembled ones in cdi-importer dvcr-artifact virt-handler images --------- Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
1 parent 8e4fc95 commit 3531454

4 files changed

Lines changed: 160 additions & 191 deletions

File tree

‎images/cdi-importer/werf.inc.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,10 @@ imageSpec:
1717
libraries:
1818
- libsqlite3
1919
packages:
20-
- qemu-img
2120
- libnbd
2221
- nbd-client
2322
- nbd-server
2423
binaries:
25-
# Qemu-img
26-
- /usr/bin/qemu-img
27-
- /usr/bin/qemu-nbd
2824
# All nbd binaries
2925
- /usr/bin/nbd*
3026
# Mount
@@ -52,6 +48,10 @@ import:
5248
- cdi-image-size-detection
5349
- cdi-importer
5450
- cdi-source-update-poller
51+
- image: qemu
52+
add: /qemu-img
53+
to: /relocate
54+
before: setup
5555
shell:
5656
install:
5757
- |

‎images/dvcr-artifact/werf.inc.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ shell:
3535
{{- define "$name" -}}
3636
binaries:
3737
- /usr/local/bin/dvcr-importer
38-
- /usr/bin/qemu-img
39-
- /usr/bin/qemu-nbd
4038
- /usr/bin/nbd*
4139
- /usr/bin/file
4240
- /usr/share/file/magic
@@ -58,11 +56,15 @@ import:
5856
add: /out
5957
to: /usr/local/bin
6058
before: setup
59+
- image: qemu
60+
add: /qemu-img
61+
to: /relocate
62+
before: setup
6163
shell:
6264
install:
6365
- |
6466
apt-get update && apt-get install --yes \
65-
qemu-img libnbd file
67+
libnbd file
6668
- apt-get clean
6769
- rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
6870
setup:

‎images/qemu/werf.inc.yaml‎

Lines changed: 143 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ git:
1717
stageDependencies:
1818
setup:
1919
- install-qemu.sh
20+
21+
- add: /images/base-alt-p11-binaries
22+
to: /
23+
includePaths:
24+
- relocate_binaries.sh
25+
stageDependencies:
26+
setup:
27+
- '**/*'
2028
shell:
2129
beforeInstall:
2230
- |
@@ -132,184 +140,135 @@ shell:
132140
--tls-priority="@QEMU,SYSTEM" \
133141
--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" \
134142
--block-drv-ro-whitelist="vdi,vmdk,vhdx,vpc,https" \
135-
--disable-alsa \
136-
--disable-attr \
137-
--disable-auth-pam \
138-
--disable-avx2 \
139-
--disable-avx512bw \
140-
--disable-blkio \
143+
--disable-alsa \
144+
--disable-auth-pam \
145+
--disable-avx2 \
146+
--disable-avx512bw \
141147
--disable-block-drv-whitelist-in-tools \
142-
--disable-bochs \
143-
--disable-bpf \
144-
--disable-brlapi \
145-
--disable-bsd-user \
146-
--disable-bzip2 \
147-
--disable-cap-ng \
148-
--disable-capstone \
149-
--disable-cfi \
150-
--disable-cfi-debug \
151-
--disable-cloop \
152-
--disable-cocoa \
153-
--disable-coreaudio \
154-
--disable-coroutine-pool \
155-
--disable-crypto-afalg \
156-
--disable-curl \
157-
--disable-curses \
158-
--disable-dbus-display \
159-
--disable-debug-info \
160-
--disable-debug-mutex \
161-
--disable-debug-tcg \
162-
--disable-dmg \
163-
--disable-docs \
164-
--disable-dsound \
165-
--disable-fdt \
166-
--disable-fuse \
167-
--disable-fuse-lseek \
168-
--disable-gcrypt \
169-
--disable-gettext \
170-
--disable-gio \
171-
--disable-glusterfs \
172-
--disable-gnutls \
173-
--disable-gtk \
174-
--disable-guest-agent \
175-
--disable-guest-agent-msi \
176-
--disable-hvf \
177-
--disable-iconv \
178-
--disable-jack \
179-
--disable-kvm \
180-
--disable-l2tpv3 \
181-
--disable-libdaxctl \
182-
--disable-libdw \
183-
--disable-libiscsi \
184-
--disable-libnfs \
185-
--disable-libpmem \
186-
--disable-libssh \
187-
--disable-libudev \
188-
--disable-libusb \
189-
--disable-libvduse \
190-
--disable-linux-aio \
191-
--disable-linux-io-uring \
192-
--disable-linux-user \
193-
--disable-lto \
194-
--disable-lzfse \
195-
--disable-lzo \
196-
--disable-malloc-trim \
197-
--disable-membarrier \
198-
--disable-modules \
199-
--disable-module-upgrades \
200-
--disable-mpath \
201-
--disable-multiprocess \
202-
--disable-netmap \
203-
--disable-nettle \
204-
--disable-numa \
205-
--disable-nvmm \
206-
--disable-opengl \
207-
--disable-oss \
208-
--disable-pa \
209-
--disable-parallels \
210-
--disable-pie \
211-
--disable-plugins \
212-
--disable-qcow1 \
213-
--disable-qed \
214-
--disable-qga-vss \
215-
--disable-qom-cast-debug \
216-
--disable-rbd \
217-
--disable-rdma \
218-
--disable-replication \
219-
--disable-rng-none \
220-
--disable-safe-stack \
221-
--disable-sdl \
222-
--disable-sdl-image \
223-
--disable-seccomp \
224-
--disable-selinux \
225-
--disable-slirp \
226-
--disable-slirp-smbd \
227-
--disable-smartcard \
228-
--disable-snappy \
229-
--disable-sndio \
230-
--disable-sparse \
231-
--disable-spice \
232-
--disable-spice-protocol \
233-
--disable-strip \
234-
--disable-system \
235-
--disable-tcg \
236-
--disable-tools \
237-
--disable-tpm \
238-
--disable-u2f \
239-
--disable-usb-redir \
240-
--disable-user \
241-
--disable-vde \
242-
--disable-vdi \
243-
--disable-vduse-blk-export \
244-
--disable-vhost-crypto \
245-
--disable-vhost-kernel \
246-
--disable-vhost-net \
247-
--disable-vhost-user \
248-
--disable-vhost-user-blk-server \
249-
--disable-vhost-vdpa \
250-
--disable-virglrenderer \
251-
--disable-virtfs \
252-
--disable-vnc \
253-
--disable-vnc-jpeg \
254-
--disable-png \
255-
--disable-vnc-sasl \
256-
--disable-vte \
257-
--disable-vvfat \
258-
--disable-werror \
259-
--disable-whpx \
260-
--disable-xen \
261-
--disable-xen-pci-passthrough \
262-
--disable-xkbcommon \
263-
--disable-zstd \
264-
--enable-attr \
265-
--enable-blkio \
266-
--enable-cap-ng \
267-
--enable-capstone \
268-
--enable-coroutine-pool \
269-
--enable-curl \
270-
--enable-dbus-display \
271-
--enable-debug-info \
272-
--enable-fdt=system \
273-
--enable-gio \
274-
--enable-gnutls \
275-
--enable-guest-agent \
276-
--enable-iconv \
277-
--enable-kvm \
278-
--enable-libusb \
279-
--enable-libudev \
280-
--enable-linux-aio \
281-
--enable-linux-io-uring \
282-
--enable-lzo \
283-
--enable-malloc-trim \
284-
--enable-modules \
285-
--enable-mpath \
286-
--enable-numa \
287-
--enable-opengl \
288-
--enable-pa \
289-
--enable-pie \
290-
--enable-rbd \
291-
--enable-rdma \
292-
--enable-seccomp \
293-
--enable-selinux \
294-
--enable-slirp \
295-
--enable-snappy \
296-
--enable-spice-protocol \
297-
--enable-system \
298-
--enable-tcg \
299-
--enable-tools \
300-
--enable-tpm \
301-
--enable-usb-redir \
302-
--enable-vdi \
303-
--enable-vhost-kernel \
304-
--enable-vhost-net \
305-
--enable-vhost-user \
306-
--enable-vhost-user-blk-server \
307-
--enable-vhost-vdpa \
308-
--enable-vnc \
309-
--enable-png \
310-
--enable-vnc-sasl \
311-
--enable-werror \
312-
--enable-xkbcommon \
148+
--disable-bochs \
149+
--disable-bpf \
150+
--disable-brlapi \
151+
--disable-bsd-user \
152+
--disable-bzip2 \
153+
--disable-cfi \
154+
--disable-cfi-debug \
155+
--disable-cloop \
156+
--disable-cocoa \
157+
--disable-coreaudio \
158+
--disable-crypto-afalg \
159+
--disable-curses \
160+
--disable-debug-mutex \
161+
--disable-debug-tcg \
162+
--disable-dmg \
163+
--disable-docs \
164+
--disable-dsound \
165+
--disable-fdt \
166+
--disable-fuse \
167+
--disable-fuse-lseek \
168+
--disable-gcrypt \
169+
--disable-gettext \
170+
--disable-glusterfs \
171+
--disable-gtk \
172+
--disable-guest-agent-msi \
173+
--disable-hvf \
174+
--disable-jack \
175+
--disable-l2tpv3 \
176+
--disable-libdaxctl \
177+
--disable-libdw \
178+
--disable-libiscsi \
179+
--disable-libnfs \
180+
--disable-libpmem \
181+
--disable-libssh \
182+
--disable-libvduse \
183+
--disable-linux-user \
184+
--disable-lto \
185+
--disable-lzfse \
186+
--disable-membarrier \
187+
--disable-module-upgrades \
188+
--disable-multiprocess \
189+
--disable-netmap \
190+
--disable-nettle \
191+
--disable-nvmm \
192+
--disable-oss \
193+
--disable-parallels \
194+
--disable-plugins \
195+
--disable-qcow1 \
196+
--disable-qed \
197+
--disable-qga-vss \
198+
--disable-qom-cast-debug \
199+
--disable-replication \
200+
--disable-rng-none \
201+
--disable-safe-stack \
202+
--disable-sdl \
203+
--disable-sdl-image \
204+
--disable-slirp-smbd \
205+
--disable-smartcard \
206+
--disable-sndio \
207+
--disable-sparse \
208+
--disable-spice \
209+
--disable-strip \
210+
--disable-u2f \
211+
--disable-user \
212+
--disable-vde \
213+
--disable-vduse-blk-export \
214+
--disable-vhost-crypto \
215+
--disable-virglrenderer \
216+
--disable-virtfs \
217+
--disable-vnc-jpeg \
218+
--disable-vte \
219+
--disable-vvfat \
220+
--disable-whpx \
221+
--disable-xen \
222+
--disable-xen-pci-passthrough \
223+
--enable-attr \
224+
--enable-blkio \
225+
--enable-cap-ng \
226+
--enable-capstone \
227+
--enable-coroutine-pool \
228+
--enable-curl \
229+
--enable-dbus-display \
230+
--enable-debug-info \
231+
--enable-fdt=system \
232+
--enable-gio \
233+
--enable-gnutls \
234+
--enable-guest-agent \
235+
--enable-iconv \
236+
--enable-kvm \
237+
--enable-libusb \
238+
--enable-libudev \
239+
--enable-linux-aio \
240+
--enable-linux-io-uring \
241+
--enable-lzo \
242+
--enable-malloc-trim \
243+
--enable-modules \
244+
--enable-mpath \
245+
--enable-numa \
246+
--enable-opengl \
247+
--enable-pa \
248+
--enable-pie \
249+
--enable-rbd \
250+
--enable-rdma \
251+
--enable-seccomp \
252+
--enable-selinux \
253+
--enable-slirp \
254+
--enable-snappy \
255+
--enable-spice-protocol \
256+
--enable-system \
257+
--enable-tcg \
258+
--enable-tools \
259+
--enable-tpm \
260+
--enable-usb-redir \
261+
--enable-vdi \
262+
--enable-vhost-kernel \
263+
--enable-vhost-net \
264+
--enable-vhost-user \
265+
--enable-vhost-user-blk-server \
266+
--enable-vhost-vdpa \
267+
--enable-vnc \
268+
--enable-png \
269+
--enable-vnc-sasl \
270+
--enable-werror \
271+
--enable-xkbcommon \
313272
--enable-zstd
314273
315274
make -j$(nproc)
@@ -320,3 +279,10 @@ shell:
320279
-s /{{ $gitRepoName }}-{{ $version }} \
321280
-d /BINS \
322281
-b build
282+
# qemu-img
283+
mkdir -p /qemu-img/usr/bin
284+
cp -an /BINS/usr/bin/qemu{-nbd,-img} /qemu-img/usr/bin
285+
286+
LIST="/BINS/usr/bin/qemu-img /BINS/usr/bin/qemu-nbd"
287+
288+
./relocate_binaries.sh -i "$LIST" -o /qemu-img

0 commit comments

Comments
 (0)