Work continues on x86_64/weston. Patch for now, fix better later.

This commit is contained in:
fewtarius 2022-08-30 17:40:21 -04:00
parent d654b6a396
commit 92dde76839
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
4 changed files with 26 additions and 4 deletions

View file

@ -3,7 +3,7 @@
# Copyright (C) 2020-present Fewtarius
PKG_NAME="emulationstation"
PKG_VERSION="d3424c6"
PKG_VERSION="222ba00"
PKG_GIT_CLONE_BRANCH="main"
PKG_REV="1"
PKG_ARCH="any"

View file

@ -11,7 +11,7 @@ locking=false
[launcher]
path=/usr/bin/start_es.sh
icon=/usr/config/emulationstation/resources/window_icon_16.png
icon=/usr/config/emulationstation/resources/window_icon_24.png
[launcher]
icon=/usr/share/weston/terminal.png

View file

@ -0,0 +1,21 @@
diff -rupN weston-10.0.1.orig/clients/terminal.c weston-10.0.1/clients/terminal.c
--- weston-10.0.1.orig/clients/terminal.c 2022-06-23 09:52:38.000000000 -0400
+++ weston-10.0.1/clients/terminal.c 2022-08-30 17:32:23.295568863 -0400
@@ -3089,7 +3089,7 @@ terminal_run(struct terminal *terminal,
close(pipes[0]);
setenv("TERM", option_term, 1);
setenv("COLORTERM", option_term, 1);
- if (execl(path, path, NULL)) {
+ if (execl(path, path, "-l")) {
printf("exec failed: %s\n", strerror(errno));
exit(EXIT_FAILURE);
}
@@ -3140,7 +3140,7 @@ int main(int argc, char *argv[])
option_shell = getenv("SHELL");
if (!option_shell)
- option_shell = "/bin/sh";
+ option_shell = "/bin/bash";
config_file = weston_config_get_name_from_env();
config = weston_config_parse(config_file);

View file

@ -45,7 +45,7 @@ CONFIG_HAVE_KERNEL_ZSTD=y
CONFIG_KERNEL_XZ=y
# CONFIG_KERNEL_LZO is not set
# CONFIG_KERNEL_LZ4 is not set
CONFIG_KERNEL_ZSTD=y
# CONFIG_KERNEL_ZSTD is not set
CONFIG_DEFAULT_INIT=""
CONFIG_DEFAULT_HOSTNAME="@DEVICENAME@"
CONFIG_SYSVIPC=y
@ -243,7 +243,7 @@ CONFIG_SCHED_AUTOGROUP=y
# CONFIG_SYSFS_DEPRECATED is not set
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INITRAMFS_SOURCE="@INITRAMFS_SOURCE@"
CONFIG_RD_GZIP=y
CONFIG_RD_BZIP2=y
CONFIG_RD_LZMA=y
@ -253,6 +253,7 @@ CONFIG_RD_LZ4=y
CONFIG_RD_ZSTD=y
CONFIG_BOOT_CONFIG=y
# CONFIG_BOOT_CONFIG_EMBED is not set
CONFIG_INITRAMFS_COMPRESSION_NONE=y
# CONFIG_INITRAMFS_PRESERVE_MTIME is not set
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set