From 5f5b0cc14d50b584139758116918a4e034ac24e6 Mon Sep 17 00:00:00 2001
From: Linus K <linus@cosmos-ink.net>
Date: Fri, 4 Sep 2020 15:31:19 +0200
Subject: [PATCH] Add rust toolchain and retris package (#1)

* Add rust nightly to the toltec Docker image
* Add retris package 0.5.3-1 with oxide info
---
 image/Dockerfile       |  5 +++++
 image/README.md        |  1 +
 package/retris/package | 21 +++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/retris/package

diff --git a/image/Dockerfile b/image/Dockerfile
index 712e01f2b..8c8dbfb13 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -22,6 +22,11 @@ RUN curl https://remarkable.engineering/oecore-x86_64-cortexa9hf-neon-toolchain-
 RUN mkdir -p /usr/local/oecore-x86_64/sysroots/x86_64-oesdk-linux/usr/share/cmake \
     && curl https://raw.githubusercontent.com/openembedded/openembedded-core/uninative-2.9/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake -o /usr/local/oecore-x86_64/sysroots/x86_64-oesdk-linux/usr/share/cmake/OEToolchainConfig.cmake
 
+# Add rust nightly with armv7 target
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
+    | sh -s -- --default-toolchain nightly --target armv7-unknown-linux-gnueabihf --profile minimal -y -q
+ENV PATH="$PATH:/root/.cargo/bin"
+
 # Install opkg-utils
 RUN git clone git://git.yoctoproject.org/opkg-utils /opkg-utils \
     && cd /opkg-utils \
diff --git a/image/README.md b/image/README.md
index e55644c6c..eb0f16de1 100644
--- a/image/README.md
+++ b/image/README.md
@@ -6,6 +6,7 @@ It is based on Debian Buster and contains:
 * [The reMarkable build toolchain](https://remarkable.engineering).
 * Additional files for making the toolchain work with CMake.
 * [opkg-utils](https://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/).
+* Rust nightly with the armv7-unknown-linux-gnueabihf target
 * Git, Python and usual building tools.
 
 Published at <https://hub.docker.com/repository/docker/matteodelabre/toltec>.
diff --git a/package/retris/package b/package/retris/package
new file mode 100644
index 000000000..bce018bfa
--- /dev/null
+++ b/package/retris/package
@@ -0,0 +1,21 @@
+# vim: set ft=sh:
+pkgname=retris
+pkgver=0.5.3-1
+pkgdesc="Implementation of rust tetris_core on the reMarkable using libremarkable"
+section=games
+maintainer="Linus K. <linus@cosmos-ink.net>"
+license=MIT
+
+origin=https://github.com/LinusCDE/retris.git
+revision=206f43c4b0f146622641cab22313cb8b27109cff
+
+build() {
+    cargo build --release
+    $STRIP target/armv7-unknown-linux-gnueabihf/release/retris
+}
+
+package() {
+    install -D -m 755 "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/retris "$pkgdir"/opt/bin/retris
+    install -D -m 644 "$srcdir"/oxide "$pkgdir"/opt/etc/draft/retris
+    install -D -m 644 "$srcdir"/icon.png "$pkgdir"/opt/etc/draft/icons/retris.png
+}