From f5cfcafb08742f56916f140838597945551116d1 Mon Sep 17 00:00:00 2001
From: Douglas Raillard <douglas.raillard@arm.com>
Date: Mon, 23 May 2022 14:28:11 +0100
Subject: [PATCH] shutils: Remove shebang
Since shutils should be run using busybox shell anyway, remove the
shebang.
---
devlib/bin/scripts/shutils.in | 2 --
devlib/target.py | 4 ----
2 files changed, 6 deletions(-)
diff --git a/devlib/bin/scripts/shutils.in b/devlib/bin/scripts/shutils.in
index d72c22f..458c97f 100755
--- a/devlib/bin/scripts/shutils.in
+++ b/devlib/bin/scripts/shutils.in
@@ -1,5 +1,3 @@
-#!__DEVLIB_SHELL__
-
CMD=$1
shift
diff --git a/devlib/target.py b/devlib/target.py
index a43f652..6f6063e 100644
--- a/devlib/target.py
+++ b/devlib/target.py
@@ -1202,14 +1202,10 @@ fi
shutils_ifile = os.path.join(PACKAGE_BIN_DIRECTORY, 'scripts', 'shutils.in')
tmp_dir = tempfile.mkdtemp()
shutils_ofile = os.path.join(tmp_dir, 'shutils')
- shell_path = '/bin/sh'
- if self.os == 'android':
- shell_path = '/system/bin/sh'
with open(shutils_ifile) as fh:
lines = fh.readlines()
with open(shutils_ofile, 'w') as ofile:
for line in lines:
- line = line.replace("__DEVLIB_SHELL__", shell_path)
line = line.replace("__DEVLIB_BUSYBOX__", self.busybox)
ofile.write(line)
self._shutils = self.install(shutils_ofile)