Merge pull request #590 from fewtarius/dev

Bug fixes and improvements (sleep, samba, flypast)

.github/workflows/build-main.yaml

@@ -27,7 +27,7 @@ jobs:
     steps:
       - uses: hmarr/debug-action@v2
         name: debug
-      - name: get current branch as it may not be 'default branch;
+      - name: get current branch as it may not be default branch;
         id: branch
         run: |
             branch_arg="${{ github.event.client_payload.branch }}"
@@ -43,9 +43,6 @@ jobs:
       - name: Get date for artifacts
         id: date
         run: echo "::set-output name=date::$(date +'%Y%m%d')"
-      - name: Get short SHA for artifacts
-        id: sha
-        run: echo "::set-output name=sha::$(git rev-parse --short HEAD)"
       - name: Get version
         id: version
         run: |
@@ -54,7 +51,7 @@ jobs:
            if [[ "${{ github.event.client_payload.release_tag }}" != "" ]]; then
                echo "::set-output name=version::${{ github.event.client_payload.release_tag }}"
            else
-               echo "::set-output name=version::${{ steps.date.outputs.date }}-${{ steps.sha.outputs.sha }}"
+               echo "::set-output name=version::${{ steps.date.outputs.date }}"
            fi
       - name: Build World
         run: |

.github/workflows/release-main.yaml

@@ -6,17 +6,6 @@
 
 name: release-main
 on:
-  push:
-    paths-ignore:
-      - '.github/**'
-      - '*.md'
-      - 'Dockerfile'
-      - '.dockerignore'
-      - '.gitignore'
-      - 'licenses/**'
-      - 'tools/**'
-    branches:
-      - main
   workflow_dispatch:
 
 env:
@@ -42,16 +31,6 @@ jobs:
           run: |
                echo "::set-output name=full_name::$(git config --get remote.origin.url | sed 's|^.*github.com/||g' | sed 's/.git$//g')"
         
-        - name: changes
-          id: changes
-          run: |
-               prevrelcommit="$(git rev-list --tags --max-count=1)"
-               release_notes="$(git log ${prevrelcommit}..HEAD --pretty=format:"* %h: %s")"
-               release_notes="${release_notes//'%'/'%25'}"
-               release_notes="${release_notes//$'\n'/'%0A'}"
-               release_notes="${release_notes//$'\r'/'%0D'}"
-               echo "::set-output name=changes::$(echo ${release_notes} | wc -l)"
-               echo "::set-output name=release_notes::${release_notes}"
         - name: Get date for artifacts
           id: date
           run: echo "::set-output name=date::$(date +'%Y%m%d')"
@@ -67,6 +46,5 @@ jobs:
                {
                  "branch" : "${{ env.BRANCH }}",
                  "release_tag" : "${{steps.date.outputs.date}}",
-                 "release_notes" : ${{toJSON(steps.changes.outputs.release_notes)}}
                }
             

packages/games/emulators/flycastsa/package.mk

@@ -15,17 +15,24 @@ PKG_PATCH_DIRS+="${DEVICE}"
 
 if [ ! "${OPENGL}" = "no" ]; then
   PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
+  PKG_CMAKE_OPTS_TARGET+="  USE_OPENGL=ON"
+else
+  PKG_CMAKE_OPTS_TARGET+="  USE_OPENGL=OFF"
 fi
 
 if [ "${OPENGLES_SUPPORT}" = yes ]; then
   PKG_DEPENDS_TARGET+=" ${OPENGLES}"
   PKG_CMAKE_OPTS_TARGET+=" -DUSE_GLES=ON"
+else
+  PKG_CMAKE_OPTS_TARGET+=" -DUSE_GLES=OFF"
 fi
 
 if [ "${VULKAN_SUPPORT}" = "yes" ]
 then
   PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
   PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN=ON"
+else
+  PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN=OFF"
 fi
 
 pre_configure_target() {

packages/games/libretro/flycast/package.mk

@@ -12,18 +12,24 @@ PKG_TOOLCHAIN="cmake"
 
 if [ ! "${OPENGL}" = "no" ]; then
   PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
+  PKG_CMAKE_OPTS_TARGET+="  USE_OPENGL=ON"
+else
+  PKG_CMAKE_OPTS_TARGET+="  USE_OPENGL=OFF"
 fi
 
 if [ "${OPENGLES_SUPPORT}" = yes ]; then
   PKG_DEPENDS_TARGET+=" ${OPENGLES}"
-  PKG_CMAKE_OPTS_TARGET+="-DUSE_VULKAN=OFF \
-			  -DUSE_GLES=ON"
+  PKG_CMAKE_OPTS_TARGET+=" -DUSE_GLES=ON"
+else
+  PKG_CMAKE_OPTS_TARGET+=" -DUSE_GLES=OFF"
 fi
 
 if [ "${VULKAN_SUPPORT}" = "yes" ]
 then
   PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
   PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN=ON"
+else
+  PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN=OFF"
 fi
 
 pre_configure_target() {

packages/jelos/sources/autostart/common/002-kernel

@@ -7,12 +7,3 @@ sysctl kernel.nmi_watchdog=0
 sysctl vm.laptop_mode=5
 sysctl vm.dirty_writeback_centisecs=1500
 
-for device in $(find /sys -name power_save | grep -v wifi) /sys/bus/usb/devices/*/power/autosuspend
-do
-  echo 1 >${device} 2>/dev/null
-done
-
-for device in /sys/bus/*/devices/*/power/control
-do
-  echo auto > ${device} 2>/dev/null
-done

packages/jelos/sources/autostart/common/003-hostname

@@ -1,8 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: Apache-2.0
-# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
-
-. /etc/profile
-
-HOSTNAME=$(get_setting system.hostname)
-hostname ${HOSTNAME}

packages/jelos/sources/autostart/common/008-network

@@ -4,6 +4,8 @@
 
 . /etc/profile
 
+HOSTNAME=$(get_setting system.hostname)
+hostname ${HOSTNAME}
 
 if [ "$(get_setting internal.wifi)" == 0 ] && [ "${DEVICE_INTERNAL_WIFI}" = true ]
 then

packages/network/samba/package.mk

@@ -174,12 +174,13 @@ post_makeinstall_target() {
   rm -rf ${INSTALL}/usr/lib64
 
   if find_file_path config/smb.conf; then
-    mkdir -p ${INSTALL}/etc/samba
-      cp ${FOUND_PATH} ${INSTALL}/etc/samba
     mkdir -p ${INSTALL}/usr/config
-      cp ${INSTALL}/etc/samba/smb.conf ${INSTALL}/usr/config/samba.conf.sample
+      cp ${FOUND_PATH} ${INSTALL}/usr/config
   fi
 
+  mkdir -p ${INSTALL}/etc/samba
+  ln -s /usr/config/smb.conf ${INSTALL}/etc/samba/smb.conf
+
   mkdir -p ${INSTALL}/usr/bin
     cp -PR bin/default/source3/client/smbclient ${INSTALL}/usr/bin
     cp -PR bin/default/source3/utils/smbtree ${INSTALL}/usr/bin