mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
busybox: updated to 1.32.0
This commit is contained in:
parent
63f0e11dcd
commit
0c0f29df35
@ -1129,6 +1129,7 @@ CONFIG_BASH_IS_NONE=y
|
|||||||
# CONFIG_HUSH_UMASK is not set
|
# CONFIG_HUSH_UMASK is not set
|
||||||
# CONFIG_HUSH_GETOPTS is not set
|
# CONFIG_HUSH_GETOPTS is not set
|
||||||
# CONFIG_HUSH_MEMLEAK is not set
|
# CONFIG_HUSH_MEMLEAK is not set
|
||||||
|
# CONFIG_SHELL_HUSH is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Options common to all shells
|
# Options common to all shells
|
||||||
|
@ -1153,6 +1153,7 @@ CONFIG_CTTYHACK=y
|
|||||||
# CONFIG_HUSH_UMASK is not set
|
# CONFIG_HUSH_UMASK is not set
|
||||||
# CONFIG_HUSH_GETOPTS is not set
|
# CONFIG_HUSH_GETOPTS is not set
|
||||||
# CONFIG_HUSH_MEMLEAK is not set
|
# CONFIG_HUSH_MEMLEAK is not set
|
||||||
|
# CONFIG_SHELL_HUSH is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Options common to all shells
|
# Options common to all shells
|
||||||
|
@ -1149,6 +1149,7 @@ CONFIG_ASH_CMDCMD=y
|
|||||||
# CONFIG_HUSH_UMASK is not set
|
# CONFIG_HUSH_UMASK is not set
|
||||||
# CONFIG_HUSH_GETOPTS is not set
|
# CONFIG_HUSH_GETOPTS is not set
|
||||||
# CONFIG_HUSH_MEMLEAK is not set
|
# CONFIG_HUSH_MEMLEAK is not set
|
||||||
|
# CONFIG_SHELL_HUSH is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Options common to all shells
|
# Options common to all shells
|
||||||
|
@ -3,11 +3,11 @@
|
|||||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="busybox"
|
PKG_NAME="busybox"
|
||||||
PKG_VERSION="9aa751b08ab03d6396f86c3df77937a19687981b"
|
PKG_VERSION="1.32.0"
|
||||||
PKG_SHA256="41d6f6ad37d21bace07ec596e72c1aa0874b8ccd1d9ef9a609a07b37cabea657"
|
PKG_SHA256="c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://www.busybox.net"
|
PKG_SITE="http://www.busybox.net"
|
||||||
PKG_URL="https://git.busybox.net/busybox/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
PKG_URL="https://busybox.net/downloads/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
||||||
PKG_DEPENDS_HOST="toolchain:host"
|
PKG_DEPENDS_HOST="toolchain:host"
|
||||||
PKG_DEPENDS_TARGET="toolchain busybox:host hdparm dosfstools e2fsprogs zip unzip usbutils parted procps-ng gptfdisk libtirpc"
|
PKG_DEPENDS_TARGET="toolchain busybox:host hdparm dosfstools e2fsprogs zip unzip usbutils parted procps-ng gptfdisk libtirpc"
|
||||||
PKG_DEPENDS_INIT="toolchain libtirpc"
|
PKG_DEPENDS_INIT="toolchain libtirpc"
|
||||||
|
@ -1,50 +0,0 @@
|
|||||||
Since commit 7eb8eecbb (ash: eval: Add assignment built-in support
|
|
||||||
again) building BusyBox with the 'command' built-in disabled fails.
|
|
||||||
|
|
||||||
parse_command_args() only needs to be called when the 'command'
|
|
||||||
built-in is run. Which it won't be if it's disabled.
|
|
||||||
|
|
||||||
v2: Avoiding infinite loops is good, too. Thanks, Harald van Dijk.
|
|
||||||
|
|
||||||
Reported-by: Deweloper <deweloper at wp.pl>
|
|
||||||
Signed-off-by: Ron Yorston <rmy at pobox.com>
|
|
||||||
---
|
|
||||||
shell/ash.c | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/shell/ash.c b/shell/ash.c
|
|
||||||
index d0d99f60e..a11b1d67d 100644
|
|
||||||
--- a/shell/ash.c
|
|
||||||
+++ b/shell/ash.c
|
|
||||||
@@ -8675,7 +8675,6 @@ typecmd(int argc UNUSED_PARAM, char **argv)
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#if ENABLE_ASH_CMDCMD
|
|
||||||
static struct strlist *
|
|
||||||
fill_arglist(struct arglist *arglist, union node **argpp)
|
|
||||||
{
|
|
||||||
@@ -8692,6 +8691,7 @@ fill_arglist(struct arglist *arglist, union node **argpp)
|
|
||||||
return *lastp;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if ENABLE_ASH_CMDCMD
|
|
||||||
/* Is it "command [-p] PROG ARGS" bltin, no other opts? Return ptr to "PROG" if yes */
|
|
||||||
static int
|
|
||||||
parse_command_args(struct arglist *arglist, union node **argpp, const char **path)
|
|
||||||
@@ -10190,11 +10190,13 @@ evalcommand(union node *cmd, int flags)
|
|
||||||
vlocal = !spclbltin;
|
|
||||||
}
|
|
||||||
cmd_is_exec = cmdentry.u.cmd == EXECCMD;
|
|
||||||
+#if ENABLE_ASH_CMDCMD
|
|
||||||
if (cmdentry.u.cmd != COMMANDCMD)
|
|
||||||
break;
|
|
||||||
|
|
||||||
cmd_flag = parse_command_args(&arglist, &argp, &path);
|
|
||||||
if (!cmd_flag)
|
|
||||||
+#endif
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.24.1
|
|
Loading…
x
Reference in New Issue
Block a user