wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #661 from fewtarius/dev

Browse source 
Multiple bug fixes
This commit is contained in:
fewtarius 2022-10-25 06:27:34 -04:00 committed by GitHub
commit 7ea95dfd59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build-dev.yaml vendored
View file

@ -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/x86_64](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.img.gz)] [[RG353V/RG353P](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351P](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351V](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351V.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351MP](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-RG351MP.aarch64-${{ steps.version.outputs.version }}.img.gz)]
Download: [[Win600/x86_64](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/${{ steps.version.outputs.version }}/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.tar)] [[RG353V/RG353P](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)]
## Documentation
* [Home](https://github.com/JustEnoughLinuxOS/distribution/wiki)

2
packages/games/emulators/amiberry/scripts/start_amiberry.sh
View file

@ -28,7 +28,7 @@ then
fi
find_gamepad() {
GAMEPAD=$(grep -b4 $(readlink ${DEVICE_CONTROLLER_DEV} | sed "s#^.*/##") /proc/bus/input/devices | awk 'BEGIN {FS="\""}; /Name/ {printf $2}')
GAMEPAD=$(grep -b4 js0 /proc/bus/input/devices | awk 'BEGIN {FS="\""}; /Name/ {printf $2}')
sed -i "s|joyport1_friendlyname=.*|joyport1_friendlyname=${GAMEPAD}|" "$AMIBERRY_TMP_CONFIG"
echo "Gamepad used $GAMEPAD" >> "$AMIBERRY_LOG"
}

2
packages/games/emulators/pico-8/sources/start_pico8.sh
View file

@ -34,7 +34,7 @@ then
jslisten set "pico8_dyn"
/storage/roms/pico-8/pico8_dyn -home -root_path /storage/roms/pico-8 -joystick 0 ${OPTIONS} "${CART}"
else
text_viewer -e -w -t "Missing Pico-8 binaries!" -m "Extract your purchased pico8 and pico8.dat and place them in the pico-8 directory on your games partition."
text_viewer -e -w -t "Missing Pico-8 binaries!" -m "Extract your purchased pico8 package into the pico-8 directory on your games partition."
fi
ret_error=$?

4
packages/games/emulators/yabasanshiroSA/sources/start_yabasanshiroSA.sh
View file

@ -22,9 +22,9 @@ then
mkdir -p "${BIOS_BACKUP}"
fi
if [ ! -e "${ROM_DIR}/${ROM_DIR}/input.cfg" ]
if [ ! -e "${CONFIG_DIR}/input.cfg" ]
then
GAMEPAD=$(grep -b4 $(readlink ${DEVICE_CONTROLLER_DEV} | sed "s#^.*/##") /proc/bus/input/devices | awk 'BEGIN {FS="\""}; /Name/ {printf $2}')
GAMEPAD=$(grep -b4 js0 /proc/bus/input/devices | awk 'BEGIN {FS="\""}; /Name/ {printf $2}')
GAMEPADCONFIG=$(xmlstarlet sel -t -c '//inputList/inputConfig[@deviceName="'${GAMEPAD}'"]' -n /storage/.emulationstation/es_input.cfg)
if [ ! -z "${GAMEPADCONFIG}" ]

2
packages/jelos/sources/post-update
View file

@ -115,3 +115,5 @@ then
cp -f /usr/config/smb.conf /storage/.config
fi
# Reset the retroarch hotkeys
rm -f /storage/.retroarch_controller

34
packages/jelos/sources/scripts/setsettings.sh
View file

@ -40,7 +40,7 @@ SNAPSHOT="$@"
SNAPSHOT="${SNAPSHOT#*--snapshot=*}"
### Enable logging
if [ "$(get_es_setting string LogLevel)" == "minimal" ]; then
if [ "$(get_setting string LogLevel)" == "minimal" ]; then
LOG=false
else
LOG=true
@ -123,7 +123,6 @@ log "Core: ${CORE}"
##
## Configure hotkeys if they're not already configured for this device.
mkcontroller
if [ -e "/storage/.retroarch_controller" ]
then
LAST_CONTROLLER="$(cat /storage/.retroarch_controller)"
@ -132,19 +131,26 @@ fi
MY_CONTROLLER="$(cat /storage/.controller)"
if [ ! "${LAST_CONTROLLER}" == "${MY_CONTROLLER}" ]
then
sed -i "/input_bind_hold/d" ${RACONF}
sed -i "/input_fps_toggle_btn/d" ${RACONF}
sed -i "/input_menu_toggle_btn/d" ${RACONF}
sed -i "/input_save_state_btn/d" ${RACONF}
sed -i "/input_load_state_btn/d" ${RACONF}
cat <<EOF >>${RACONF}
input_bind_hold = "${DEVICE_BTN_SELECT}"
input_fps_toggle_btn = "${DEVICE_BTN_WEST}"
input_menu_toggle_btn = "${DEVICE_BTN_NORTH}"
input_save_state_btn = "${DEVICE_BTN_TR}"
input_load_state_btn = "${DEVICE_BTN_TL}"
if [ -e "/usr/share/libretro/autoconfig/${MY_CONTROLLER}.cfg" ]
then
cp /usr/share/libretro/autoconfig/"${MY_CONTROLLER}.cfg" /tmp
sed -i "s# = #=#g" /tmp/"${MY_CONTROLLER}.cfg"
source /tmp/"${MY_CONTROLLER}.cfg"
sed -i "/input_bind_hold/d" ${RACONF}
sed -i "/input_fps_toggle_btn/d" ${RACONF}
sed -i "/input_menu_toggle_btn/d" ${RACONF}
sed -i "/input_save_state_btn/d" ${RACONF}
sed -i "/input_load_state_btn/d" ${RACONF}
cat <<EOF >>${RACONF}
input_bind_hold = "${input_select_btn}"
input_fps_toggle_btn = "${input_x_btn}"
input_menu_toggle_btn = "${input_y_btn}"
input_save_state_btn = "${input_r_btn}"
input_load_state_btn = "${input_l_btn}"
EOF
echo "${MY_CONTROLLER}" >/storage/.retroarch_controller
echo "${MY_CONTROLLER}" >/storage/.retroarch_controller
rm -f /tmp/"${MY_CONTROLLER}.cfg"
fi
fi
# RA menu rgui, ozone, glui or xmb (fallback if everthing else fails)

1
packages/sysutils/busybox/scripts/init
View file

@ -838,6 +838,7 @@ check_update() {
if [ "${TARRESULT}" -eq "0" ]; then
mv $UPDATE_DIR/.tmp/*/target/* $UPDATE_DIR &>/dev/null
echo "UPDATE" > /storage/.config/boot.hint
sync
StopProgress "done"
else

2
packages/themes/es-theme-art-book-next/package.mk
View file

@ -4,12 +4,10 @@
# Copyright (C) 2021 Fewtarius
PKG_NAME="es-theme-art-book-next"
PKG_VERSION="9152e4b7f1e705bd2bf442735fae13acf8aa3c61"
PKG_ARCH="any"
PKG_LICENSE="CUSTOM"
PKG_SITE="https://github.com/anthonycaccese/art-book-next-batocera"
PKG_URL="${PKG_SITE}.git"
PKG_GIT_CLONE_BRANCH="2.0"
GET_HANDLER_SUPPORT="git"
PKG_SHORTDESC="Art Book Next"
PKG_LONGDESC="Art Book Next"

2
packages/virtual/image/package.mk
View file

@ -4,7 +4,7 @@
PKG_NAME="image"
PKG_LICENSE="GPL"
PKG_SITE="https://libreelec.tv"
PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware ${BOOTLOADER} busybox util-linux corefonts network misc-packages debug usb-modeswitch unzip poppler jq socat p7zip file bluez splash initramfs jelos"
PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware ${BOOTLOADER} busybox util-linux corefonts network misc-packages debug usb-modeswitch unzip poppler textviewer jq socat p7zip file bluez splash initramfs jelos"
PKG_SECTION="virtual"
PKG_LONGDESC="Root package used to build and create complete image"

3
projects/Rockchip/bootloader/update.sh
View file

@ -122,7 +122,4 @@ esac
sync
mount -o remount,ro $BOOT_ROOT &>/dev/null
# Leave a hint that we just did an update
echo "UPDATE" > /storage/.config/boot.hint
sync

1
projects/Rockchip/devices/RG552/device.config
View file

@ -8,7 +8,6 @@ DEVICE_AUDIO_MIXER="DAC"
DEVICE_PLAYBACK_PATH_SPK="SPK"
DEVICE_PLAYBACK_PATH_HP="HP"
DEVICE_VOLUME_DEV="/dev/input/by-path/platform-volume-keys-event"
DEVICE_CONTROLLER_DEV="/dev/input/by-path/platform-singleadc-joypad-event-joystick"
DEVICE_BRIGHTNESS="128"
SPLASH_LOADER="plymouth"
UI_SERVICE="weston.service"