From c6b6d8caf5fe83f27cdaab75dc200260504417a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 12 Oct 2018 18:01:40 +0200
Subject: [PATCH] card-scripts: rework requisites
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 scripts/include/card-helpers.inc        | 2 ++
 scripts/include/machine-imx.inc         | 1 -
 scripts/include/machine-raspberrypi.inc | 2 --
 scripts/include/machine-ti-old-omap.inc | 7 +------
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/scripts/include/card-helpers.inc b/scripts/include/card-helpers.inc
index 34a4571..46962e0 100644
--- a/scripts/include/card-helpers.inc
+++ b/scripts/include/card-helpers.inc
@@ -385,6 +385,8 @@ StartCardKernelWrite() {
 # check common prerequisites
 CheckPrerequisite "dialog"
 CheckPrerequisite "lsblk"
+CheckPrerequisite "tar"
+CheckPrerequisite "depmod"
 
 # Common script parameter handling for all scripts
 if [ $( id -u ) -eq 0 ]; then
diff --git a/scripts/include/machine-imx.inc b/scripts/include/machine-imx.inc
index 290da05..e1d2c97 100644
--- a/scripts/include/machine-imx.inc
+++ b/scripts/include/machine-imx.inc
@@ -70,4 +70,3 @@ CheckPrerequisite "gunzip"
 CheckPrerequisite "dd"
 CheckPrerequisite "parted"
 CheckPrerequisite "resize2fs"
-CheckPrerequisite "depmod"
diff --git a/scripts/include/machine-raspberrypi.inc b/scripts/include/machine-raspberrypi.inc
index 0c3cb61..088429a 100644
--- a/scripts/include/machine-raspberrypi.inc
+++ b/scripts/include/machine-raspberrypi.inc
@@ -66,8 +66,6 @@ RootCardKernelWriteCallback() {
 }
 
 CheckPrerequisite "time"
-CheckPrerequisite "gunzip"
 CheckPrerequisite "dd"
 CheckPrerequisite "parted"
 CheckPrerequisite "resize2fs"
-CheckPrerequisite "depmod"
diff --git a/scripts/include/machine-ti-old-omap.inc b/scripts/include/machine-ti-old-omap.inc
index 6bc1562..f18723f 100644
--- a/scripts/include/machine-ti-old-omap.inc
+++ b/scripts/include/machine-ti-old-omap.inc
@@ -83,9 +83,4 @@ RootCardKernelWriteCallback() {
 }
 
 CheckPrerequisite "time"
-CheckPrerequisite "gunzip"
-CheckPrerequisite "dd"
-CheckPrerequisite "parted"
-CheckPrerequisite "resize2fs"
-CheckPrerequisite "depmod"
-
+CheckPrerequisite "tar"