From e1904c6bd4ce07f0beef3e9ca2fec48e92746629 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Wed, 15 Apr 2020 07:17:21 +0100
Subject: [PATCH 1/2] busybox: enable tac

---
 packages/sysutils/busybox/config/busybox-target.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/sysutils/busybox/config/busybox-target.conf b/packages/sysutils/busybox/config/busybox-target.conf
index 5165277f4c..6fbc442f6d 100644
--- a/packages/sysutils/busybox/config/busybox-target.conf
+++ b/packages/sysutils/busybox/config/busybox-target.conf
@@ -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

From 7e4411735baeb217d8fe9d3578a6f98a2a9c0aba Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Wed, 15 Apr 2020 07:21:58 +0100
Subject: [PATCH 2/2] busybox: update to busybox-9aa751b

---
 packages/sysutils/busybox/package.mk          |  4 +-
 ...7-fix-for-dev-snapshot-build-failure.patch | 50 +++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 packages/sysutils/busybox/patches/busybox-07-fix-for-dev-snapshot-build-failure.patch

diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk
index 698c2100ce..e6e8271860 100644
--- a/packages/sysutils/busybox/package.mk
+++ b/packages/sysutils/busybox/package.mk
@@ -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"
diff --git a/packages/sysutils/busybox/patches/busybox-07-fix-for-dev-snapshot-build-failure.patch b/packages/sysutils/busybox/patches/busybox-07-fix-for-dev-snapshot-build-failure.patch
new file mode 100644
index 0000000000..8255da03d5
--- /dev/null
+++ b/packages/sysutils/busybox/patches/busybox-07-fix-for-dev-snapshot-build-failure.patch
@@ -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