Merge pull request #22 from webOS-ports/tofe/work

Tofe/work
webOS-ports · Dec 16, 2021 · c1f9acd · c1f9acd
2 parents 26f88bc + eb00069
commit c1f9acd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/recipes-core/images/initramfs-uboot-image.bb b/recipes-core/images/initramfs-uboot-image.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Provides a minimal environment to bootstrap and run LuneOS from U
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-IMAGE_INSTALL = "busybox base-passwd bash"
+IMAGE_INSTALL = "busybox base-passwd bash util-linux-blkid"
 IMAGE_INSTALL += "initramfs-scripts-simple luneos-recovery-ui"
 IMAGE_FEATURES = ""
 IMAGE_ROOTFS_SIZE = "8192"

diff --git a/recipes-core/initrdscripts/initramfs-scripts-simple/init.sh b/recipes-core/initrdscripts/initramfs-scripts-simple/init.sh
@@ -27,8 +27,9 @@ EOF
     # start telnetd for this IP
     start_telnetd 172.16.42.2
 
-    # start... a shell ? a nice UI ?
-    /usr/bin/luneos_recovery_ui || sh
+    # start minimalist recovery UI, and have a shell as fallback
+    /usr/bin/luneos_recovery_ui &
+    /sbin/getty -L ttyS0 115200 linux
 
 else
     # mount partition labeled "luneos-rootfs"

diff --git a/recipes-graphics/lvgl/files/lv_conf.h b/recipes-graphics/lvgl/files/lv_conf.h
@@ -481,7 +481,7 @@ typedef void * lv_obj_user_data_t;
 #  define LV_LABEL_TEXT_SEL               0
 
 /*Store extra some info in labels (12 bytes) to speed up drawing of very long texts*/
-#  define LV_LABEL_LONG_TXT_HINT          0
+#  define LV_LABEL_LONG_TXT_HINT          1
 #endif
 
 /*LED (dependencies: -)*/

diff --git a/recipes-kernel/linux/linux-pinephone/extra.cfg b/recipes-kernel/linux/linux-pinephone/extra.cfg
@@ -10,3 +10,6 @@ CONFIG_INPUT_UINPUT=y
 
 # This should be useful for rotation sensor
 CONFIG_GPIO_SYSFS=y
+
+# Needed in recovery to have usb powered
+CONFIG_TYPEC_ANX7688=y
diff --git a/recipes-luneui/recovery/luneos-recovery-ui.bb b/recipes-luneui/recovery/luneos-recovery-ui.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
 DEPENDS = "lvgl"
 
 SRC_URI = "git://github.com/Tofee/luneos-recovery-ui.git;branch=master;protocol=https"
-SRCREV = "e0a40ea1a12a03e97322634ee80ae390a2c23931"
+SRCREV = "7cf85653ab8ac65cb0d8b0df0b120a452097af0a"
 
 S = "${WORKDIR}/git/recovery"