Merge pull request #92 from ROCKNIX/dev

Release 2024-04-11

Author: r3claimer

Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:jammy
 ARG DEBIAN_FRONTEND=noninteractive
 SHELL ["/usr/bin/bash", "-c"]
 
-RUN apt-get update \
+RUN apt-get update --fix-missing\
  && apt-get dist-upgrade -y \
  && apt-get install -y locales sudo
 
@@ -20,7 +20,7 @@ RUN adduser --disabled-password --gecos '' docker \
 RUN apt-get install -y \
     bc default-jre file gawk gcc git golang-go gperf libjson-perl libncurses5-dev \
     libparse-yapp-perl libxml-parser-perl lzop make patchutils python-is-python3  \
-    python3 parted unzip wget curl xfonts-utils xsltproc zip zstd
+    python3 parted unzip wget curl xfonts-utils xsltproc zip zstd rdfind
 
 ### Cross compiling on ARM
 RUN if [ "$(uname -m)" = "aarch64" ]; then apt-get install -y --no-install-recommends qemu-user-binfmt libc6-dev-amd64-cross; fi

Makefile

@@ -24,7 +24,7 @@ src-pkg:
 docs:
 	./tools/foreach './scripts/clean emulators && ./scripts/build emulators'
 
-world: RK3588 RK3566 RK3326 RK3399
+world: RK3588 RK3566 RK3566-X55 RK3326 RK3399 S922X
 
 AMD64:
 	unset DEVICE_ROOT
@@ -46,10 +46,19 @@ S922X:
 	PROJECT=Amlogic DEVICE=S922X ARCH=arm ./scripts/build_distro
 	PROJECT=Amlogic DEVICE=S922X ARCH=aarch64 ./scripts/build_distro
 
+S922X-PANFROST:
+	unset DEVICE_ROOT
+	PROJECT=Amlogic DEVICE=S922X ARCH=arm USE_MALI=no ./scripts/build_distro
+	PROJECT=Amlogic DEVICE=S922X ARCH=aarch64 USE_MALI=no ./scripts/build_distro
+
 RK3566:
 	unset DEVICE_ROOT
-	PROJECT=Rockchip DEVICE=RK3566 ARCH=arm ./scripts/build_distro
-	PROJECT=Rockchip DEVICE=RK3566 ARCH=aarch64 ./scripts/build_distro
+	DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566 ARCH=arm ./scripts/build_distro
+	DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566 ARCH=aarch64 ./scripts/build_distro
+
+RK3566-X55:
+	DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566-X55 ARCH=arm ./scripts/build_distro
+	DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566-X55 ARCH=aarch64 ./scripts/build_distro
 
 RK3326:
 	unset DEVICE_ROOT

config/emulators/3ds.conf

@@ -0,0 +1,11 @@
+SYSTEM_NAME="3ds"
+SYSTEM_FULLNAME="Nintendo 3DS"
+SYSTEM_MANUFACTURER="Nintendo"
+SYSTEM_RELEASE="2010"
+SYSTEM_HARDWARE="portable"
+SYSTEM_PATH="/storage/roms/3ds"
+SYSTEM_EXTENSION=".3ds .3dsx .elf .axf .cci .cxi .app"
+SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
+SYSTEM_PLATFORM="3ds"
+SYSTEM_THEME="3ds"
+SYSTEM_WIKI_PATH="3ds"

config/emulators/segamodel3.conf

@@ -0,0 +1,10 @@
+SYSTEM_NAME="segamodel3"
+SYSTEM_FULLNAME="Sega Model 3"
+SYSTEM_MANUFACTURER="Sega"
+SYSTEM_RELEASE="1996"
+SYSTEM_HARDWARE="arcade"
+SYSTEM_PATH="/storage/roms/segamodel3"
+SYSTEM_EXTENSION=".zip"
+SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
+SYSTEM_PLATFORM="arcade"
+SYSTEM_THEME="model3"

config/show_config

@@ -91,10 +91,6 @@ show_config() {
     config_message+="\n - SquashFS Compression Options: \t ${SQUASHFS_COMPRESSION_OPTION}"
   fi
 
-  for config_modules in $INITRAMFS_MODULES; do
-    config_message="${config_message}\n - Initramfs modules:\t\t\t $config_modules"
-  done
-
   # Network service configuration
 
   config_message="${config_message}\n\n Network service configuration:"

distributions/ROCKNIX/options

@@ -32,7 +32,7 @@
   BUG_REPORT_URL="https://rocknix.org"
 
 # Root password to integrate in the target system
-  ROOT_PASSWORD="system generated"
+  ROOT_PASSWORD="rocknix"
 
 # Remove kernel and system files from the release directory.
   COREELEC_TARGET_REMOVE="kernel_system"
@@ -50,18 +50,33 @@
   CLEAN_EMU_32BIT="lib32 box86 pcsx_rearmed-lr arm"
   # Sway depends on it, weston will use it if it's built but we don't want that.
   CLEAN_WESTON="libdisplay-info sway"
+# Packages to clean for S922X platform - all vary based on VULKAN_SUPPORT
+  CLEAN_S922X="beetle-psx-lr dolphin-sa duckstation-sa fileman emulationstation flycast-lr flycast-sa"
+  CLEAN_S922X+=" gmu gzdoom-sa libplacebo lime3ds-sa linux mali-bifrost mesa moonlight parallel-n64-lr"
+  CLEAN_S922X+=" pipewire portmaster ppsspp-sa qt5 retroarch SDL2"
 
 # additional drivers to install:
 # for a list of additional drivers see packages/linux-drivers
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
 #  ADDITIONAL_DRIVERS=""
 
+# build and install driver addons (yes / no)
+  DRIVER_ADDONS_SUPPORT="no"
+
+# driver addons to install:
+# for a list of additinoal drivers see packages/linux-driver-addons
+# Space separated list is supported,
+  DRIVER_ADDONS=""
+
+# Disable 32BIT support
+  ENABLE_32BIT="true"
+
 # build and install bluetooth support (yes / no)
   BLUETOOTH_SUPPORT="yes"
 
 # build and install Avahi (Zeroconf) daemon (yes / no)
-  AVAHI_DAEMON="yes"
+  AVAHI_DAEMON="no"
 
 # build with NFS support (mounting nfs shares via the OS) (yes / no)
   NFS_SUPPORT="no"
@@ -70,17 +85,20 @@
   SAMBA_SUPPORT="no"
 
 # build and install Samba Server (yes / no)
-  SAMBA_SERVER="no"
+  SAMBA_SERVER="yes"
 
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
 # build and install Simple HTTP Server (yes / no)
-  SIMPLE_HTTP_SERVER="no"
+  SIMPLE_HTTP_SERVER="yes"
 
 # build and install OpenVPN support (yes / no)
   OPENVPN_SUPPORT="no"
 
+# build and install ZeroTier support (yes / no)
+  ZEROTIER_SUPPORT="yes"
+
 # build and install WireGuard support (yes / no)
   WIREGUARD_SUPPORT="yes"
 
@@ -93,10 +111,10 @@
   EXFAT="yes"
 
 # build and install NTFS-3G fuse support (yes / no)
-  NTFS3G="yes"
+  NTFS3G="no"
 
 # build and install hfs filesystem utilities (yes / no)
-  HFSTOOLS="yes"
+  HFSTOOLS="no"
 
 # Target an emulation device
   EMULATION_DEVICE="${EMULATION_DEVICE:-yes}"
@@ -107,7 +125,7 @@
 # Support for debug tools such as strace
   DEBUG_PACKAGES="${DEBUG_PACKAGES:-yes}"
 
-# Windowmanager to use (fluxbox / none)
+# Windowmanager to use (weston / swaywm-env / no)
   WINDOWMANAGER="none"
 
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
@@ -141,6 +159,9 @@
 # Space separated list is supported,
 # e.g. ADDITIONAL_PACKAGES="PACKAGE1 PACKAGE2"
 
+# build and install CEC framework support (yes / no)
+  CEC_FRAMEWORK_SUPPORT="no"
+
 # build with installer (yes / no)
   INSTALLER_SUPPORT="no"
 
@@ -154,11 +175,14 @@
   NANO_EDITOR="yes"
 
 # cron support (yes / no)
-  CRON_SUPPORT="yes"
+  CRON_SUPPORT="no"
+
+# htop tool (yes / no)
+  HTOP_TOOL="yes"
 
 # Distribution Specific source location
   DISTRO_MIRROR=""
-  DISTRO_SRC="https://github.com/JustEnoughLinuxOS"
+  DISTRO_SRC="https://github.com/ROCKNIX"
 
 # Default size of system partition, in MB, eg. 512
   SYSTEM_SIZE=2048
@@ -173,7 +197,7 @@
   GET_HANDLER_SUPPORT="archive git file"
 
 # Partition labels for USB/SD installation media
-  DISTRO_BOOTLABEL="JELOS"
+  DISTRO_BOOTLABEL="ROCKNIX"
   DISTRO_DISKLABEL="STORAGE"
 
 # Settings package name - blank if not required