Bug fixes.
This commit is contained in:
fewtarius
parent
2aa2b6e508
commit
ea59e68440
7 changed files with 68 additions and 29 deletions
|
|
@ -0,0 +1,56 @@
|
|||
From f6ca3217ec2fad93d078fa0121aa8f88d7d12ccb Mon Sep 17 00:00:00 2001
|
||||
From: lualiliu <lualiliu@outlook.com>
|
||||
Date: Wed, 7 Sep 2022 10:57:49 +0800
|
||||
Subject: [PATCH] Add a patch about fakeroot(_STAT_VER undeclared)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
solve it:
|
||||
libfakeroot.c:99:40: error: ‘_STAT_VER’ undeclared (first use in this
|
||||
function)
|
||||
---
|
||||
...fine-_STAT_VER-if-not-already-define.patch | 34 +++++++++++++++++++
|
||||
1 file changed, 34 insertions(+)
|
||||
create mode 100644 packages/devel/fakeroot/patches/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
|
||||
|
||||
diff --git a/packages/devel/fakeroot/patches/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch b/packages/devel/fakeroot/patches/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
|
||||
new file mode 100644
|
||||
index 00000000..613d0c95
|
||||
--- /dev/null
|
||||
+++ b/packages/devel/fakeroot/patches/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
|
||||
@@ -0,0 +1,34 @@
|
||||
+From ca68c7336dea4a07cf5b77c1fdc9e9aee4984ca5 Mon Sep 17 00:00:00 2001
|
||||
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
||||
+Date: Thu, 11 Feb 2021 20:59:25 -0800
|
||||
+Subject: [PATCH 1/3] libfakeroot.c: define _STAT_VER if not already defined
|
||||
+
|
||||
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
||||
+---
|
||||
+ libfakeroot.c | 10 ++++++++++
|
||||
+ 1 file changed, 10 insertions(+)
|
||||
+
|
||||
+diff --git a/libfakeroot.c b/libfakeroot.c
|
||||
+index 3e80e38..14cdbc4 100644
|
||||
+--- a/libfakeroot.c
|
||||
++++ b/libfakeroot.c
|
||||
+@@ -90,6 +90,16 @@
|
||||
+ #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
|
||||
+ #endif
|
||||
+
|
||||
++#ifndef _STAT_VER
|
||||
++ #if defined (__aarch64__)
|
||||
++ #define _STAT_VER 0
|
||||
++ #elif defined (__x86_64__)
|
||||
++ #define _STAT_VER 1
|
||||
++ #else
|
||||
++ #define _STAT_VER 3
|
||||
++ #endif
|
||||
++#endif
|
||||
++
|
||||
+ /*
|
||||
+ These INT_* (which stands for internal) macros should always be used when
|
||||
+ the fakeroot library owns the storage of the stat variable.
|
||||
+--
|
||||
+2.30.1
|
||||
+
|
||||
|
|
@ -9,12 +9,12 @@ then
|
|||
if [ -e "/usr/share/post-update" ]
|
||||
then
|
||||
show_splash intro
|
||||
echo -ne "\033[1000H\033[2K==> Preparing system.."
|
||||
echo -ne "\033[1000H\033[2K==> Preparing system.." >/dev/console
|
||||
/usr/share/post-update
|
||||
fi
|
||||
rm /storage/.config/boot.hint
|
||||
touch /storage/.configured
|
||||
fi
|
||||
|
||||
clear
|
||||
/usr/bin/show_splash intro 2>&1 >>${BOOTLOG}
|
||||
clear >/dev/console
|
||||
/usr/bin/show_splash intro 2>&1 >/dev/null
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@ then
|
|||
EXCLUDE="--exclude=configs"
|
||||
fi
|
||||
|
||||
rsync -a --delete ${EXCLUDE} /usr/config/system/ /storage/.config/system/ &
|
||||
rsync -a --ignore-existing /usr/config/game /storage/.config/ &
|
||||
rsync -a /usr/config/modules /storage/.config/ &
|
||||
rsync -a --delete ${EXCLUDE} /usr/config/system/ /storage/.config/system/
|
||||
rsync -a --ignore-existing /usr/config/game /storage/.config/
|
||||
rsync -a /usr/config/modules /storage/.config/
|
||||
|
||||
if [ ! -L "/storage/.config/emulationstation/resources/logo.png" ]
|
||||
then
|
||||
|
|
@ -27,9 +27,6 @@ then
|
|||
ln -sf /usr/config/splash/splash.png /storage/.config/emulationstation/resources/logo.png
|
||||
fi
|
||||
|
||||
### Update add-ons and themes
|
||||
wait < <(jobs -p)
|
||||
|
||||
cp -f /usr/config/modules/gamelist.xml /storage/.config/modules
|
||||
cp -f /usr/config/retroarch/retroarch-core-options.cfg /storage/.config/retroarch/retroarch-core-options.cfg
|
||||
rm -rf /storage/roms/ports/JelosAddOns*
|
||||
|
|
@ -67,8 +64,6 @@ do
|
|||
ln -s /usr/config/emulationstation/${es_cfg} /storage/.config/emulationstation/${es_cfg}
|
||||
done
|
||||
|
||||
### Safe to make changes below this line.
|
||||
|
||||
# Default modules need to be updated to use the new stop/start ui function.
|
||||
rsync -av /usr/config/modules/* /storage/.config/modules/
|
||||
|
||||
|
|
@ -79,12 +74,3 @@ then
|
|||
cp -f /usr/config/emulationstation/es_input.cfg /storage/.config/emulationstation/es_input.cfg
|
||||
fi
|
||||
|
||||
# Re-introduce overlayfs for retroarch.
|
||||
sed -i 's#^overlay_directory.*$#overlay_directory = "/tmp/overlays"#g' /storage/.config/retroarch/retroarch.cfg
|
||||
sed -i 's#^video_shader_dir.*$#video_shader_dir = "/tmp/shaders"#g' /storage/.config/retroarch/retroarch.cfg
|
||||
sed -i 's#^joypad_autoconfig_dir.*$#joypad_autoconfig_dir = "/tmp/joypads"#g' /storage/.config/retroarch/retroarch.cfg
|
||||
sed -i 's#^cheat_database_path.*$#cheat_database_path = "/tmp/database/cht"#g' /storage/.config/retroarch/retroarch.cfg
|
||||
sed -i 's#^content_database_path.*$#content_database_path = "/tmp/database/rdb"#g' /storage/.config/retroarch/retroarch.cfg
|
||||
sed -i 's#^assets_directory.*$#assets_directory = "/tmp/assets"#g' /storage/.config/retroarch/retroarch.cfg
|
||||
sed -i 's#^libretro_directory.*$#libretro_directory = "/tmp/cores"#g' /storage/.config/retroarch/retroarch.cfg
|
||||
sed -i 's#^libretro_info_path.*$#libretro_info_path = "/tmp/cores"#g' /storage/.config/retroarch/retroarch.cfg
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@ CONFIG_FEATURE_DD_IBS_OBS=y
|
|||
CONFIG_FEATURE_DD_STATUS=y
|
||||
CONFIG_DF=y
|
||||
# CONFIG_FEATURE_DF_FANCY is not set
|
||||
CONFIG_FEATURE_SKIP_ROOTFS=y
|
||||
# CONFIG_FEATURE_SKIP_ROOTFS is not set
|
||||
# CONFIG_DIRNAME is not set
|
||||
# CONFIG_DOS2UNIX is not set
|
||||
# CONFIG_UNIX2DOS is not set
|
||||
|
|
@ -382,8 +382,8 @@ CONFIG_FEATURE_LOADFONT_RAW=y
|
|||
# CONFIG_RESET is not set
|
||||
# CONFIG_RESIZE is not set
|
||||
# CONFIG_FEATURE_RESIZE_PRINT is not set
|
||||
CONFIG_SETCONSOLE=y
|
||||
CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
|
||||
# CONFIG_SETCONSOLE is not set
|
||||
# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
|
||||
# CONFIG_SETKEYCODES is not set
|
||||
# CONFIG_SETLOGCONS is not set
|
||||
# CONFIG_SHOWKEY is not set
|
||||
|
|
|
|||
|
|
@ -693,7 +693,7 @@ CONFIG_RENICE=y
|
|||
# CONFIG_FEATURE_SETPRIV_DUMP is not set
|
||||
# CONFIG_FEATURE_SETPRIV_CAPABILITIES is not set
|
||||
# CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES is not set
|
||||
# CONFIG_SETSID is not set
|
||||
CONFIG_SETSID=y
|
||||
# CONFIG_SWAPON is not set
|
||||
# CONFIG_FEATURE_SWAPON_DISCARD is not set
|
||||
# CONFIG_FEATURE_SWAPON_PRI is not set
|
||||
|
|
|
|||
|
|
@ -1981,8 +1981,8 @@ CONFIG_MACVLAN=m
|
|||
# CONFIG_GTP is not set
|
||||
# CONFIG_AMT is not set
|
||||
# CONFIG_MACSEC is not set
|
||||
CONFIG_NETCONSOLE=y
|
||||
CONFIG_NETCONSOLE_DYNAMIC=y
|
||||
# CONFIG_NETCONSOLE is not set
|
||||
# CONFIG_NETCONSOLE_DYNAMIC is not set
|
||||
CONFIG_NETPOLL=y
|
||||
CONFIG_NET_POLL_CONTROLLER=y
|
||||
CONFIG_TUN=y
|
||||
|
|
|
|||
|
|
@ -49,9 +49,6 @@
|
|||
# Space separated list is supported,
|
||||
DRIVER_ADDONS=""
|
||||
|
||||
# debug tty path
|
||||
DEBUG_TTY="/dev/ttyFIQ0"
|
||||
|
||||
# build and install PulseAudio support (yes / no)
|
||||
PULSEAUDIO_SUPPORT="yes"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue