Merge pull request #1330 from JustEnoughLinuxOS/dev

PR for re-release

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
+}

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

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

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

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
 }

packages/virtual/image/package.mk

@@ -37,9 +37,9 @@ PKG_DEBUG="debug"
 
 if [ "${BASE_ONLY}" = "true" ]
 then
-  EMULATION_DEVICE=false
-  ENABLE_32BIT=false
-  PKG_DEPENDS_TARGET+=" ${PKG_TOOLS} ${PKG_FONTS} ${PKG_DEBUG}"
+  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"
 
@@ -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"