Skip to content

Commit

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

This reverts commit 9b41f18.

I am reverting QEMU 8.x bump because the new virtiofsd is coded in rust
and thus is not compatible with all our architectures.

Signed-off-by: Thomas Parrott <[email protected]>
  • Loading branch information
tomponline committed Oct 6, 2023
1 parent 9b41f18 commit 8dff96f
Showing 1 changed file with 2 additions and 23 deletions.
25 changes: 2 additions & 23 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 v8.0.5
git clone https://gitlab.com/qemu/qemu . -b v7.1.0
override-build: |-
[ "$(uname -m)" != "x86_64" ] && [ "$(uname -m)" != "aarch64" ] && [ "$(uname -m)" != "ppc64le" ] && [ "$(uname -m)" != "s390x" ] && exit 0
Expand All @@ -829,6 +829,7 @@ 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 @@ -954,28 +955,6 @@ 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 8dff96f

Please sign in to comment.