From edec39c7d859e4c4eb5e4865c31097f46282ce14 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Mon, 24 Apr 2023 11:31:26 +0000 Subject: [PATCH 1/2] Add debug packages when DEBUG_SUPPORT=yes --- packages/virtual/image/package.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/virtual/image/package.mk b/packages/virtual/image/package.mk index b7fe1f0c9..f7adeb386 100644 --- a/packages/virtual/image/package.mk +++ b/packages/virtual/image/package.mk @@ -39,7 +39,7 @@ if [ "${BASE_ONLY}" = "true" ] then EMULATION_DEVICE=false ENABLE_32BIT=false - PKG_DEPENDS_TARGET+=" ${PKG_TOOLS} ${PKG_FONTS} ${PKG_DEBUG}" + PKG_DEPENDS_TARGET+=" ${PKG_TOOLS} ${PKG_FONTS}" else PKG_DEPENDS_TARGET+=" ${PKG_TOOLS} ${PKG_FONTS} ${PKG_SOUND} ${PKG_BLUETOOTH} ${PKG_SYNC} ${PKG_GRAPHICS} ${PKG_UI} ${PKG_UI_TOOLS} ${PKG_MULTIMEDIA} misc-packages" @@ -58,6 +58,8 @@ fi # Add support for containers [ "${CONTAINER_SUPPORT}" = "yes" ] && PKG_DEPENDS_TARGET+=" ${PKG_TOOLS} docker" +[ "${DEBUG_SUPPORT}" = "yes" ] && PKG_DEPENDS_TARGET+=" ${PKG_DEBUG}" + # 32Bit package support [ "${ENABLE_32BIT}" == true ] && PKG_DEPENDS_TARGET+=" lib32" From cd17e0e13ca64178676453208b3ecedc23d326b8 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Mon, 24 Apr 2023 16:19:57 +0000 Subject: [PATCH 2/2] * Fix fresh flash system menu bug. * Fix language selection bug. * Add DEBUG_SUPPORT variable to build debug tools. --- packages/devel/make/package.mk | 4 ++++ packages/jelos/config/system/configs/system.cfg | 4 ++++ packages/jelos/sources/post-update | 16 ++++++++++++++++ packages/jelos/sources/scripts/chksysconfig | 0 .../sysutils/systemd/scripts/userconfig-setup | 11 ++++++++--- packages/ui/emulationstation/package.mk | 15 +++++++-------- packages/virtual/image/package.mk | 4 ++-- 7 files changed, 41 insertions(+), 13 deletions(-) mode change 100644 => 100755 packages/jelos/sources/scripts/chksysconfig diff --git a/packages/devel/make/package.mk b/packages/devel/make/package.mk index 2c1732f62..105aafc52 100644 --- a/packages/devel/make/package.mk +++ b/packages/devel/make/package.mk @@ -15,3 +15,7 @@ PKG_BUILD_FLAGS="+local-cc" post_makeinstall_host() { ln -sf make ${TOOLCHAIN}/bin/gmake } + +post_makeinstall_target() { + rm -rf ${INSTALL}/usr/share/locale +} diff --git a/packages/jelos/config/system/configs/system.cfg b/packages/jelos/config/system/configs/system.cfg index b5b0b9d60..ca9a63ea6 100644 --- a/packages/jelos/config/system/configs/system.cfg +++ b/packages/jelos/config/system/configs/system.cfg @@ -38,6 +38,10 @@ cps3.integerscale=0 daphne.integerscale=0 daphne.ratio=4/3 desktop.enabled=0 +display.brightness=50 +display.contrast=50 +display.saturation=50 +display.hue=50 dreamcast.integerscale=0 dreamcast.ratio=4/3 easyrpg.integerscale=0 diff --git a/packages/jelos/sources/post-update b/packages/jelos/sources/post-update index 7bf6e13cc..5c8d638f2 100644 --- a/packages/jelos/sources/post-update +++ b/packages/jelos/sources/post-update @@ -84,11 +84,27 @@ echo "Update rsync configuration files..." >>${LOG} rsync --ignore-existing /usr/config/rsync-rules.conf /storage/.config/ rsync --ignore-existing /usr/config/rsync.conf /storage/.config/ +### Sync locale data +rsync -a --delete /usr/config/locale/* /storage/.config/locale/ >>/var/log/configure.log 2>&1 +rm -rf /storage/.config/emulationstation/locale >>/var/log/configure.log 2>&1 ||: +ln -sf /usr/share/locale /storage/.config/emulationstation/locale >>/var/log/configure.log 2>&1 ||: + ### Add items below this line that are safe to remove after a period of time. ################################################################################ +### Fix docker storage path (dev build issue only) if [ -e "/usr/bin/docker" ] && \ [ ! -d "/storage/.config/docker" ] then cp -rf /usr/config/docker /storage/.config fi + +### Ensure panel properties exist. +for DPROP in brightness contrast saturation hue +do + DBRI=$(get_setting display.${DPROP}) + if [ -z "${DBRI}" ] + then + set_setting display.${DPROP} 50 + fi +done diff --git a/packages/jelos/sources/scripts/chksysconfig b/packages/jelos/sources/scripts/chksysconfig old mode 100644 new mode 100755 diff --git a/packages/sysutils/systemd/scripts/userconfig-setup b/packages/sysutils/systemd/scripts/userconfig-setup index 2d39c3c1b..e2a22a409 100755 --- a/packages/sysutils/systemd/scripts/userconfig-setup +++ b/packages/sysutils/systemd/scripts/userconfig-setup @@ -83,9 +83,14 @@ then ldconfig -X >>/var/log/configure.log 2>&1 fi -if [ ! -d "/storage/.config/emulationstation/locale" ] && \ - [ -e "/usr/bin/emulationstation" ] +if [ ! -d "/storage/.config/locale" ] then tocon "Initializing language support..." - rsync -a --delete /usr/config/locale/ /storage/.config/emulationstation/locale/ >>/var/log/configure.log 2>&1 + rsync -a --delete /usr/config/locale/* /storage/.config/locale/ >>/var/log/configure.log 2>&1 + if [ ! -L "/storage/.config/emulationstation/locale" ] + [ -e "/usr/bin/emulationstation" ] + then + rm -rf /storage/.config/emulationstation/locale >>/var/log/configure.log 2>&1 ||: + ln -sf /usr/share/locale /storage/.config/emulationstation/locale + fi fi diff --git a/packages/ui/emulationstation/package.mk b/packages/ui/emulationstation/package.mk index 619dc0e49..7d987debd 100644 --- a/packages/ui/emulationstation/package.mk +++ b/packages/ui/emulationstation/package.mk @@ -87,9 +87,6 @@ makeinstall_target() { mkdir -p ${INSTALL}/usr/config/locale cp -rf ${PKG_BUILD}/locale/lang/* ${INSTALL}/usr/config/locale/ - mkdir -p ${INSTALL}/usr/lib - ln -sf /storage/.config/emulationstation/locale ${INSTALL}/usr/lib/locale - mkdir -p ${INSTALL}/usr/config/emulationstation/resources cp -rf ${PKG_BUILD}/resources/* ${INSTALL}/usr/config/emulationstation/resources/ rm -rf ${INSTALL}/usr/config/emulationstation/resources/logo.png @@ -115,14 +112,16 @@ makeinstall_target() { cp -rf ${PKG_DIR}/config/common/*.cfg ${INSTALL}/usr/config/emulationstation if [ -d "${PKG_DIR}/config/device/${DEVICE}" ]; then - cp -rf ${PKG_DIR}/config/device/${DEVICE}/*.cfg ${INSTALL}/usr/config/emulationstation + cp -rf ${PKG_DIR}/config/device/${DEVICE}/*.cfg ${INSTALL}/usr/config/emulationstation fi ln -sf /storage/.cache/system_timezone ${INSTALL}/etc/timezone -} + mkdir -p ${INSTALL}/usr/share + ln -sf /storage/.config/locale ${INSTALL}/usr/share/locale -post_install() { - mkdir -p ${INSTALL}/usr/share - ln -sf /storage/.config/emulationstation/locale ${INSTALL}/usr/share/locale + mkdir -p ${INSTALL}/usr/lib + ln -sf /usr/share/locale ${INSTALL}/usr/lib/locale + + ln -sf /usr/share/locale ${INSTALL}/usr/config/emulationstation/locale } diff --git a/packages/virtual/image/package.mk b/packages/virtual/image/package.mk index f7adeb386..2e714e23a 100644 --- a/packages/virtual/image/package.mk +++ b/packages/virtual/image/package.mk @@ -37,8 +37,8 @@ PKG_DEBUG="debug" if [ "${BASE_ONLY}" = "true" ] then - EMULATION_DEVICE=false - ENABLE_32BIT=false + EMULATION_DEVICE=no + ENABLE_32BIT=no PKG_DEPENDS_TARGET+=" ${PKG_TOOLS} ${PKG_FONTS}" else PKG_DEPENDS_TARGET+=" ${PKG_TOOLS} ${PKG_FONTS} ${PKG_SOUND} ${PKG_BLUETOOTH} ${PKG_SYNC} ${PKG_GRAPHICS} ${PKG_UI} ${PKG_UI_TOOLS} ${PKG_MULTIMEDIA} misc-packages"