Merge pull request #218 from ROCKNIX/dev

Staging PR for release.

Author: r3claimer

LICENSE.md

@@ -1,3 +1,7 @@
+<img src="https://raw.githubusercontent.com/ROCKNIX/distribution/dev/distributions/ROCKNIX/logos/rocknix-logo.png" width=192>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![Latest Version](https://img.shields.io/github/release/ROCKNIX/distribution.svg?color=FF5555&label=latest%20version&style=flat-square)](https://github.com/ROCKNIX/distribution/releases/latest) [![Activity](https://img.shields.io/github/commit-activity/m/ROCKNIX/distribution?color=FF5555&style=flat-square)](https://github.com/ROCKNIX/distribution/commits) [![Pull Requests](https://img.shields.io/github/issues-pr-closed/ROCKNIX/distribution?color=FF5555&style=flat-square)](https://github.com/ROCKNIX/distribution/pulls) [![Discord Server](https://img.shields.io/discord/948029830325235753?color=FF5555&label=chat&style=flat-square)](https://discord.gg/seTxckZjJy)
+
+---
+
 ## Licenses
 
 ROCKNIX is a Linux distribution that is made up of many open-source components.  Components are provided under their respective licenses.  This distribution includes components licensed for non-commercial use only.

Makefile

@@ -70,6 +70,11 @@ RK3399:
 	PROJECT=Rockchip DEVICE=RK3399 ARCH=arm ./scripts/build_distro
 	PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 ./scripts/build_distro
 
+H700:
+	unset DEVICE_ROOT
+	PROJECT=Allwinner DEVICE=H700 ARCH=arm ./scripts/build_distro
+	PROJECT=Allwinner DEVICE=H700 ARCH=aarch64 ./scripts/build_distro
+
 update:
 	PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 ./scripts/update_packages
 
@@ -90,8 +95,8 @@ docker-%: DOCKER_IMAGE := "rocknix/rocknix-build:latest"
 #   Anytime this directory changes, you must run `make clean` similarly to moving the distribution directory
 docker-%: DOCKER_WORK_DIR := $(shell if [ -n "${DOCKER_WORK_DIR}" ]; then echo ${DOCKER_WORK_DIR}; else echo "$$(pwd)" ; fi)
 
-# ${HOME}/.${DISTRONAME}/options is a global options file containing developer and build settings.
-docker-%: GLOBAL_SETTINGS := $(shell if [ -f "${HOME}/.${DISTRONAME}/options" ]; then echo "-v \"${HOME}/.${DISTRONAME}/options:${HOME}/.${DISTRONAME}/options\""; else echo ""; fi)
+# ${HOME}/.ROCKNIX/options is a global options file containing developer and build settings.
+docker-%: GLOBAL_SETTINGS := $(shell if [ -f "${HOME}/.ROCKNIX/options" ]; then echo "-v \"${HOME}/.ROCKNIX/options:${HOME}/.ROCKNIX/options\""; else echo ""; fi)
 
 # LOCAL_SSH_KEYS_FILE is a variable that contains the location of the authorized keys file for development build use.  It will be mounted into the container if it exists.
 docker-%: LOCAL_SSH_KEYS_FILE := $(shell if [ -n "${LOCAL_SSH_KEYS_FILE}" ]; then echo "-v \"${LOCAL_SSH_KEYS_FILE}:${LOCAL_SSH_KEYS_FILE}\""; else echo ""; fi)
@@ -119,16 +124,16 @@ docker-%: INTERACTIVE=$(shell [ -t 0 ] && echo "-it")
 docker-%: COMMAND=make $*
 
 # Get .env file ready
-docker-%: $(shell env | grep "=" > .env)
+docker-%: $(shell ./scripts/get_env > .env)
 
 # If the user issues a `make docker-shell` just start up bash as the shell to run commands
 docker-shell: COMMAND=bash
 
-# Command: builds and pushes a hybrid docker image to dockerhub
-# You must login with: docker login --username <username> and provide either a password or token (from user settings -> security in dockerhub) before this will work.  The build user must also be a member of the "docker" group.
+# Command: builds and saves a docker builder image locally.
+# The build user must also be a member of the "docker" group.
 docker-image-build:
 	$(DOCKER_CMD) buildx create --use
-	$(DOCKER_CMD) buildx build --tag $(DOCKER_IMAGE) --platform linux/amd64,linux/arm64 --push .
+	$(DOCKER_CMD) buildx build --tag $(DOCKER_IMAGE) --platform $(shell if [ "$(uname -m)" = "aarch64" ]; then echo "linux/arm64"; else echo "linux/amd64"; fi) --load .
 
 # Command: pulls latest docker image from dockerhub.  This will *replace* locally built version.
 docker-image-pull:

README.md

@@ -1,3 +1,41 @@
+<img src="https://raw.githubusercontent.com/ROCKNIX/distribution/dev/distributions/ROCKNIX/logos/rocknix-logo.png" width=192>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![Latest Version](https://img.shields.io/github/release/ROCKNIX/distribution.svg?color=FF5555&label=latest%20version&style=flat-square)](https://github.com/ROCKNIX/distribution/releases/latest) [![Activity](https://img.shields.io/github/commit-activity/m/ROCKNIX/distribution?color=FF5555&style=flat-square)](https://github.com/ROCKNIX/distribution/commits) [![Pull Requests](https://img.shields.io/github/issues-pr-closed/ROCKNIX/distribution?color=FF5555&style=flat-square)](https://github.com/ROCKNIX/distribution/pulls) [![Discord Server](https://img.shields.io/discord/948029830325235753?color=FF5555&label=chat&style=flat-square)](https://discord.gg/seTxckZjJy)
+
+---
+
+ROCKNIX is an immutable Linux distribution for handheld gaming devices developed by a small community of enthusiasts.  Our goal is to produce an operating system that has the features and capabilities that we need, and to have fun as we develop it.
+
+## Features
+
+* ROCKNIX has a very active community of developers and users.
+* Integrated cross-device local and remote network play.
+* In-game touch support on supported devices.
+* Fine grain control for battery life or performance.
+* Includes support for playing Music and Video.
+* Bluetooth audio and controller support.
+* Support for HDMI audio and video out, and USB audio.
+* Device to device and device to cloud sync with Syncthing and rclone.
+* VPN support with Wireguard, Tailscale, and ZeroTier.
+* Includes built-in support for scraping and retroachievements.
+
+## Screenshots
+
+<table>
+  <tr>
+    <td><img src="https://rocknix.org/_inc/images/screenshots/system-view.png"/></td>
+    <td><img src="https://rocknix.org/_inc/images/screenshots/menu.png"/></td>
+  </tr>
+  <tr>
+    <td><img src="https://rocknix.org/_inc/images/screenshots/gamelist-view-metadata-immersive.png"/></td>
+    <td><img src="https://rocknix.org/_inc/images/screenshots/gamelist-view-no-metadata-immersive.png"/></td>
+  </tr>
+</table>
+
+## Community
+
+The ROCKNIX community utilizes Discord for discussion, if you would like to join us please use this link: [https://discord.gg/seTxckZjJy](https://discord.gg/seTxckZjJy)
+
+## Licenses
+
 **ROCKNIX** is a fork of [JELOS](https://jelos.org/), all licenses apply and credit to the JELOS team. 
 
 You are free to:

config/blocklist

@@ -1,17 +1,25 @@
+aethersx2-sa # package is EOL
+amiberry # Updating breaks build packages
+control-gen # package does not update
 dolphin-sa # Wayland patch is now broken upstream
+drastic-sa # Package is closed source bin
 duckstation-lr # Libretro support removed from upstream.
 duckstation-sa # Patches need to be reworked.
 gptokeyb # Newer versions break hotkeys
 gzdoom-sa # Stick to release versions.
+idtech-lr # Just a dummy package
 kronos-sa # Using the release version of kronos had better results.
 melonds-sa # Broken OpenGL renderer upstream
 mupen64plus-sa-ui-console # Causes segfaults
 nanoboyadvance-sa # SDL version removed after this commit
 np2kai # Last major commit before hiatus is broken.
 openbor # Newer versions break controls, needs research.
 pico-8 # Metapackage, doesn't need to update
+portmaster # Manually update version
 ppsspp-sa # Manually update to release versions.
 retroarch # Manually update to release versions.
 rpcs3-sa # Need to update to llvm 16
+scummvmsa # Updating breaks build packages
+vice-lr # Updating breaks build patches
 vice-sa # Doesn't support updating with the script.
 vita3k-sa # Should be manually updated.

config/docker/package.mk

@@ -8,7 +8,6 @@ PKG_ARCH="@ARCH@"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="docker"
 PKG_SITE=""
-PKG_SHORTDESC=""
 PKG_LONGDESC=""
 
 PKG_IS_ADDON="yes"

config/emulators/3do.conf

@@ -5,7 +5,6 @@ SYSTEM_RELEASE="1993"
 SYSTEM_HARDWARE="console"
 SYSTEM_PATH="/storage/roms/3do"
 SYSTEM_EXTENSION=".iso .bin .chd .cue"
-SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
 SYSTEM_PLATFORM="3do"
 SYSTEM_THEME="3do"
 SYSTEM_WIKI_PATH="3do"

config/emulators/3ds.conf

@@ -5,7 +5,6 @@ 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/amiga.conf

@@ -5,7 +5,6 @@ SYSTEM_RELEASE="1985"
 SYSTEM_HARDWARE="computer"
 SYSTEM_PATH="/storage/roms/amiga"
 SYSTEM_EXTENSION=".zip .adf .uae .ipf .dms .adz .lha .m3u .hdf .hdz"
-SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
 SYSTEM_PLATFORM="amiga"
 SYSTEM_THEME="amiga"
 SYSTEM_WIKI_PATH="amiga"

config/emulators/amigacd32.conf

@@ -5,7 +5,6 @@ SYSTEM_RELEASE="1994"
 SYSTEM_HARDWARE="console"
 SYSTEM_PATH="/storage/roms/amigacd32"
 SYSTEM_EXTENSION=".iso .cue .lha .chd"
-SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
 SYSTEM_PLATFORM="amigacd32"
 SYSTEM_THEME="amigacd32"
 SYSTEM_WIKI_PATH="amigacd32"

config/emulators/amstradcpc.conf

@@ -5,7 +5,6 @@ SYSTEM_RELEASE="1984"
 SYSTEM_HARDWARE="computer"
 SYSTEM_PATH="/storage/roms/amstradcpc"
 SYSTEM_EXTENSION=".dsk .cpr .sna .tap .cdt .kcr .voc .m3u .zip .7z"
-SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
 SYSTEM_PLATFORM="amstradcpc"
 SYSTEM_THEME="amstradcpc"
 SYSTEM_WIKI_PATH="amstradcpc"