Fix conflicts
This commit is contained in:
Tim Flaman
parent
f2218903d0
commit
ae01b2779e
10 changed files with 48 additions and 27 deletions
|
|
@ -63,7 +63,7 @@ jobs:
|
|||
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.
|
||||
|
||||
## Development Build Repository
|
||||
This is a repository for JELOS development builds, these builds may be unstable and are not recommended for daily driving. Visit /JustEnoughLinuxOS/distribution for stable builds.
|
||||
This is a repository for JELOS development builds, these builds are unstable as they are intended for development use only. USE AT YOUR OWN RISK AND DO NOT REPORT ISSUES.
|
||||
|
||||
## 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.
|
||||
|
|
@ -100,7 +100,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: [[Win600/Atari VCS/Generic x86_64](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.img.gz)] [[RG353P/RG353M/RG353V](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351P/RG351M](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG351P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351V](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG351V.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351MP](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG351MP.aarch64-${{ steps.version.outputs.version }}.img.gz)]
|
||||
Download: [[Win600/Atari VCS/Generic x86_64](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.img.gz)] [[RG353P/RG353M/RG353V](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.img.gz)]
|
||||
|
||||
> RG353V users, enable "DEVICE IS RG353V" in the system settings menu after flashing.
|
||||
|
||||
|
|
@ -111,7 +111,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: [[Win600/Atari VCS/x86_64](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.tar)] [[RG353P/RG353M/RG353V](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351P](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351P.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351V](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351V.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351MP](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351MP.aarch64-${{ steps.version.outputs.version }}.tar)]
|
||||
Download: [[Win600/Atari VCS/x86_64](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.tar)] [[RG353P/RG353M/RG353V](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.tar)]
|
||||
|
||||
## Documentation
|
||||
* [Home](https://github.com/JustEnoughLinuxOS/distribution/wiki)
|
||||
|
|
@ -94,7 +94,7 @@ Building JELOS is easy, the fastest and most recommended method is to use Docker
|
|||
|handheld||```PYTHON_EGG_CACHE="`pwd`/.egg_cache" make docker-handheld```|
|
||||
|ALL DEVICES||```PYTHON_EGG_CACHE="`pwd`/.egg_cache" make docker-world```|
|
||||
|
||||
> Devices that list a dependency require the dependency to be built first as that build will be used as the root of the device you are building.
|
||||
> Devices that list a dependency require the dependency to be built first as that build will be used as the root of the device you are building. This will be done automatically by the build tooling when you start a build for your device.
|
||||
|
||||
### Building Manually
|
||||
To build JELOS manually, you will need several prerequisite packages installed.
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ pre_configure_target() {
|
|||
AR="${TARGET_AR}"
|
||||
CPP="${TARGET_PREFIX}cpp"
|
||||
CPPFLAGS="${TARGET_CPPFLAGS}"
|
||||
CFLAGS="${TARGET_CFLAGS}"
|
||||
LDFLAGS="${TARGET_LDFLAGS}"
|
||||
CFLAGS="${TARGET_CFLAGS} -fPIC"
|
||||
LDFLAGS="${TARGET_LDFLAGS} -Wl,--dynamic-linker=${GLIBC_DYNAMIC_LINKER}"
|
||||
|
||||
PKG_MESON_OPTS_TARGET=" \
|
||||
-Ddoctool=disabled \
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ PKG_COMPAT=""
|
|||
|
||||
PKG_MULTIMEDIA="ffmpeg mpv vlc"
|
||||
|
||||
PKG_TOOLS="i2c-tools rclone jslisten evtest tailscale"
|
||||
PKG_TOOLS="i2c-tools rclone jslisten evtest tailscale pygobject"
|
||||
|
||||
### Tools for mainline devices
|
||||
case "${DEVICE}" in
|
||||
|
|
@ -43,13 +43,6 @@ case "${DEVICE}" in
|
|||
;;
|
||||
esac
|
||||
|
||||
### Bluetooth support for some devices
|
||||
case "${DEVICE}" in
|
||||
RG503|RG353P|RG552|RG351P|RG351V|RG351MP|RGB20S)
|
||||
PKG_TOOLS+=" pygobject"
|
||||
;;
|
||||
esac
|
||||
|
||||
### Project specific variables
|
||||
case "${PROJECT}" in
|
||||
Rockchip)
|
||||
|
|
|
|||
|
|
@ -313,4 +313,5 @@ makeinstall_target() {
|
|||
done
|
||||
cp -p arch/${TARGET_KERNEL_ARCH}/boot/dts/overlays/README ${INSTALL}/usr/share/bootloader/overlays
|
||||
fi
|
||||
makeinstall_host
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,6 +84,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_prog_HAS_HG=/bin/false
|
|||
--without-pymalloc
|
||||
--without-ensurepip
|
||||
--enable-ipv6
|
||||
--with-build-python=${TOOLCHAIN}/bin/python
|
||||
"
|
||||
|
||||
pre_configure_host() {
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff -Naur gcc-4.8.2/gcc/config/i386/t-linux64 gcc-4.8.2.patch/gcc/config/i386/t-linux64
|
||||
--- gcc-4.8.2/gcc/config/i386/t-linux64 2013-01-10 21:38:27.000000000 +0100
|
||||
+++ gcc-4.8.2.patch/gcc/config/i386/t-linux64 2014-01-25 00:04:49.091673299 +0100
|
||||
@@ -33,6 +33,6 @@
|
||||
comma=,
|
||||
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
|
||||
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
|
||||
-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
|
||||
-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
|
||||
-MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
|
||||
+#MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
|
||||
+#MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
|
||||
+#MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
|
||||
|
|
@ -1045,4 +1045,42 @@
|
|||
<input name="x" type="button" id="2" value="1" />
|
||||
<input name="y" type="button" id="3" value="1" />
|
||||
</inputConfig>
|
||||
<inputConfig type="joystick" deviceName="Game Controller" deviceGUID="0500d25b503200000210000000000000">
|
||||
<input name="a" type="button" id="1" value="1" />
|
||||
<input name="b" type="button" id="0" value="1" />
|
||||
<input name="down" type="hat" id="0" value="4" />
|
||||
<input name="hotkeyenable" type="button" id="10" value="1" />
|
||||
<input name="left" type="hat" id="0" value="8" />
|
||||
<input name="leftanalogdown" type="axis" id="1" value="1" />
|
||||
<input name="leftanalogleft" type="axis" id="0" value="-1" />
|
||||
<input name="leftanalogright" type="axis" id="0" value="1" />
|
||||
<input name="leftanalogup" type="axis" id="1" value="-1" />
|
||||
<input name="leftshoulder" type="button" id="4" value="1" />
|
||||
<input name="leftthumb" type="button" id="6" value="1" />
|
||||
<input name="lefttrigger" type="axis" id="5" value="1" />
|
||||
<input name="right" type="hat" id="0" value="2" />
|
||||
<input name="rightanalogdown" type="axis" id="3" value="1" />
|
||||
<input name="rightanalogleft" type="axis" id="2" value="-1" />
|
||||
<input name="rightanalogright" type="axis" id="2" value="1" />
|
||||
<input name="rightanalogup" type="axis" id="3" value="-1" />
|
||||
<input name="rightshoulder" type="button" id="5" value="1" />
|
||||
<input name="rightthumb" type="button" id="7" value="1" />
|
||||
<input name="righttrigger" type="axis" id="4" value="1" />
|
||||
<input name="select" type="button" id="9" value="1" />
|
||||
<input name="start" type="button" id="8" value="1" />
|
||||
<input name="up" type="hat" id="0" value="1" />
|
||||
<input name="x" type="button" id="3" value="1" />
|
||||
<input name="y" type="button" id="2" value="1" />
|
||||
</inputConfig>
|
||||
<inputConfig type="joystick" deviceName="Classic Controller" deviceGUID="050013e7503200000110000000000000">
|
||||
<input name="a" type="button" id="0" value="1" />
|
||||
<input name="b" type="button" id="1" value="1" />
|
||||
<input name="down" type="hat" id="0" value="4" />
|
||||
<input name="hotkeyenable" type="button" id="4" value="1" />
|
||||
<input name="left" type="hat" id="0" value="8" />
|
||||
<input name="right" type="hat" id="0" value="2" />
|
||||
<input name="select" type="button" id="3" value="1" />
|
||||
<input name="start" type="button" id="2" value="1" />
|
||||
<input name="up" type="hat" id="0" value="1" />
|
||||
</inputConfig>
|
||||
</inputList>
|
||||
|
|
|
|||
|
|
@ -137,6 +137,7 @@ pre_make_target() {
|
|||
if grep -q ^CONFIG_CFG80211_INTERNAL_REGDB= ${PKG_BUILD}/.config ; then
|
||||
cp $(get_build_dir wireless-regdb)/db.txt ${PKG_BUILD}/net/wireless/db.txt
|
||||
fi
|
||||
makeinstall_host
|
||||
}
|
||||
|
||||
make_target() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue