move lomorage in seperate step

lomorage · Apr 3, 2020 · 3450823 · 3450823
1 parent 41a15a6
commit 3450823
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 22 deletions.
diff --git a/config b/config
@@ -1,3 +1,3 @@
 IMG_NAME="lomorage"
-STAGE_LIST="stage0 stage1 stage2 stage-localtunnel stage-share"
+STAGE_LIST="stage0 stage1 stage2 stage-share stage-localtunnel stage-lomo"
 ENABLE_SSH=1
diff --git a/stage-lomo/00-install-packages/00-packages b/stage-lomo/00-install-packages/00-packages
@@ -0,0 +1,6 @@
+lomo-base
+lomo-vips
+lomo-backend
+lomo-omxplayer
+lomo-web
+lomo-frame
diff --git a/stage-lomo/01-lomo/01-run.sh b/stage-lomo/01-lomo/01-run.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -e
+
+install -m 644 files/logo_transparent.png "${ROOTFS_DIR}/usr/share/plymouth/debian-logo.png"
+install -m 644 files/spinfinity.script    "${ROOTFS_DIR}/usr/share/plymouth/themes/spinfinity/"
+install -m 644 files/spinfinity.plymouth  "${ROOTFS_DIR}/usr/share/plymouth/themes/spinfinity/"
+install -m 755 files/update-lomod         "${ROOTFS_DIR}/etc/cron.daily/"
+
+on_chroot << EOF
+plymouth-set-default-theme -R spinfinity
+EOF
diff --git a/stage-lomo/01-lomo/files/logo_transparent.png b/stage-lomo/01-lomo/files/logo_transparent.png
diff --git a/...2/01-sys-tweaks/files/spinfinity.plymouth → stage-lomo/01-lomo/files/spinfinity.plymouth b/...2/01-sys-tweaks/files/spinfinity.plymouth → stage-lomo/01-lomo/files/spinfinity.plymouth
diff --git a/stage2/01-sys-tweaks/files/spinfinity.script → stage-lomo/01-lomo/files/spinfinity.script b/stage2/01-sys-tweaks/files/spinfinity.script → stage-lomo/01-lomo/files/spinfinity.script
diff --git a/stage2/01-sys-tweaks/files/update-lomod → stage-lomo/01-lomo/files/update-lomod b/stage2/01-sys-tweaks/files/update-lomod → stage-lomo/01-lomo/files/update-lomod
diff --git a/stage-lomo/EXPORT_IMAGE b/stage-lomo/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-lomo/prerun.sh b/stage-lomo/prerun.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -e
+
+if [ ! -d "${ROOTFS_DIR}" ]; then
+	copy_previous
+fi
+
+on_chroot << EOF
+apt-get update
+apt-get dist-upgrade -y
+EOF
diff --git a/stage1/00-boot-files/files/cmdline.txt b/stage1/00-boot-files/files/cmdline.txt
@@ -1 +1 @@
-dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait logo.nologo quiet splash loglevel=0 vt.global_cursor_default=0 plymouth.ignore-serial-consoles
+dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait logo.nologo quiet splash loglevel=0 vt.global_cursor_default=0 plymouth.ignore-serial-consoles init=/usr/lib/raspi-config/init_resize.sh
diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages
@@ -31,12 +31,6 @@ zip
 supervisor
 python3 python3-pyudev python3-pygame
 plymouth plymouth-themes
-lomo-base
-lomo-vips
-lomo-backend
-lomo-omxplayer
-lomo-web
-lomo-frame
 iftop
 tcpdump
 python-serial python3-serial

diff --git a/stage2/01-sys-tweaks/00-patches/07-resize-init.diff b/stage2/01-sys-tweaks/00-patches/07-resize-init.diff
diff --git a/stage2/01-sys-tweaks/00-patches/series b/stage2/01-sys-tweaks/00-patches/series
@@ -2,4 +2,3 @@
 02-swap.diff
 04-inputrc.diff
 05-path.diff
-07-resize-init.diff
diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh
@@ -11,17 +11,10 @@ install -m 644 files/console-setup   	"${ROOTFS_DIR}/etc/default/"
 
 install -m 755 files/rc.local		"${ROOTFS_DIR}/etc/"
 
-install -m 755 files/update-lomod         "${ROOTFS_DIR}/etc/cron.daily/"
-
-install -m 644 files/logo_transparent.png "${ROOTFS_DIR}/usr/share/plymouth/debian-logo.png"
-install -m 644 files/spinfinity.script    "${ROOTFS_DIR}/usr/share/plymouth/themes/spinfinity/"
-install -m 644 files/spinfinity.plymouth  "${ROOTFS_DIR}/usr/share/plymouth/themes/spinfinity/"
-
 on_chroot << EOF
 systemctl disable hwclock.sh
 systemctl disable nfs-common
 systemctl disable rpcbind
-plymouth-set-default-theme -R spinfinity
 
 if [ "${ENABLE_SSH}" == "1" ]; then
 	systemctl enable ssh

diff --git a/stage2/01-sys-tweaks/files/logo_transparent.png b/stage2/01-sys-tweaks/files/logo_transparent.png
diff --git a/stage2/01-sys-tweaks/files/rc.local b/stage2/01-sys-tweaks/files/rc.local
@@ -18,7 +18,6 @@ if [ "$_IP" ]; then
 fi
 
 service systemd-udevd restart
-service supervisor restart
 
 #Suppress Kernel Messages
 dmesg --console-off
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait logo.nologo quiet splash loglevel=0 vt.global_cursor_default=0 plymouth.ignore-serial-consoles
		dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait logo.nologo quiet splash loglevel=0 vt.global_cursor_default=0 plymouth.ignore-serial-consoles init=/usr/lib/raspi-config/init_resize.sh