github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 16:27:50 +00:00
Code Issues Projects Releases Wiki Activity

snap: Update for QEMU 5.2.0

Browse Source 
QEMU 5.2.0 needs ninja-build package installed on the build environment.

The default-configs were copied to $QEMU_SRC/default-configs but that does
take any effect, so instead it is now copied to $QEMU_SRC/default-configs/devices
and the configs for i386 were updated.

Also it had to change some arguments being passed to configure as Meson was failing
due inconsistent paths:

  ./meson.build:1:0: ERROR: The value of the 'libdir' option is '/usr/lib/qemu' which must be a subdir of the prefix '/snap/kata-containers/current/usr'.
  Note that if you pass a relative path, it is assumed to be a subdir of prefix.

Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
This commit is contained in:
Wainer dos Santos Moschetta 2021-02-25 13:30:51 -05:00
parent 88cef33b76
commit 85601cd360
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
snap/snapcraft.yaml
View File

@ -228,6 +228,7 @@ parts:
- libffi-dev - libffi-dev
- libmount-dev - libmount-dev
- libselinux1-dev - libselinux1-dev
- ninja-build
override-build: | override-build: |
yq=${SNAPCRAFT_STAGE}/yq yq=${SNAPCRAFT_STAGE}/yq
export GOPATH=${SNAPCRAFT_STAGE}/gopath export GOPATH=${SNAPCRAFT_STAGE}/gopath
@ -275,16 +276,14 @@ parts:
configure_hypervisor=${kata_dir}/tools/packaging/scripts/configure-hypervisor.sh configure_hypervisor=${kata_dir}/tools/packaging/scripts/configure-hypervisor.sh
chmod +x ${configure_hypervisor} chmod +x ${configure_hypervisor}
# static build # static build. The --prefix, --libdir, --libexecdir, --datadir arguments are
echo "$(${configure_hypervisor} -s qemu) \ # based on PREFIX and set by configure-hypervisor.sh
--disable-rbd echo "$(PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr ${configure_hypervisor} -s qemu) \
--prefix=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr \ --disable-rbd " \
--datadir=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/share \
--libexecdir=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/libexec/qemu" \
| xargs ./configure | xargs ./configure
# Copy QEMU configurations (Kconfigs) # Copy QEMU configurations (Kconfigs)
cp -a ${kata_dir}/tools/packaging/qemu/default-configs/* default-configs/ cp -a ${kata_dir}/tools/packaging/qemu/default-configs/* default-configs/devices/
# build and install # build and install
make -j $(($(nproc)-1)) make -j $(($(nproc)-1))

2
tools/packaging/qemu/default-configs/i386-softmmu.mak
View File

@ -24,6 +24,7 @@ CONFIG_SD=n
# Automotive # Automotive
CONFIG_CAN_BUS=n CONFIG_CAN_BUS=n
CONFIG_CAN_CTUCANFD=n
CONFIG_CAN_PCI=n CONFIG_CAN_PCI=n
CONFIG_CAN_SJA1000=n CONFIG_CAN_SJA1000=n
@ -56,6 +57,7 @@ CONFIG_USB_TABLET_WACOM=n
CONFIG_USB_UHCI=n CONFIG_USB_UHCI=n
CONFIG_USB_XHCI=n CONFIG_USB_XHCI=n
CONFIG_USB_XHCI_NEC=n CONFIG_USB_XHCI_NEC=n
CONFIG_USB_XHCI_PCI=n
# ISA # ISA
CONFIG_IDE_ISA=n CONFIG_IDE_ISA=n