diff mbox series

[master/kirkstone] input-utils: fix bashisms

Message ID 20230423202719.1921984-1-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [master/kirkstone] input-utils: fix bashisms | expand

Commit Message

Denys Dmytriyenko April 23, 2023, 8:27 p.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

Add patch from Debian that fixes bashism in the Makefile.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>

[cherry-pick from Dunfell, add Upstream-Status tag]
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../input-utils/fix-ftbfs-echo.patch          | 21 +++++++++++++++++++
 .../input-utils/input-utils_1.0.bb            |  3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 meta-arago-extras/recipes-devtools/input-utils/input-utils/fix-ftbfs-echo.patch
diff mbox series

Patch

diff --git a/meta-arago-extras/recipes-devtools/input-utils/input-utils/fix-ftbfs-echo.patch b/meta-arago-extras/recipes-devtools/input-utils/input-utils/fix-ftbfs-echo.patch
new file mode 100644
index 00000000..e6631003
--- /dev/null
+++ b/meta-arago-extras/recipes-devtools/input-utils/input-utils/fix-ftbfs-echo.patch
@@ -0,0 +1,21 @@ 
+Description: Fix FTBFS due to -e leaking into Make.config
+ If /bin/sh is configured to point to dash, echo does not support -e switch
+ which is used by mk/Autoconf.mk file to generate Make.config. Use 'env echo'
+ instead.
+Author: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+Bug-Debian: http://bugs.debian.org/750265
+Forwarded: no
+Last-Update: 2014-07-09
+Upstream-Status: Inactive-Upstream [lastrelease: 2008-2012]
+
+--- input-utils-1.0.orig/mk/Autoconf.mk
++++ input-utils-1.0/mk/Autoconf.mk
+@@ -162,7 +162,7 @@ config: Make.config
+	@true
+
+ Make.config: $(srcdir)/GNUmakefile
+-	@echo -e "$(make-config-q)" > $@
++	@env echo -e "$(make-config-q)" > $@
+	@echo
+	@echo "Make.config written, edit if needed"
+	@echo
diff --git a/meta-arago-extras/recipes-devtools/input-utils/input-utils_1.0.bb b/meta-arago-extras/recipes-devtools/input-utils/input-utils_1.0.bb
index 064a6faa..ea3d1df1 100644
--- a/meta-arago-extras/recipes-devtools/input-utils/input-utils_1.0.bb
+++ b/meta-arago-extras/recipes-devtools/input-utils/input-utils_1.0.bb
@@ -7,7 +7,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 PV = "1.0"
 PR = "r0"
 
-SRC_URI = "http://ftp.de.debian.org/debian/pool/main/i/input-utils/input-utils_1.0.orig.tar.gz"
+SRC_URI = "http://ftp.de.debian.org/debian/pool/main/i/input-utils/input-utils_1.0.orig.tar.gz \
+	file://fix-ftbfs-echo.patch"
 SRC_URI:append:arm = " file://0001-autoconf-fix-for-cross-compilation-for-ARM.patch"
 
 SRC_URI[md5sum] = "3e58772e8647093b1de2f2c90bfb9ee8"