Skip to content

Commit

Permalink
Port the rust fix to core24 (infra) (#1242)
Browse files Browse the repository at this point in the history
Port the rust fix to core24
  • Loading branch information
Hook25 authored May 10, 2024
1 parent dca6b50 commit ea4e84c
Showing 1 changed file with 1 addition and 23 deletions.
24 changes: 1 addition & 23 deletions checkbox-core-snap/series24/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,6 @@ slots:
read:
- /

package-repositories:
- type: apt
ppa: checkbox-dev/stable

parts:
version-calculator:
plugin: dump
Expand Down Expand Up @@ -434,27 +430,9 @@ parts:
gnome-randr:
source: https://github.com/maxwellainatchi/gnome-randr-rust.git
plugin: rust
rust-channel: nightly
build-packages:
- libdbus-1-dev
after: [rust-deps]
################################################################################
rust-deps:
plugin: nil
build-packages:
- wget
override-pull: |
# Do not use rustup to work around https://forum.snapcraft.io/t/armhf-builds-on-launchpad-timing-out/31008
REQUIRED_RUST_VERSION=nightly
ROOT=https://static.rust-lang.org/dist/rust-$REQUIRED_RUST_VERSION
if [ $CRAFT_TARGET_ARCH = "amd64" ]; then
BINARIES_SUFFIX=x86_64-unknown-linux-gnu
elif [ $CRAFT_TARGET_ARCH = "armhf" ]; then
BINARIES_SUFFIX=armv7-unknown-linux-gnueabihf
elif [ $CRAFT_TARGET_ARCH = "arm64" ]; then
BINARIES_SUFFIX=aarch64-unknown-linux-gnu
fi
wget -O - $ROOT-$BINARIES_SUFFIX.tar.gz | tar -x -z --strip-components=1
./install.sh --prefix=/usr --destdir=$CRAFT_STAGE
################################################################################
rpi-support-binaries:
plugin: nil
Expand Down

0 comments on commit ea4e84c

Please sign in to comment.