Merge pull request #1223 from JustEnoughLinuxOS/dev

Sync OGU branch with Dev

.github/workflows/build-main.yaml

@@ -97,7 +97,7 @@ jobs:
             * Decompress the image.
             * Write the image to an SDCARD using an imaging tool.  Common imaging tools include [Balena Etcher](https://www.balena.io/etcher/), [Raspberry Pi Imager](https://www.raspberrypi.com/software/), and [Win32 Disk Imager](https://sourceforge.net/projects/win32diskimager/).  If you're skilled with the command line, dd works fine too.
 
-            Download: [[Ayaneo Handhelds, Atari VCS, and other x86_64 devices](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.img.gz)] [[Orange Pi 5](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[Anbernic RG353P/M/V/VS, RG503](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.img.gz)]
+            Download: [[Ayaneo Handhelds, Atari VCS, and other x86_64 devices](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.img.gz)] [[Orange Pi 5, Indiedroid Nova](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[Anbernic RG353P/M/V/VS, RG503](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.img.gz)]
 
             ## Upgrading
             * Download and install the update online via the System Settings menu.
@@ -106,7 +106,7 @@ jobs:
               * Copy the update to your device over the network to your device's update share.
               * Reboot the device, and the update will begin automatically.
 
-            Download: [[Ayaneo Handhelds, Atari VCS, and other x86_64 devices](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.tar)] [[Orange Pi 5](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.tar)] [[Anbernic RG353P/M/V/VS, RG503](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.tar)]
+            Download: [[Ayaneo Handhelds, Atari VCS, and other x86_64 devices](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.tar)] [[Orange Pi 5, Indiedroid Nova](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.tar)] [[Anbernic RG353P/M/V/VS, RG503](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.tar)]
 
             ## Documentation
             * [Home](https://github.com/JustEnoughLinuxOS/distribution/wiki)

.github/workflows/release-dev.yaml

@@ -11,7 +11,6 @@ on:
   workflow_dispatch:
 env:
   BRANCH: dev
-  repo_access: ${{ secrets.REPO_ACCESS }}
 
 jobs:
   launch-dev-release:
@@ -27,8 +26,8 @@ jobs:
             fetch-depth: 0
             ref: "${{env.BRANCH}}"
 
-        - name: only run if a repo key exists
-          if: ${{ env.repo_access == '' }}
+        - name: only run on the primary repository
+          if: ${{ !startsWith(github.repository_owner, 'JustEnoughLinuxOS') }}
           run: exit 0
 
         - name: repository full name

.github/workflows/release-main.yaml

@@ -21,7 +21,6 @@ on:
 
 env:
   BRANCH: main
-  repo_access: ${{ secrets.REPO_ACCESS }}
 
 jobs:
   launch-main-release-if-needed:

packages/emulators/libretro/ppsspp-lr/package.mk

@@ -23,7 +23,7 @@ PKG_VERSION="74f9b55669e53b59ad942ff707f973a55d54c32b"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
 PKG_URL="https://github.com/hrydgard/ppsspp.git"
-PKG_DEPENDS_TARGET="toolchain SDL2 ffmpeg libzip"
+PKG_DEPENDS_TARGET="toolchain SDL2 ffmpeg libzip zstd"
 PKG_LONGDESC="A PSP emulator for Android, Windows, Mac, Linux and Blackberry 10, written in C++."
 GET_HANDLER_SUPPORT="git"
 
@@ -32,7 +32,7 @@ PKG_LIBPATH="lib/${PKG_LIBNAME}"
 
 
 if [ ! "${OPENGL}" = "no" ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd glew"
+  PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd glew glslang"
   PKG_CMAKE_OPTS_TARGET+=" -DUSING_FBDEV=OFF \
                            -DUSING_GLES2=OFF"
 fi

packages/jelos/package.mk

@@ -14,19 +14,23 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 PKG_TOOLCHAIN="make"
 
-PKG_BASEOS="plymouth-lite grep wget util-linux xmlstarlet bluetool gnupg gzip patchelf imagemagick \
-            terminus-font vim bash pyudev dialog six git dbus-python coreutils miniupnpc nss-mdns  \
-            avahi alsa-ucm-conf fbgrab modules system-utils autostart powerstate powertop ectool"
+PKG_BASEOS="plymouth-lite grep wget util-linux xmlstarlet gnupg gzip patchelf imagemagick \
+            terminus-font vim bash pyudev dialog six git dbus-python coreutils \
+            alsa-ucm-conf fbgrab modules system-utils autostart powerstate powertop ectool"
 
 PKG_UI="emulationstation es-themes"
 
+PKG_UI_TOOLS="fileman"
+
 PKG_SOFTWARE=""
 
 PKG_COMPAT="lib32"
 
 PKG_MULTIMEDIA="ffmpeg vlc mpv"
 
-PKG_TOOLS="i2c-tools synctools jslisten evtest tailscale pygobject fileman"
+PKG_NETWORK="network synctools pygobject"
+
+PKG_TOOLS="i2c-tools evtest jslisten"
 
 ### Project specific variables
 case "${PROJECT}" in
@@ -47,7 +51,7 @@ if [ ! -z "${BASE_ONLY}" ]
 then
   PKG_DEPENDS_TARGET+=" ${PKG_BASEOS} ${PKG_TOOLS} ${PKG_UI}"
 else
-  PKG_DEPENDS_TARGET+=" ${PKG_BASEOS} ${PKG_TOOLS} ${PKG_UI} ${PKG_COMPAT} ${PKG_MULTIMEDIA} ${PKG_SOFTWARE}"
+  PKG_DEPENDS_TARGET+=" ${PKG_BASEOS} ${PKG_NETWORK} ${PKG_TOOLS} ${PKG_UI} ${PKG_UI_TOOLS} ${PKG_COMPAT} ${PKG_MULTIMEDIA} ${PKG_SOFTWARE}"
 fi
 
 make_target() {

packages/kernel/linux-firmware/RTL8821CS-firmware/package.mk

@@ -3,21 +3,23 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="RTL8821CS-firmware"
+PKG_VERSION="$(date +%Y%m%d)"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="www.jelos.org"
-PKG_SECTION="virtual"
 PKG_LONGDESC="Realtek RTL8821CS Linux firmware"
 PKG_DEPENDS_TARGET="linux"
 PKG_TOOLCHAIN="manual"
 
 make_target() {
-  true
+  : 
 }
 
 makeinstall_target() {
-  cp -v ${PKG_BUILD}/firmware/rtk_hciattach ${INSTALL}/usr/bin
-  cp -v ${PKG_BUILD}/firmware/rtl8821c_fw ${INSTALL}/$(get_full_firmware_dir)
-  cp -v ${PKG_BUILD}/firmware/rtl8821cs_config ${INSTALL}/$(get_full_firmware_dir)/rtl8821c_config
+  mkdir -p ${INSTALL}/usr/bin
+  cp -v ${PKG_DIR}/firmware/rtk_hciattach ${INSTALL}/usr/bin
+  mkdir -p ${INSTALL}/$(get_full_firmware_dir) ||:
+  cp -v ${PKG_DIR}/firmware/rtl8821c_fw ${INSTALL}/$(get_full_firmware_dir)
+  cp -v ${PKG_DIR}/firmware/rtl8821cs_config ${INSTALL}/$(get_full_firmware_dir)/rtl8821c_config
 }
 
 post_install() {

packages/kernel/linux/package.mk

@@ -4,7 +4,7 @@
 
 PKG_NAME="linux"
 PKG_LICENSE="GPL"
-PKG_VERSION="6.1.20"
+PKG_VERSION="6.1.21"
 PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_SITE="http://www.kernel.org"
 PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"

packages/lang/lua54/package.mk

@@ -16,7 +16,7 @@ make_target() {
 
 makeinstall_target() {
   mkdir -p ${SYSROOT_PREFIX}/usr/include/lua$(get_pkg_version_maj_min)
-  cp src/lua.h src/luaconf.h src/lualib.h src/lauxlib.h ${SYSROOT_PREFIX}/usr/include/lua$(get_pkg_version_maj_min)
+  cp src/lua.hpp src/lua.h src/luaconf.h src/lualib.h src/lauxlib.h ${SYSROOT_PREFIX}/usr/include/lua$(get_pkg_version_maj_min)
 
   mkdir -p ${SYSROOT_PREFIX}/usr/lib
   cp src/liblua.a ${SYSROOT_PREFIX}/usr/lib/liblua$(get_pkg_version_maj_min).a

packages/tools/rkbin/package.mk

@@ -2,10 +2,10 @@
 # Copyright (C) 2023-present BrooksyTech
 
 PKG_NAME="rkbin"
-PKG_VERSION="d6aad64d4874b416f25669748a9ae5592642a453"
+PKG_VERSION="9840e87723eef7c41235b89af8c049c1bcd3d133"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="nonfree"
-PKG_SITE="https://github.com/radxa/rkbin"
+PKG_SITE="https://github.com/JustEnoughLinuxOS/rkbin"
 PKG_URL="${PKG_SITE}.git"
 PKG_LONGDESC="rkbin: Rockchip Firmware and Tool Binaries"
 PKG_TOOLCHAIN="manual"

packages/virtual/image/package.mk

@@ -4,7 +4,7 @@
 PKG_NAME="image"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
-PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware ${BOOTLOADER} busybox util-linux corefonts network misc-packages debug usb-modeswitch unzip poppler textviewer jq socat p7zip file bluez splash initramfs jelos"
+PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware ${BOOTLOADER} busybox util-linux corefonts misc-packages debug usb-modeswitch unzip poppler textviewer jq socat p7zip file bluez splash initramfs jelos"
 PKG_SECTION="virtual"
 PKG_LONGDESC="Root package used to build and create complete image"
 

packages/virtual/network/package.mk

@@ -7,7 +7,7 @@ PKG_VERSION=""
 PKG_LICENSE="various"
 PKG_SITE="https://libreelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain connman netbase ethtool openssh iw rsync"
+PKG_DEPENDS_TARGET="toolchain connman netbase ethtool openssh iw rsync tailscale avahi miniupnpc nss-mdns bluetool"
 PKG_SECTION="virtual"
 PKG_LONGDESC="Metapackage for various packages to install network support"
 

packages/wayland/lib/seatd/package.mk

@@ -3,7 +3,6 @@
 
 PKG_NAME="seatd"
 PKG_VERSION="0.7.0"
-PKG_SHA256="210ddf8efa1149cde4dd35908bef8e9e63c2edaa0cdb5435f2e6db277fafff3c"
 PKG_LICENSE="MIT"
 PKG_SITE="https://git.sr.ht/~kennylevinsen/seatd"
 PKG_URL="https://git.sr.ht/~kennylevinsen/seatd/archive/${PKG_VERSION}.tar.gz"

projects/Rockchip/bootloader/mkimage

@@ -49,7 +49,7 @@ then
   echo "image: Set FDTDIR to /..."
   FDTMODE="FDTDIR /"
 else
-  echo "image: Set FTD to ${DEVICE_DTB}..."
+  echo "image: Set FDT to ${DEVICE_DTB}..."
   FDTMODE="FDT /${DEVICE_DTB}.dtb"
 fi
 

projects/Rockchip/packages/linux/package.mk

@@ -26,7 +26,7 @@ case ${DEVICE} in
   ;;
   RK3566)
     PKG_URL="${PKG_SITE}/rk356x-kernel.git"
-    PKG_VERSION="9e2bb8a85"
+    PKG_VERSION="2a846969b"
     GET_HANDLER_SUPPORT="git"
     PKG_GIT_CLONE_BRANCH="main"
   ;;