diff options
| author |   Joe Slater <joe.slater@windriver.com> | 2022-03-15 15:45:37 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-16 13:37:54 +0000 |
| commit | 0829d4f2947be2b095e7e713b5100f4e41218bec (patch) | |
| tree | 7e8649e747671a08f6633dadad145fdb930cdcc0 | |
| parent | 6572225a0afb60b02702a6ab59da649386708a7f (diff) | |
| download | openembedded-core-contrib-0829d4f2947be2b095e7e713b5100f4e41218bec.tar.gz | |
expect: modify fixline1 script
fixline1 needs to be processed by fixline1, but we
short-circuit that. Enter the multi-line shebang which
I am a bit queasy about, but expect loves it.
Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/expect/expect/0001-fixline1-fix-line-1.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-devtools/expect/expect_5.45.4.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-devtools/expect/expect/0001-fixline1-fix-line-1.patch b/meta/recipes-devtools/expect/expect/0001-fixline1-fix-line-1.patch new file mode 100644 index 0000000000..9c73d3e579 --- /dev/null +++ b/meta/recipes-devtools/expect/expect/0001-fixline1-fix-line-1.patch @@ -0,0 +1,31 @@ +From eef7c44c10de32ba399ab162cb5799fafdce3fa5 Mon Sep 17 00:00:00 2001 +From: Joe Slater <joe.slater@windriver.com> +Date: Tue, 15 Mar 2022 22:00:04 +0000 +Subject: [PATCH] fixline1: fix line 1 + +Ironically, fixline1 needs its first line modified by +fixline1. We do that, manually. + +Upstream-Status: Inappropriate [OE specific cross build setup] + +Signed-off-by: Joe Slater <joe.slater@windriver.com> +--- + fixline1 | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/fixline1 b/fixline1 +index 113e9bb..8a38e96 100755 +--- a/fixline1 ++++ b/fixline1 +@@ -1,4 +1,7 @@ +-#!expect -- ++#!/bin/sh ++# expect won't see the exec \ ++exec expect -- "$0" ${1+"$@"} ++ + # Synopsis: fixline1 newpath < input > output + # Author: Don Libes + +-- +2.32.0 + diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb index 4214ab0f27..e22fa140d5 100644 --- a/meta/recipes-devtools/expect/expect_5.45.4.bb +++ b/meta/recipes-devtools/expect/expect_5.45.4.bb @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \ file://0001-Resolve-string-formatting-issues.patch \ file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \ file://0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch \ + file://0001-fixline1-fix-line-1.patch \ " SRC_URI[md5sum] = "00fce8de158422f5ccd2666512329bd2" SRC_URI[sha256sum] = "49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34" |