On Mon, 27 Sept 2021 at 23:02, Eric Blake <ebl...@redhat.com> wrote: > > The following changes since commit 9b03a1178204598055f23f24e438fdddb5935df9: > > Merge remote-tracking branch > 'remotes/vivier2/tags/trivial-branch-for-6.2-pull-request' into staging > (2021-09-27 11:08:36 +0100) > > are available in the Git repository at: > > https://repo.or.cz/qemu/ericb.git tags/pull-nbd-2021-09-27 > > for you to fetch changes up to 3cb015ad05c7c1e07e0deb356cd20e6cd765c0ea: > > nbd/server: Add --selinux-label option (2021-09-27 16:16:28 -0500) > > ---------------------------------------------------------------- > nbd patches for 2021-09-27 > > - Richard W.M. Jones: Add --selinux-label option to qemu-nbd > - Vladimir Sementsov-Ogievskiy: Rework coroutines of qemu NBD client > to improve reconnect support > - Eric Blake: Relax server in regards to NBD_OPT_LIST_META_CONTEXT > - Vladimir Sementsov-Ogievskiy: Plumb up 64-bit bulk-zeroing support > in block layer, in preparation for future NBD spec extensions > - Nir Soffer: Default to writeback cache in qemu-nbd > > ----------------------------------------------------------------
This seems to break the gitlab cross-i386-system build, which now fails to link qemu-nbd because it is trying to link the x86-64 libselinux.so into a 32-bit binary: https://gitlab.com/qemu-project/qemu/-/jobs/1630661323 cc -o qemu-nbd qemu-nbd.p/qemu-nbd.c.o -Wl,--as-needed -Wl,--no-undefined -pie -Wl,--whole-archive libblockdev.fa libblock.fa libcrypto.fa libauthz.fa libqom.fa libio.fa -Wl,--no-whole-archive -Wl,--warn-common -Wl,-z,relro -Wl,-z,now -m32 -m32 -fstack-protector-strong -Wl,--start-group libqemuutil.a libblockdev.fa libblock.fa libcrypto.fa libauthz.fa libqom.fa libio.fa @block.syms /usr/lib/libgnutls.so /usr/lib64/libselinux.so -lutil -L/usr/lib -lgio-2.0 -lgobject-2.0 -lglib-2.0 -L/usr/lib -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm -pthread -L/usr/lib -lgmodule-2.0 -lglib-2.0 /usr/lib/libpixman-1.so /usr/lib/libzstd.so /usr/lib/libz.so -Wl,--end-group /usr/bin/ld: /usr/lib64/libselinux.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status -- PMM