Merge pull request #4325 from MilhouseVH/le10_busybox_tac

busybox: update to busybox-9aa751b; enable tac
This commit is contained in:
Christian Hewitt 2020-05-22 18:57:34 +04:00 committed by GitHub
commit d2619e5510
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 3 deletions

View File

@ -305,7 +305,7 @@ CONFIG_STAT=y
CONFIG_SYNC=y
CONFIG_FEATURE_SYNC_FANCY=y
# CONFIG_FSYNC is not set
# CONFIG_TAC is not set
CONFIG_TAC=y
CONFIG_TAIL=y
CONFIG_FEATURE_FANCY_TAIL=y
CONFIG_TEE=y

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="busybox"
PKG_VERSION="9e2a5668fd38db169d9d91b13089a99df4c9bd37"
PKG_SHA256="f2a7bd25e84fddd445022fe4057ea95c466512fc0320c6ce0695d5480e6716de"
PKG_VERSION="9aa751b08ab03d6396f86c3df77937a19687981b"
PKG_SHA256="41d6f6ad37d21bace07ec596e72c1aa0874b8ccd1d9ef9a609a07b37cabea657"
PKG_LICENSE="GPL"
PKG_SITE="http://www.busybox.net"
PKG_URL="https://git.busybox.net/busybox/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.bz2"

View File

@ -0,0 +1,50 @@
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