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

Fix a glitch mounting SD1 with a games partition.

Browse source
This commit is contained in:
fewtarius 2022-04-07 07:34:44 -04:00
parent c6532c0dbd
commit b238fabcf7
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
2 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/games/libretro/flycast/package.mk
View file

@ -1,24 +1,25 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2022-present AmberELEC (https://github.com/AmberELEC)
# Copyright (C) 2022-present Fewtarius
PKG_NAME="flycast"
PKG_VERSION="e46d819c465ef342f5e9ef4c683231b17f56f206"
PKG_SITE="https://github.com/flyinghead/flycast"
PKG_URL="$PKG_SITE.git"
PKG_DEPENDS_TARGET="toolchain $OPENGLES libzip"
PKG_URL="${PKG_SITE}.git"
PKG_DEPENDS_TARGET="toolchain ${OPENGLES} libzip"
PKG_LONGDESC="Flycast is a multi-platform Sega Dreamcast, Naomi and Atomiswave emulator"
PKG_TOOLCHAIN="cmake"
pre_configure_target() {
sed -i 's/"reicast"/"flycast"/g' $PKG_BUILD/shell/libretro/libretro_core_option_defines.h
sed -i 's/"reicast"/"flycast"/g' ${PKG_BUILD}/shell/libretro/libretro_core_option_defines.h
PKG_CMAKE_OPTS_TARGET="-Wno-dev -DLIBRETRO=ON \
-DWITH_SYSTEM_ZLIB=ON \
-DUSE_OPENMP=ON \
-DUSE_VULKAN=OFF
-DUSE_GLES=ON"
-DUSE_GLES2=ON"
}
makeinstall_target() {
mkdir -p $INSTALL/usr/lib/libretro
cp flycast_libretro.so $INSTALL/usr/lib/libretro/
mkdir -p ${INSTALL}/usr/lib/libretro
cp flycast_libretro.so ${INSTALL}/usr/lib/libretro/
}

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

@ -31,7 +31,7 @@ MODULE_DIR=/usr/lib/modules
UPDATE_ROOT=/storage/.update
UPDATE_DIR="$UPDATE_ROOT"
UPDATE_KERNEL="KERNEL"
UPDATE_KERNEL="@KERNEL_NAME@"
UPDATE_SYSTEM="SYSTEM"
IMAGE_KERNEL="@KERNEL_NAME@"
IMAGE_SYSTEM="SYSTEM"
@ -703,19 +703,16 @@ mount_games() {
/usr/bin/busybox mkdir -p /storage/roms >/dev/null 2>&1
fi
# Only want to try and mount additional cards if the slots exist.
CARDS=$(awk '/mmcblk[0-9]$/{print $4}' /proc/partitions | wc -l)
if [ ${CARDS} -gt 1 ]
then
for DEV in $(blkid | awk 'BEGIN {FS=":"}; /ext4/ || /fat/ {print $1}' | sort -r)
do
if [ -e "${DEV}" ] && [ ! -e "/storage/.please_resize_me" ]
then
mount ${DEV} /storage/roms >/dev/null 2>&1
break
fi
done
fi
for DEV in $(blkid | awk 'BEGIN {FS=":"}; /ext4/ || /fat/ {print $1}' | sort -r)
do
NULL=$(grep ${DEV} /proc/mounts >/dev/null 2>&1)
if [ ! "$?" = "0" ] && [ -e "${DEV}" ] && [ ! -e "/storage/.please_resize_me" ]
then
mount ${DEV} /storage/roms >/dev/null 2>&1
break
fi
done
if [ -d "/storage/.update" ] && [ ! -e "/storage/.please_resize_me" ]
then
@ -841,10 +838,10 @@ check_update() {
return 0
fi
echo "${UPDATE_TAR} ${UPDATE_IMG} ${UPDATE_IMG_GZ}" 2>&1 | grep JELOS 2>&1 >/dev/null
echo "${UPDATE_TAR} ${UPDATE_IMG} ${UPDATE_IMG_GZ}" 2>&1 | grep @DISTRONAME@ 2>&1 >/dev/null
if [ "$?" -ne "0" ]
then
echo "Unsupported operating system update. Please only use JELOS update packages with this distribution."
echo "Unsupported operating system update. Please only use @DISTRONAME@ update packages with this distribution."
do_cleanup
StartProgress countdown "Reboot in 5s... " 5 "now"
reboot
@ -874,7 +871,7 @@ check_update() {
clear >/dev/console
echo "UPDATE IN PROGRESS"
echo ""
echo "Please do not reboot or turn off your @DISTRONAME@ device!"
echo "Please do not reboot or turn off your device!"
echo ""
if [ -f "$UPDATE_TAR" ]; then