| Message ID | 20220315224537.5956-1-joe.slater@windriver.com |
|---|---|
| State | Accepted, archived |
| Commit | 0829d4f2947be2b095e7e713b5100f4e41218bec |
| Headers | show |
| Series | [1/1] expect: modify fixline1 script | expand |
On Tue, 2022-03-15 at 15:45 -0700, Joe Slater wrote: > 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> > --- > .../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 > > 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..d6f5d7ff0e > --- /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: 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
On Wed, 2022-03-16 at 08:40 +0000, Richard Purdie via lists.openembedded.org wrote: > On Tue, 2022-03-15 at 15:45 -0700, Joe Slater wrote: > > 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> > > --- > > .../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 > > > > 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..d6f5d7ff0e > > --- /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: 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
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..d6f5d7ff0e --- /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: Pending + +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"
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> --- .../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