aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerge Schneider <[email protected]>2018-10-09 12:32:37 +0100
committerSerge Schneider <[email protected]>2018-10-09 12:32:37 +0100
commit7b40fd11bc13d6496bb6bd1bc02f946b7e0ac7cb (patch)
tree954a17de8381dab54f0d3d062d769c6e23c11d4d
parent59cd0a3d9c8f90c560b887b2c3497c047637502d (diff)
Remove Mathematica2018-10-09-raspbian-stretch
-rw-r--r--export-noobs/00-release/files/release_notes.txt4
-rw-r--r--stage4/EXPORT_IMAGE2
-rw-r--r--stage4/EXPORT_NOOBS (renamed from stage5/EXPORT_NOOBS)0
-rw-r--r--stage5/00-install-mathematica/00-packages1
-rw-r--r--stage5/EXPORT_IMAGE4
-rwxr-xr-xstage5/prerun.sh5
6 files changed, 3 insertions, 13 deletions
diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt
index f2a9fd6..dcaf7dd 100644
--- a/export-noobs/00-release/files/release_notes.txt
+++ b/export-noobs/00-release/files/release_notes.txt
@@ -11,10 +11,10 @@ UNRELEASED:
* In Scratch 2 GPIO plugin, set pin from dropdown list rather than free text
* In Scratch 2 SenseHAT plugin, swap x and y axis values for LED array
* Include latest Adobe Flash player (31.0.0.108)
- * Include latest Mathematica (11.3.0.0)
* Include latest RealVNC Server (6.3.1)
* Include libav-tools
- * Incllude ssh-import-id
+ * Include ssh-import-id
+ * Removed Mathematica
* Merge in latest third-party code for Bluetooth ALSA interface
* Add ability to prevent software update changing configuration files, by creating ~/.config/.lock file
* Various other small bug fixes, tweaks and changes to text
diff --git a/stage4/EXPORT_IMAGE b/stage4/EXPORT_IMAGE
index 1f1bd4f..79ec11a 100644
--- a/stage4/EXPORT_IMAGE
+++ b/stage4/EXPORT_IMAGE
@@ -1,4 +1,4 @@
-IMG_SUFFIX="-4GB"
+IMG_SUFFIX=""
if [ "${USE_QEMU}" = "1" ]; then
export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
fi
diff --git a/stage5/EXPORT_NOOBS b/stage4/EXPORT_NOOBS
index 4823501..4823501 100644
--- a/stage5/EXPORT_NOOBS
+++ b/stage4/EXPORT_NOOBS
diff --git a/stage5/00-install-mathematica/00-packages b/stage5/00-install-mathematica/00-packages
deleted file mode 100644
index fa9ba94..0000000
--- a/stage5/00-install-mathematica/00-packages
+++ /dev/null
@@ -1 +0,0 @@
-wolfram-engine
diff --git a/stage5/EXPORT_IMAGE b/stage5/EXPORT_IMAGE
deleted file mode 100644
index 79ec11a..0000000
--- a/stage5/EXPORT_IMAGE
+++ /dev/null
@@ -1,4 +0,0 @@
-IMG_SUFFIX=""
-if [ "${USE_QEMU}" = "1" ]; then
- export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
-fi
diff --git a/stage5/prerun.sh b/stage5/prerun.sh
deleted file mode 100755
index 9acd13c..0000000
--- a/stage5/prerun.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-if [ ! -d "${ROOTFS_DIR}" ]; then
- copy_previous
-fi