diff --git a/README.md b/README.md index e2d77ac5d..de1b5735d 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Just Enough Linux Operating System (JELOS) is a simple Linux distribution for AR * Supports FAT32, ExFAT, and EXT4 file systems on devices with a second card slot. * 2.4GHz and 5GHz 802.11 A/B/G/N/AC WIFI support. * Online updates for easy access to stable or development builds. -* Supports Anbernic's RG552, RG503, RG353P, RG351P/M, RG351MP, RG351V, and Win600. +* Support for the Anbernic WIN600, RG552, RG503, RG353P, RG351P/M, RG351MP, RG351V. * Developed by a small, friendly community. ## Licenses @@ -42,13 +42,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -## Installation +## Flashing * Download the latest [version of JELOS](https://github.com/JustEnoughLinuxOS/distribution/releases) (.img.gz) for your device. * 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. > This repository hosts stable versions of JELOS. If you would like to install the unstable development version, please visit the [development build repository](https://github.com/JustEnoughLinuxOS/distribution-dev). +## Installation +* x86_64 versions of JELOS include an installation tool. This tool may be run from the boot menu or from within JELOS by switching to desktop mode and running "installer" in a terminal. + ## Upgrading * Download and install the update online via the System Settings menu. * Download the latest [version of JELOS](https://github.com/JustEnoughLinuxOS/distribution/releases) (.tar) for your device. diff --git a/packages/devel/libaio/package.mk b/packages/devel/libaio/package.mk index a24688158..33f7e745f 100644 --- a/packages/devel/libaio/package.mk +++ b/packages/devel/libaio/package.mk @@ -16,10 +16,3 @@ make_target() { make -C src } -makeinstall_target() { - mkdir -p ${SYSROOT_PREFIX}/usr/lib - cp -PR src/libaio.a ${SYSROOT_PREFIX}/usr/lib - - mkdir -p ${SYSROOT_PREFIX}/usr/include - cp -PR src/libaio.h ${SYSROOT_PREFIX}/usr/include -} diff --git a/packages/devel/libaio/patches/001-ldflags.patch b/packages/devel/libaio/patches/001-ldflags.patch new file mode 100644 index 000000000..030963bac --- /dev/null +++ b/packages/devel/libaio/patches/001-ldflags.patch @@ -0,0 +1,13 @@ +We need to place LDFLAGS earlier to ensure e.g. as-needed works correctly. +--- a/src/Makefile ++++ b/src/Makefile +@@ -56,7 +56,7 @@ libaio.a: $(libaio_objs) + + $(libname): $(libaio_sobjs) libaio.map + $(CC) $(CFLAGS) -c struct_offsets.c +- $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) ++ $(CC) $(SO_CFLAGS) $(LINK_FLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) + + install: $(all_targets) + install -D -m 644 libaio.h $(includedir)/libaio.h + diff --git a/packages/games/emulators/pico-8/sources/start_pico8.sh b/packages/games/emulators/pico-8/sources/start_pico8.sh index c18383cd7..2c3d46793 100644 --- a/packages/games/emulators/pico-8/sources/start_pico8.sh +++ b/packages/games/emulators/pico-8/sources/start_pico8.sh @@ -27,7 +27,9 @@ if [ -e "/storage/roms/pico-8/${STATIC_BIN}" ] then jslisten set "${STATIC_BIN}" /storage/roms/pico-8/${STATIC_BIN} -home -root_path /storage/roms/pico-8 -joystick 0 ${OPTIONS} "${CART}" -elif [ -e "/storage/roms/pico-8/pico8_dyn" ] && [ ! -e "/storage/roms/pico-8/${STATIC_BIN}" ] +fi + +if [ -e "/storage/roms/pico-8/pico8_dyn" ] || [ ! "$?" = 0 ] then jslisten set "pico8_dyn" /storage/roms/pico-8/pico8_dyn -home -root_path /storage/roms/pico-8 -joystick 0 ${OPTIONS} "${CART}" diff --git a/packages/games/libretro/pcsx2/package.mk b/packages/games/libretro/pcsx2/package.mk index 89b5fc9d8..ba36aa39d 100644 --- a/packages/games/libretro/pcsx2/package.mk +++ b/packages/games/libretro/pcsx2/package.mk @@ -11,7 +11,6 @@ PKG_URL="${PKG_SITE}.git" PKG_DEPENDS_TARGET="toolchain" PKG_SECTION="libretro" PKG_SHORTDESC="PCSX2 core for RetroArch." -PKG_BUILD_FLAGS="-lto" if [ ! "${OPENGL}" = "no" ]; then PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" @@ -47,7 +46,11 @@ PKG_CMAKE_OPTS_TARGET=" \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=FALSE \ -DCMAKE_BUILD_TYPE=Release" +pre_configure_target() { + export LDFLAGS="${LDFLAGS} -laio" +} + makeinstall_target() { mkdir -p ${INSTALL}/usr/lib/libretro - cp ${PKG_BUILD}/.${TARGET_NAME}/pcsx2_libretro.so ${INSTALL}/usr/lib/libretro/ + cp ${PKG_BUILD}/.${TARGET_NAME}/pcsx2/pcsx2_libretro.so ${INSTALL}/usr/lib/libretro/ } diff --git a/packages/ui/emulationstation/config/device/X86_64/es_systems.cfg b/packages/ui/emulationstation/config/device/X86_64/es_systems.cfg index a526b5424..376cc6fcb 100644 --- a/packages/ui/emulationstation/config/device/X86_64/es_systems.cfg +++ b/packages/ui/emulationstation/config/device/X86_64/es_systems.cfg @@ -784,12 +784,12 @@ - dolphinsa + dolphinsa - dolphin + dolphin @@ -1468,9 +1468,14 @@ ps2 ps2 + + + pcsx2 + + - pcsx2sa + pcsx2sa diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk index 7c911ee25..0bd376a58 100644 --- a/packages/virtual/emulators/package.mk +++ b/packages/virtual/emulators/package.mk @@ -42,6 +42,6 @@ case "${DEVICE}" in PKG_DEPENDS_TARGET+=" duckstationsa dolphinsa" ;; handheld) - PKG_DEPENDS_TARGET+=" duckstationsa dolphinsa dolphin pcsx2sa" + PKG_DEPENDS_TARGET+=" duckstationsa dolphinsa dolphin pcsx2sa pcsx2" ;; esac diff --git a/projects/PC/filesystem/usr/share/bootloader/canupdate.sh b/projects/PC/filesystem/usr/share/bootloader/canupdate.sh index 69eea69dd..bb1e0bfa0 100644 --- a/projects/PC/filesystem/usr/share/bootloader/canupdate.sh +++ b/projects/PC/filesystem/usr/share/bootloader/canupdate.sh @@ -2,7 +2,7 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Allow upgrades between different Generic builds -if [ "$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" = "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 exit 0 else exit 1 diff --git a/scripts/mkimage b/scripts/mkimage index b5d646434..2aac2eb48 100755 --- a/scripts/mkimage +++ b/scripts/mkimage @@ -115,13 +115,12 @@ if [ "${BOOTLOADER}" = "syslinux" ]; then # create bootloader configuration echo "image: creating bootloader configuration..." cat << EOF > "${LE_TMP}/syslinux.cfg" -SAY Wait for installer mode to start automatically in 5 seconds... +SAY ${DISTRO} - Boot options... SAY -SAY Options -SAY ======= -SAY installer: permanently install ${DISTRO} to HDD/SSD -SAY live: boot ${DISTRO} using RAM for temporary storage -SAY run: boot ${DISTRO} using this USB memory device for storage +SAY installer: permanently installs ${DISTRO} to HDD/SSD +SAY run: boots ${DISTRO} from this device (default) +SAY +SAY Booting in "run" mode in 5 seconds... SAY DEFAULT run TIMEOUT 50 @@ -131,10 +130,6 @@ LABEL installer KERNEL /${KERNEL_NAME} APPEND boot=UUID=${UUID_SYSTEM} installer systemd.debug_shell vga=current ${EXTRA_CMDLINE} -LABEL live - KERNEL /${KERNEL_NAME} - APPEND boot=UUID=${UUID_SYSTEM} live vga=current ${EXTRA_CMDLINE} - LABEL run KERNEL /${KERNEL_NAME} APPEND boot=UUID=${UUID_SYSTEM} disk=UUID=${UUID_STORAGE} portable ${EXTRA_CMDLINE} @@ -147,10 +142,6 @@ menuentry "Installer" { search --set -f /KERNEL linux /KERNEL boot=UUID=${UUID_SYSTEM} installer systemd.debug_shell vga=current ${EXTRA_CMDLINE} } -menuentry "Live" { - search --set -f /KERNEL - linux /KERNEL boot=UUID=${UUID_SYSTEM} grub_live vga=current ${EXTRA_CMDLINE} -} menuentry "Run" { search --set -f /KERNEL linux /KERNEL boot=UUID=${UUID_SYSTEM} disk=UUID=${UUID_STORAGE} grub_portable ${EXTRA_CMDLINE}