Skip to content

Commit

Permalink
Revert "qemu: Bump to v7.2.6" and "Revert "snapcraft: Adds virtiofsd …
Browse files Browse the repository at this point in the history
…section for compatibility with QEMU 8.x""

This reverts commit 231a530 and 8dff96f.

Turns out the architecture restrictions are the same as those of QEMU itself so its fine.

Suggested-by: Stéphane Graber <[email protected]>

Signed-off-by: Thomas Parrott <[email protected]>
  • Loading branch information
tomponline committed Oct 6, 2023
1 parent 70ad2cd commit 6c5fb96
Showing 1 changed file with 23 additions and 2 deletions.
25 changes: 23 additions & 2 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ parts:
override-pull: |-
[ "$(uname -m)" != "x86_64" ] && [ "$(uname -m)" != "aarch64" ] && [ "$(uname -m)" != "ppc64le" ] && [ "$(uname -m)" != "s390x" ] && exit 0
set -ex
git clone https://gitlab.com/qemu/qemu . -b v7.2.6
git clone https://gitlab.com/qemu/qemu . -b v8.0.5
override-build: |-
[ "$(uname -m)" != "x86_64" ] && [ "$(uname -m)" != "aarch64" ] && [ "$(uname -m)" != "ppc64le" ] && [ "$(uname -m)" != "s390x" ] && exit 0
Expand All @@ -829,7 +829,6 @@ parts:
- bin/qemu-system-*
- bin/qemu-img*
- bin/virtfs-proxy-helper*
- bin/virtiofsd*
- lib/*/libatomic.so*
- lib/*/libmagic*so*
- lib/*/libnuma*so*
Expand Down Expand Up @@ -955,6 +954,28 @@ parts:
- bin/vim.tiny
- etc/vimrc

virtiofsd:
build-attributes: [core22-step-dependencies]
source: https://gitlab.com/virtio-fs/virtiofsd
source-type: git
source-tag: v1.8.0
source-depth: 1
plugin: rust
build-packages:
- cargo
- libseccomp-dev
- rustc
organize:
usr/bin: bin/
prime:
- bin/virtiofsd*
override-pull: |-
[ "$(uname -m)" != "x86_64" ] && [ "$(uname -m)" != "aarch64" ] && [ "$(uname -m)" != "ppc64le" ] && [ "$(uname -m)" != "s390x" ] && exit 0
snapcraftctl pull
override-build: |-
[ "$(uname -m)" != "x86_64" ] && [ "$(uname -m)" != "aarch64" ] && [ "$(uname -m)" != "ppc64le" ] && [ "$(uname -m)" != "s390x" ] && exit 0
snapcraftctl build
xfs:
build-attributes: [core22-step-dependencies]
source: snapcraft/empty
Expand Down

0 comments on commit 6c5fb96

Please sign in to comment.