Merge pull request #1294 from fewtarius/dev

Renames handheld to AMD64 to match our device naming convention.
This commit is contained in:
fewtarius 2023-04-15 19:18:13 -04:00 committed by GitHub
commit 2f8456f606
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
57 changed files with 39 additions and 41 deletions

View file

@ -60,7 +60,7 @@ jobs:
body: |
&nbsp;&nbsp;<img src="https://raw.githubusercontent.com/JustEnoughLinuxOS/distribution/dev/distributions/JELOS/logos/jelos-logo.png" width=192>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![Latest Version](https://img.shields.io/github/release/JustEnoughLinuxOS/distribution.svg?color=5998FF&label=latest%20version&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/releases/latest) [![Activity](https://img.shields.io/github/commit-activity/m/JustEnoughLinuxOS/distribution?color=5998FF&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/commits) [![Pull Requests](https://img.shields.io/github/issues-pr-closed/JustEnoughLinuxOS/distribution?color=5998FF&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/pulls) [![Discord Server](https://img.shields.io/discord/948029830325235753?color=5998FF&label=chat&style=flat-square)](https://discord.gg/seTxckZjJy)
#
Just Enough Linux Operating System (JELOS) is a community developed Linux distribution for handheld gaming devices. 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.
Just Enough Linux Operating System (JELOS) is a community developed Linux distribution for AMD64 gaming devices. 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.
## Licenses
JELOS 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.
@ -101,7 +101,7 @@ jobs:
|**Device/Platform**|**Download Package**|
|----|----|
|**Anbernic RG353P/M/V/VS, RG503, and Powkiddy RK2023**|[JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.img.gz)|
|**Ayaneo Handhelds, Atari VCS, and other x86_64 devices**|[JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.img.gz)|
|**Ayaneo Handhelds, Atari VCS, and other x86_64 devices**|[JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.img.gz)|
|**Hardkernel ODROID Go Ultra**|[JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.img.gz)|
|**Orange Pi 5, and Indiedroid Nova**|[JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.img.gz)|
@ -116,7 +116,7 @@ jobs:
|**Device/Platform**|**Download Package**|
|----|----|
|**Anbernic RG353P/M/V/VS, RG503, and Powkiddy RK2023**|[JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.tar)|
|**Ayaneo Handhelds, Atari VCS, and other x86_64 devices**|[JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.tar)|
|**Ayaneo Handhelds, Atari VCS, and other x86_64 devices**|[JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.tar)|
|**Hardkernel ODROID Go Ultra**|[JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.tar)|
|**Orange Pi 5, and Indiedroid Nova**|[JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.tar)|

View file

@ -106,7 +106,7 @@ Building JELOS is easy, the fastest and most recommended method is to instruct t
| Devices | Dependency | Docker Command |
| ---- | ---- | ---- |
|handheld||```make docker-handheld```|
|AMD64||```make docker-AMD64```|
|RK3588||```make docker-RK3588```|
|RK3566||```make docker-RK3566```|
|S922X||```make docker-S922X```|
@ -131,14 +131,14 @@ sudo apt install gcc make git unzip wget \
Next, build the version of JELOS for your device. See the table above for dependencies.
```
make handheld
make AMD64
```
### Building a single package
It is also possible to build individual packages.
```
DEVICE=handheld ARCH=x86_64 ./scripts/clean busybox
DEVICE=handheld ARCH=x86_64 ./scripts/build busybox
DEVICE=AMD64 ARCH=x86_64 ./scripts/clean busybox
DEVICE=AMD64 ARCH=x86_64 ./scripts/build busybox
```
> Note: Emulation Station package build requires additional steps because its source code located in a separate repository, see instructions inside, [link](https://github.com/JustEnoughLinuxOS/distribution/blob/main/packages/ui/emulationstation/package.mk).
@ -179,9 +179,9 @@ mv wireguard-linux-compat-v1.0.20211208 wireguard-linux-compat
cp -rf wireguard-linux-compat wireguard-linux-compat.orig
# Make your changes to wireguard-linux-compat
mkdir -p ../../packages/network/wireguard-linux-compat/patches/handheld
mkdir -p ../../packages/network/wireguard-linux-compat/patches/AMD64
# run from the sources dir
diff -rupN wireguard-linux-compat wireguard-linux-compat.orig >../../packages/network/wireguard-linux-compat/patches/handheld/mychanges.patch
diff -rupN wireguard-linux-compat wireguard-linux-compat.orig >../../packages/network/wireguard-linux-compat/patches/AMD64/mychanges.patch
```
### Creating a patch for a package using git
@ -203,9 +203,9 @@ If you already have a build for your device made using the above process, it's s
```
# Update the package version for a new package, or apply your patch as above.
vim/emacs/vscode/notepad.exe
# Export the variables needed to complete your build, we'll assume you are building handheld, update the device to match your configuration.
# Export the variables needed to complete your build, we'll assume you are building AMD64, update the device to match your configuration.
export OS_VERSION=$(date +%Y%m%d) BUILD_DATE=$(date)
export PROJECT=PC ARCH=x86_64 DEVICE=handheld
export PROJECT=PC ARCH=x86_64 DEVICE=AMD64
# Clean the package you are building.
./scripts/clean emulationstation
# Build the package.

View file

@ -23,13 +23,11 @@ distclean:
src-pkg:
tar cvJf sources.tar.xz sources .stamps
world: x86_64 RK3588 RK3566 S922X
world: AMD64 RK3588 RK3566 S922X
x86_64: handheld
handheld:
PROJECT=PC DEVICE=handheld ARCH=i686 ./scripts/build_distro
PROJECT=PC DEVICE=handheld ARCH=x86_64 ./scripts/build_distro
AMD64:
PROJECT=PC DEVICE=AMD64 ARCH=i686 ./scripts/build_distro
PROJECT=PC DEVICE=AMD64 ARCH=x86_64 ./scripts/build_distro
RK3588:
PROJECT=Rockchip DEVICE=RK3588 ARCH=arm ./scripts/build_distro
@ -44,7 +42,7 @@ S922X:
PROJECT=Amlogic DEVICE=S922X ARCH=aarch64 ./scripts/build_distro
update:
PROJECT=PC DEVICE=handheld ARCH=x86_64 ./scripts/update_packages
PROJECT=PC DEVICE=AMD64 ARCH=x86_64 ./scripts/update_packages
package:
./scripts/build ${PACKAGE}
@ -54,7 +52,7 @@ package-clean:
## Docker builds - overview
# docker-* commands just wire up docker to call the normal make command via docker
# For example: make docker-handheld will use docker to call: make handheld
# For example: make docker-AMD64 will use docker to call: make AMD64
# All variables are scoped to docker-* commands to prevent weird collisions/behavior with non-docker commands
docker-%: DOCKER_IMAGE := "justenoughlinuxos/jelos-build:latest"

View file

@ -1,6 +1,6 @@
&nbsp;&nbsp;<img src="https://raw.githubusercontent.com/JustEnoughLinuxOS/distribution/dev/distributions/JELOS/logos/jelos-logo.png" width=192>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![Latest Version](https://img.shields.io/github/release/JustEnoughLinuxOS/distribution.svg?color=5998FF&label=latest%20version&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/releases/latest) [![Activity](https://img.shields.io/github/commit-activity/m/JustEnoughLinuxOS/distribution?color=5998FF&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/commits) [![Pull Requests](https://img.shields.io/github/issues-pr-closed/JustEnoughLinuxOS/distribution?color=5998FF&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/pulls) [![Discord Server](https://img.shields.io/discord/948029830325235753?color=5998FF&label=chat&style=flat-square)](https://discord.gg/seTxckZjJy)
#
Just Enough Linux Operating System (JELOS) 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.
Just Enough Linux Operating System (JELOS) is an immutable Linux distribution for AMD64 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.
## Licenses
JELOS 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.
@ -66,5 +66,5 @@ io/etcher/), [Raspberry Pi Imager](https://www.raspberrypi.com/software/), and [
* [Developing and Building JELOS](https://github.com/JustEnoughLinuxOS/distribution/blob/dev/BUILDING.md)
## Credits
Like any Linux distribution, this project is not the work of one person. It is the work of many persons all over the world who have developed the open source bits without which this project could not exist. Special thanks to CoreELEC, LibreELEC, and to developers and contributors across the handheld community.
Like any Linux distribution, this project is not the work of one person. It is the work of many persons all over the world who have developed the open source bits without which this project could not exist. Special thanks to CoreELEC, LibreELEC, and to developers and contributors across the AMD64 community.

View file

@ -34,7 +34,7 @@ TARGET_ARCH="${ARCH}"
ENABLE_32BIT="${ENABLE_32BIT-true}"
# determines the default device, if not forced by user
DEVICE="${DEVICE:-handheld}"
DEVICE="${DEVICE:-AMD64}"
# the version is the date
OS_VERSION=$(date +%Y%m%d)

View file

@ -26,7 +26,7 @@ fi
PKG_MAKE_OPTS_TARGET+=" LINK_STATIC_LIBCPLUSPLUS=0"
case ${DEVICE} in
handheld)
AMD64)
PKG_MAKE_OPTS_TARGET+=" HAVE_HW=1"
;;
esac
@ -36,7 +36,7 @@ makeinstall_target() {
mkdir -p ${INSTALL}/usr/lib/libretro
case ${DEVICE} in
handheld)
AMD64)
cp mednafen_psx_hw_libretro.so ${INSTALL}/usr/lib/libretro/beetle_psx_libretro.so
cp -vP ${PKG_BUILD}/../core-info-*/beetle_psx_hw_libretro.info ${INSTALL}/usr/lib/libretro/beetle_psx_libretro.info
sed -i 's/Beetle PSX HW/Beetle PSX/g' ${INSTALL}/usr/lib/libretro/beetle_psx_libretro.info

View file

@ -7,7 +7,7 @@ PKG_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="libretro"
PKG_SHORTDESC="Libretro implementation of PicoDrive. (Sega Megadrive/Genesis/Sega Master System/Sega GameGear/Sega CD/32X)"
PKG_LONGDESC="This is yet another Megadrive / Genesis / Sega CD / Mega CD / 32X / SMS emulator, which was written having ARM-based handheld devices in mind (such as smartphones and handheld consoles like GP2X and Pandora), but also runs on non-ARM little-endian hardware too."
PKG_LONGDESC="This is yet another Megadrive / Genesis / Sega CD / Mega CD / 32X / SMS emulator, which was written having ARM-based AMD64 devices in mind (such as smartphones and AMD64 consoles like GP2X and Pandora), but also runs on non-ARM little-endian hardware too."
GET_HANDLER_SUPPORT="git"
PKG_BUILD_FLAGS="-gold"
PKG_TOOLCHAIN="make"

View file

@ -28,8 +28,8 @@ PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="libretro"
PKG_SHORTDESC="Obscure nintendo handheld emulator (functional,no color files or savestates currently)"
PKG_LONGDESC="Obscure nintendo handheld emulator (functional,no color files or savestates currently)"
PKG_SHORTDESC="Obscure nintendo AMD64 emulator (functional,no color files or savestates currently)"
PKG_LONGDESC="Obscure nintendo AMD64 emulator (functional,no color files or savestates currently)"
PKG_IS_ADDON="no"
PKG_TOOLCHAIN="make"

View file

@ -8,7 +8,7 @@ PKG_LONGDESC="Dolphin is a GameCube / Wii emulator, allowing you to play games f
PKG_TOOLCHAIN="cmake"
case ${DEVICE} in
RK3588|handheld|S922X)
RK3588|AMD64|S922X)
PKG_SITE="https://github.com/dolphin-emu/dolphin"
PKG_URL="${PKG_SITE}.git"
PKG_VERSION="4d164fcb77487b0cb732e0423961fd042c3e7e3b"

View file

@ -85,7 +85,7 @@ then
fi
# Disable integer scaling by default on Handheld
if [[ "${HW_DEVICE}" =~ handheld ]]
if [[ "${HW_DEVICE}" =~ AMD64 ]]
then
echo "No integer scaling (Handheld only)..." >>${LOG}
sed -i "s#.integerscale=1#.integerscale=0#g" /storage/.config/system/configs/system.cfg

View file

@ -150,7 +150,7 @@ case $hdmimode in
set_bezel "643" "405" "325" "150" "false"
;;
*)
# delete aspect_ratio_index to make sure video is expanded fullscreen. Only certain handheld platforms need custom_viewport.
# delete aspect_ratio_index to make sure video is expanded fullscreen. Only certain AMD64 platforms need custom_viewport.
clear_bezel
sed -i '/input_overlay_opacity = "/d' $RACONFIG
sed -i "1i input_overlay_opacity = \"$OPACITY\"" $RACONFIG
@ -207,7 +207,7 @@ sed -i '/input_overlay = "/d' $RACONFIG
fi
# Note:
# 1. Different handheld platforms have different bezels, they may need different viewport value even for same platform.
# 1. Different AMD64 platforms have different bezels, they may need different viewport value even for same platform.
# So, I think this script should be stored in $BEZELDIR/ or some place wich can be modified by users.
# 2. For Arcade games, I created a bezelmap.cfg in $BEZELDIR/ in order to share bezels between arcade clones and parent.
# In fact, ROMs of other platforms can share certain bezel if you write mapping relationship in bezelmap.cfg.

View file

@ -64,7 +64,7 @@ diff -rupN linux-6.1.2.orig/Documentation/hwmon/oxp-sensors.rst linux-6.1.2/Docu
+Supported devices
+-----------------
+
+Currently the driver supports the following handhelds:
+Currently the driver supports the following AMD64s:
+
+ - AOK ZOE A1
+ - OneXPlayer AMD
@ -1420,7 +1420,7 @@ diff -rupN linux-6.1.2.orig/drivers/hwmon/Kconfig linux-6.1.2/drivers/hwmon/Kcon
+ depends on X86
+ help
+ If you say yes here you get support for fan readings and control over
+ OneXPlayer handheld devices. Only OneXPlayer mini AMD handheld variant
+ OneXPlayer AMD64 devices. Only OneXPlayer mini AMD AMD64 variant
+ boards are supported.
+
+ Can also be built as a module. In that case it will be called oxp-sensors.
@ -1611,7 +1611,7 @@ diff -rupN linux-6.1.2.orig/drivers/hwmon/oxp-sensors.c linux-6.1.2/drivers/hwmo
+ *
+ * Old boards have the same DMI strings and they are told appart by the
+ * boot cpu vendor (Intel/AMD). Currently only AMD boards are supported
+ * but the code is made to be simple to add other handheld boards in the
+ * but the code is made to be simple to add other AMD64 boards in the
+ * future.
+ * Fan control is provided via pwm interface in the range [0-255].
+ * Old AMD boards use [0-100] as range in the EC, the written value is

View file

@ -72,7 +72,7 @@ Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Add support for the AYANEO AIR and AYANEO AIR Pro models of handheld
Add support for the AYANEO AIR and AYANEO AIR Pro models of AMD64
devices. These devices use the same EC registers and logic as the One X
Player mini AMD. Previous AYANEO models are not supported as they use a
different EC and do not have the necessary fan speed write enable and
@ -126,7 +126,7 @@ index 39c588ec5c50..a53c961065b2 100644
Supported devices
-----------------
@@ -22,6 +25,8 @@ Supported devices
Currently the driver supports the following handhelds:
Currently the driver supports the following AMD64s:
- AOK ZOE A1
+ - Aya Neo AIR
@ -160,11 +160,11 @@ index f84ec8f8eda9..7adc0199ea66 100644
*
- * Old boards have the same DMI strings and they are told appart by the
- * boot cpu vendor (Intel/AMD). Currently only AMD boards are supported
- * but the code is made to be simple to add other handheld boards in the
- * but the code is made to be simple to add other AMD64 boards in the
- * future.
+ * Old OXP boards have the same DMI strings and they are told appart by
+ * the boot cpu vendor (Intel/AMD). Currently only AMD boards are
+ * supported but the code is made to be simple to add other handheld
+ * supported but the code is made to be simple to add other AMD64
+ * boards in the future.
* Fan control is provided via pwm interface in the range [0-255].
* Old AMD boards use [0-100] as range in the EC, the written value is

View file

@ -228,7 +228,7 @@
<choice name="on" value="1"/>
</feature>
<feature name="switch mode">
<choice name="handheld" value="0"/>
<choice name="AMD64" value="0"/>
<choice name="docked" value="1"/>
</feature>
<feature name="vsync">

View file

@ -29,7 +29,7 @@ LIBRETRO_CORES="2048-lr 81-lr a5200-lr atari800-lr beetle-gba-lr beetle-lynx-lr
### Emulators or cores for specific devices
case "${DEVICE}" in
handheld)
AMD64)
[ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="lutris-wine"
PKG_EMUS+=" duckstation-sa dolphin-sa cemu-sa citra-sa melonds-sa minivmacsa mupen64plus-sa pcsx2-sa \
primehack rpcs3-sa ryujinx-sa xemu-sa yuzu-sa"

View file

@ -2,7 +2,7 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
# Allow upgrades between different Generic builds
if [ "$1" = "handheld.x86_64" -o "$1" = "X86_64.x86_64" -o "$1" = "Virtual.x86_64" -o "$1" = "Generic.x86_64" -o "$1" = "Generic-legacy.x86_64" -o "$1" = "gbm.x86_64" -o "$1" = "wayland.x86_64" -o "$1" = "x11.x86_64" ]; then
if [ "$1" = "AMD64.x86_64" -o "$1" = "X86_64.x86_64" -o "$1" = "Virtual.x86_64" -o "$1" = "Generic.x86_64" -o "$1" = "Generic-legacy.x86_64" -o "$1" = "gbm.x86_64" -o "$1" = "wayland.x86_64" -o "$1" = "x11.x86_64" ]; then
exit 0
else
exit 1