expect: modify fixline1 script
PATCH 1/1 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.
--- .../expect/0001-fixline1-fix-line-1.patch | 31 +++++++++++++++++++ meta/recipes-devtools/expect/expect_5.45.4.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-devtools/expect/expect/0001-fixline1-fix-line-1.patch
meta/recipes-devtools/expect/expect/0001-fixline1-fix-line-1.patch new file +31 -0
@@ -0,0 +1,31 @@ +From eef7c44c10de32ba399ab162cb5799fafdce3fa5 Mon Sep 17 00:00:00 2001 +From: Joe Slater <[email protected]> +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: Pending + +Signed-off-by: Joe Slater <[email protected]> +--- + 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 +
meta/recipes-devtools/expect/expect_5.45.4.bb +1 -0
@@ -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"
Signature · 1 line
2.35.1
Quoted 17 lines · Joe Slater
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 <[email protected]>--- .../expect/0001-fixline1-fix-line-1.patch | 31 +++++++++++++++++++ meta/recipes-devtools/expect/expect_5.45.4.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-devtools/expect/expect/0001-fixline1-fix-line-1.patchmeta/recipes-devtools/expect/expect/0001-fixline1-fix-line-1.patch new file +0
-0
meta/recipes-devtools/expect/expect/0001-fixline1-fix-line-1.patch line 10
Quoted 10 lines
meta/recipes-devtools/expect/expect/0001-fixline1-fix-line-1.patch new file +10
-0@@ -0,0 +1,31 @@ +From eef7c44c10de32ba399ab162cb5799fafdce3fa5 Mon Sep 17 00:00:00 2001 +From: Joe Slater <[email protected]> +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: Pending +
This probably doesn't stand much chance of making it upstream so Pending should probably be "Inappropriate [OE specific cross build setup]"?
Cheers,
Richard
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 23 lines · Richard Purdie via lists.openembedded.org
Quoted 22 lines · Joe Slater
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 <[email protected]>--- .../expect/0001-fixline1-fix-line-1.patch | 31 +++++++++++++++++++ meta/recipes-devtools/expect/expect_5.45.4.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-devtools/expect/expect/0001-fixline1-fix-line-1.patchmeta/recipes-devtools/expect/expect/0001-fixline1-fix-line-1.patch new file +5
-0@@ -0,0 +1,31 @@ +From eef7c44c10de32ba399ab162cb5799fafdce3fa5 Mon Sep 17 00:00:00 2001 +From: Joe Slater <[email protected]> +Date: Tue, 15 Mar 2022 22:00:04 +0000 +Subject: [PATCH] fixline1: fix line 1 +
Quoted 8 lines
meta/recipes-devtools/expect/expect/0001-fixline1-fix-line-1.patch line 10
Quoted 5 lines
meta/recipes-devtools/expect/expect/0001-fixline1-fix-line-1.patch new file +5
-0+Ironically, fixline1 needs its first line modified by +fixline1. We do that, manually. + +Upstream-Status: Pending +This probably doesn't stand much chance of making it upstream so Pending should probably be "Inappropriate [OE specific cross build setup]"?
I changed this as it is easier than de-queuing and retesting!
Cheers,
Richard