From a6de147dc0f3409622a02e376c218b27257df6dc Mon Sep 17 00:00:00 2001
From: Peter Hoyes <Peter.Hoyes@arm.com>
Date: Thu, 28 Jan 2021 15:27:01 +0000
Subject: [PATCH] arm-autonomy: Use busybox instead of GNU tar

Switch out the tar used by xenguest-manager and xenguest-mkimage.
xenguest-mkimage requires the --exclude flag so enable the Busybox
CONFIG_FEATURE_TAR_LONG_OPTIONS option.

Issue-Id: SCM-2034
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Change-Id: Iceed017ef8ebd058e6c06156989aaa2a4bff9103
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../recipes-core/busybox/busybox/feature_tar_long_options.cfg | 1 +
 meta-arm-autonomy/recipes-core/busybox/busybox_%.bbappend     | 4 ++++
 .../recipes-extended/xenguest/xenguest-manager.bb             | 2 +-
 .../recipes-extended/xenguest/xenguest-mkimage.bb             | 4 ++--
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 meta-arm-autonomy/recipes-core/busybox/busybox/feature_tar_long_options.cfg
 create mode 100644 meta-arm-autonomy/recipes-core/busybox/busybox_%.bbappend

diff --git a/meta-arm-autonomy/recipes-core/busybox/busybox/feature_tar_long_options.cfg b/meta-arm-autonomy/recipes-core/busybox/busybox/feature_tar_long_options.cfg
new file mode 100644
index 00000000..151a3df9
--- /dev/null
+++ b/meta-arm-autonomy/recipes-core/busybox/busybox/feature_tar_long_options.cfg
@@ -0,0 +1 @@
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
diff --git a/meta-arm-autonomy/recipes-core/busybox/busybox_%.bbappend b/meta-arm-autonomy/recipes-core/busybox/busybox_%.bbappend
new file mode 100644
index 00000000..e3355815
--- /dev/null
+++ b/meta-arm-autonomy/recipes-core/busybox/busybox_%.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+# The --exclude flag in Busybox tar is required by xenguest-mkimage
+SRC_URI += "file://feature_tar_long_options.cfg"
diff --git a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb
index 2bfd6a95..d7b256f4 100644
--- a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb
+++ b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb
@@ -63,7 +63,7 @@ do_install() {
 }
 
 # Things that we need on the target
-RDEPENDS_${PN} += "bash tar xenguest-mkimage lvm2 xen-tools parted e2fsprogs \
+RDEPENDS_${PN} += "bash xenguest-mkimage lvm2 xen-tools parted e2fsprogs \
                    dosfstools logrotate"
 
 FILES_${PN} += "${bindir}/xenguest-manager \
diff --git a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-mkimage.bb b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-mkimage.bb
index 080f137d..047ca9f9 100644
--- a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-mkimage.bb
+++ b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-mkimage.bb
@@ -27,7 +27,7 @@ do_install() {
     install -m 755 xenguest-mkimage ${D}${bindir}/.
 }
 
-# We need bash and tar
-RDEPENDS_${PN} = "bash tar"
+# We need bash
+RDEPENDS_${PN} = "bash"
 FILES_${PN} = "${bindir}/xenguest-mkimage"