add lcd driver, move localtunnel to another stage

lomorage · Sep 19, 2019 · 4b946d4 · 4b946d4
1 parent 81c1fbf
commit 4b946d4
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 5 deletions.
diff --git a/stage-lcd-show/00-driver-install/00-packages b/stage-lcd-show/00-driver-install/00-packages
@@ -0,0 +1,4 @@
+libevdev2
+libmtdev1
+xorg-input-abi-24
+xserver-xorg-core
diff --git a/stage-lcd-show/00-driver-install/00-run.sh b/stage-lcd-show/00-driver-install/00-run.sh
@@ -0,0 +1,6 @@
+#!/bin/bash -e
+
+install -v -m 755 files/install_lcd_driver.sh          "${ROOTFS_DIR}/sbin/install_lcd_driver.sh"
+on_chroot << EOF
+/sbin/install_lcd_driver.sh
+EOF
diff --git a/stage-lcd-show/00-driver-install/files/LCD-show b/stage-lcd-show/00-driver-install/files/LCD-show
diff --git a/stage-lcd-show/00-driver-install/files/install_lcd_driver.sh b/stage-lcd-show/00-driver-install/files/install_lcd_driver.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+cd /boot
+wget http://www.lcdwiki.com/res/RaspDriver/LCD-show.tar.gz;
+tar -xzf LCD-show.tar.gz;
+cd LCD-show;
+./LCD35-show 180
diff --git a/stage-lcd-show/EXPORT_IMAGE b/stage-lcd-show/EXPORT_IMAGE
@@ -0,0 +1,4 @@
+IMG_SUFFIX="-lite"
+if [ "${USE_QEMU}" = "1" ]; then
+	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
+fi
diff --git a/stage-lcd-show/prerun.sh b/stage-lcd-show/prerun.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+if [ ! -d "${ROOTFS_DIR}" ]; then
+	copy_previous
+fi
diff --git a/stage-localtunnel/00-localtunnel-install/00-packages b/stage-localtunnel/00-localtunnel-install/00-packages
@@ -0,0 +1 @@
+git
diff --git a/stage-localtunnel/00-localtunnel-install/01-run.sh b/stage-localtunnel/00-localtunnel-install/01-run.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+install -v -m 755 files/install_node.sh          "${ROOTFS_DIR}/sbin/install_node.sh"
+
+on_chroot << EOF
+/sbin/install_node.sh
+EOF
diff --git a/stage2/01-sys-tweaks/files/install_node.sh → ...localtunnel-install/files/install_node.sh b/stage2/01-sys-tweaks/files/install_node.sh → ...localtunnel-install/files/install_node.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 
 NODE_VERSION=v9.8.0;
 NPM_CACHE=/home/pi/.npm/npm-cache
@@ -17,6 +18,7 @@ mv node-$NODE_VERSION-linux-armv7l /opt/nodejs/;
 ln -f -s /opt/nodejs/bin/node /sbin/node;
 ln -f -s /opt/nodejs/bin/npm /sbin/npm;
 
+rm -rf $NPM_CACHE
 npm config set unsafe-perm true
 npm cache clean -f
 npm config set cache $NPM_CACHE --global

diff --git a/stage-localtunnel/EXPORT_IMAGE b/stage-localtunnel/EXPORT_IMAGE
@@ -0,0 +1,4 @@
+IMG_SUFFIX="-lite"
+if [ "${USE_QEMU}" = "1" ]; then
+	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
+fi
diff --git a/stage-localtunnel/prerun.sh b/stage-localtunnel/prerun.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+if [ ! -d "${ROOTFS_DIR}" ]; then
+	copy_previous
+fi
diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh
@@ -80,8 +80,3 @@ usermod --pass='*' root
 EOF
 
 rm -f "${ROOTFS_DIR}/etc/ssh/"ssh_host_*_key*
-
-install -v -m 755 files/install_node.sh          "${ROOTFS_DIR}/sbin/install_node.sh"
-on_chroot << EOF
-/sbin/install_node.sh
-EOF