display message when installing or updating

This commit is contained in:
Shaun Inman 2023-02-05 22:47:56 -05:00
parent e9d57e8da4
commit 58c2ed91c7
6 changed files with 45 additions and 5 deletions

5
.gitignore vendored
View file

@ -3,8 +3,9 @@
build/ build/
cores/src cores/src
cores/output cores/output
private/ private
releases/ releases
src/boot/output
*.o *.o
*.so *.so

View file

@ -30,6 +30,7 @@ sys:
cd ./src/keymon && make cd ./src/keymon && make
cd ./src/minarch && make cd ./src/minarch && make
cd ./src/minui && make cd ./src/minui && make
cd ./src/boot && ./build.sh
all-cores: all-cores:
cd ./cores && make cd ./cores && make
@ -51,8 +52,10 @@ bundle:
cd ./build && find . -type f -name '.keep' -delete cd ./build && find . -type f -name '.keep' -delete
cd ./build && find . -type f -name '*.meta' -delete cd ./build && find . -type f -name '*.meta' -delete
cp ./src/boot/output/dmenu.bin ./build/BASE
# populate system # populate system
cp ~/buildroot/output/images/rootfs.ext2 ./build/SYSTEM/rg35xx/ cp ~/buildroot/output/images/rootfs.ext2 ./build/SYSTEM/rg35xx
cp ./src/dts/kernel.dtb ./build/SYSTEM/rg35xx/dat cp ./src/dts/kernel.dtb ./build/SYSTEM/rg35xx/dat
cp ./src/libmsettings/libmsettings.so ./build/SYSTEM/rg35xx/lib cp ./src/libmsettings/libmsettings.so ./build/SYSTEM/rg35xx/lib
cp ./src/keymon/keymon.elf ./build/SYSTEM/rg35xx/bin cp ./src/keymon/keymon.elf ./build/SYSTEM/rg35xx/bin
@ -99,6 +102,7 @@ clean:
cd ./src/keymon && make clean cd ./src/keymon && make clean
cd ./src/minui && make clean cd ./src/minui && make clean
cd ./src/minarch && make clean cd ./src/minarch && make clean
cd ./src/boot && rm -rf ./output
cd ./cores && make clean cd ./cores && make clean
cd ./src/clock && make clean cd ./src/clock && make clean
cd ./other/DinguxCommander && make clean cd ./other/DinguxCommander && make clean

View file

@ -37,11 +37,20 @@ fi
if [ -f $UPDATE_PATH ]; then if [ -f $UPDATE_PATH ]; then
FLAG_PATH=/misc/.minstalled FLAG_PATH=/misc/.minstalled
if [ ! -f $FLAG_PATH ]; then if [ ! -f $FLAG_PATH ]; then
echo "INSTALL" ACTION=installing
else else
echo "UPDATE" ACTION=updating
fi fi
# extract the zip file appended to the end of this script to tmp
# and display one of the two images it contains
CUT=$((`busybox grep -n '^BINARY' $0 | busybox cut -d ':' -f 1 | busybox tail -1` + 1))
busybox tail -n +$CUT "$0" | busybox uudecode -o /tmp/data
busybox unzip -o /tmp/data -d /tmp
busybox fbset -g 640 480 640 480 16
dd if=/tmp/$ACTION of=/dev/fb0
sync
busybox unzip -o $UPDATE_PATH -d $SDCARD_PATH busybox unzip -o $UPDATE_PATH -d $SDCARD_PATH
rm -f $UPDATE_PATH rm -f $UPDATE_PATH
if [ ! -f $FLAG_PATH ]; then if [ ! -f $FLAG_PATH ]; then
@ -102,3 +111,6 @@ busybox chroot $ROOTFS_MOUNTPOINT $SYSTEM_PATH/paks/MinUI.pak/launch.sh &> $SYST
umount $ROOTFS_MOUNTPOINT umount $ROOTFS_MOUNTPOINT
busybox losetup --detach $LOOPDEVICE busybox losetup --detach $LOOPDEVICE
sync && reboot -p sync && reboot -p
exit 0

23
src/boot/build.sh Executable file
View file

@ -0,0 +1,23 @@
#!/bin/sh
TARGET=dmenu.bin
mkdir -p output
if [ ! -f output/installing ]; then
dd skip=64 iflag=skip_bytes if=installing.bmp of=output/installing
fi
if [ ! -f output/updating ]; then
dd skip=64 iflag=skip_bytes if=updating.bmp of=output/updating
fi
cd output
if [ ! -f data ]; then
# tar -czvf data installing updating
zip -r data.zip installing updating
mv data.zip data
fi
cat ../boot.sh > $TARGET
echo BINARY >> $TARGET
uuencode data data >> $TARGET
echo >> $TARGET

BIN
src/boot/installing.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 600 KiB

BIN
src/boot/updating.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 600 KiB