[33/36] expect: do not install examples, drop related patch

Message ID	20211117153525.257146-33-alex@linutronix.de
State	Accepted, archived
Commit	34f07b88167e0ee6499efbc53142ba0a8dcc3117
Headers	show Return-Path: <alex.kanavin@gmail.com> ip: 209.85.128.47, mailfrom: alex.kanavin@gmail.com) From: Alexander Kanavin <alex.kanavin@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin <alex@linutronix.de> Subject: [PATCH 33/36] expect: do not install examples, drop related patch Date: Wed, 17 Nov 2021 16:35:22 +0100 Message-Id: <20211117153525.257146-33-alex@linutronix.de> In-Reply-To: <20211117153525.257146-1-alex@linutronix.de> References: <20211117153525.257146-1-alex@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[01/36] ovmf: submit patch upstream \| expand [01/36] ovmf: submit patch upstream [02/36] groff: mark patch as non-upstreamable [03/36] logrotate: add a link to upstream review for one of the patch [04/36] weston: submit patch upstream [05/36] db: mark all patches as non-upstreamable [06/36] unzip/zip: mark all patches as non-upstreamable [07/36] automake: update 1.16.3 -> 1.16.5 [08/36] libunistring: address automake 1.16.5 failures [09/36] gettext: address automake 1.16.5 failures [10/36] ccache: upgrade 4.4.2 -> 4.5 [11/36] python3-hypothesis: upgrade 6.24.2 -> 6.24.3 [12/36] python3-pyparsing: upgrade 3.0.5 -> 3.0.6 [13/36] asciidoc: upgrade 10.0.1 -> 10.0.2 [14/36] libpipeline: upgrade 1.5.3 -> 1.5.4 [15/36] piglit: upgrade to latest revision [16/36] diffoscope: upgrade 190 -> 192 [17/36] systemd: upgrade 249.5 -> 249.6 [18/36] xwayland: upgrade 21.1.2 -> 21.1.3 [19/36] curl: update 7.79.1 -> 7.80.0 [20/36] librsvg: update 2.52.3 -> 2.52.4 [21/36] librstd-rs: submit patches upstream [22/36] elfutils: update 0.185 -> 0.186 [23/36] libsamplerate0: update 0.1.9 -> 0.2.2 [24/36] patches: correct whitespace/spelling for Upstream-Status tags [25/36] autoconf: add missing Upstream-Status to patches [26/36] libxml2: add missing Upstream-Status tag [27/36] unfs3: add missing Upstream-Status tag [28/36] libnl: add missing Upstream-Status tag [29/36] kea: add missing Upstream-Status to a patch [30/36] rust-hello-world: add missing Upstream-Status to a patch [31/36] numactl: add missing Upstream-Status to a patch [32/36] insane.bbclass: add a check that Upstream-Status patch tag is present and correctly formed [33/36] expect: do not install examples, drop related patch [34/36] busybox: drop 0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch [35/36] slang: mark patch as inappropriate for upstream submission [36/36] librsvg: submit system-deps patch upstream

Message ID

20211117153525.257146-33-alex@linutronix.de

State

Accepted, archived

Commit

34f07b88167e0ee6499efbc53142ba0a8dcc3117

Headers

From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH 33/36] expect: do not install examples, drop related patch
Date: Wed, 17 Nov 2021 16:35:22 +0100
Message-Id: <20211117153525.257146-33-alex@linutronix.de>
In-Reply-To: <20211117153525.257146-1-alex@linutronix.de>
References: <20211117153525.257146-1-alex@linutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[01/36] ovmf: submit patch upstream | expand

Commit Message

Alexander Kanavin Nov. 17, 2021, 3:35 p.m. UTC

There is really no reason to install them; this was done
in the original recipe submission for unexplained reasons.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../expect/expect/01-example-shebang.patch    | 144 ------------------
 meta/recipes-devtools/expect/expect_5.45.4.bb |   2 -
 2 files changed, 146 deletions(-)
 delete mode 100644 meta/recipes-devtools/expect/expect/01-example-shebang.patch

Comments

Khem Raj Nov. 17, 2021, 7:05 p.m. UTC | #1

On 11/17/21 7:35 AM, Alexander Kanavin wrote:
> There is really no reason to install them; this was done
> in the original recipe submission for unexplained reasons.

yes perhaps as part of main PN package its not but as a separate package 
something like PN-examples or some such it will be better

> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>   .../expect/expect/01-example-shebang.patch    | 144 ------------------
>   meta/recipes-devtools/expect/expect_5.45.4.bb |   2 -
>   2 files changed, 146 deletions(-)
>   delete mode 100644 meta/recipes-devtools/expect/expect/01-example-shebang.patch
> 
> diff --git a/meta/recipes-devtools/expect/expect/01-example-shebang.patch b/meta/recipes-devtools/expect/expect/01-example-shebang.patch
> deleted file mode 100644
> index 8597f31387..0000000000
> --- a/meta/recipes-devtools/expect/expect/01-example-shebang.patch
> +++ /dev/null
> @@ -1,144 +0,0 @@
> -Author: Mike Markley <mike@markley.org>
> -Author: Sergei Golovan <sgolovan@debian.org>
> -Description: Fixes shebangs in examples (Closes: #152367).
> -
> -Backported from Debian
> -
> -Upstream-Status: Pending
> -Index: expect5.45/example/beer.exp
> -===================================================================
> ---- expect5.45.orig/example/beer.exp	2006-01-25 13:51:39.000000000 -0800
> -+++ expect5.45/example/beer.exp	2013-11-01 17:35:19.817318341 -0700
> -@@ -1,4 +1,9 @@
> --#!/depot/path/expect -f
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -
> - # 99 bottles of beer on the wall, Expect-style
> - # Author: Don Libes <libes@nist.gov>
> -Index: expect5.45/example/expectd.proto
> -===================================================================
> ---- expect5.45.orig/example/expectd.proto	2010-07-02 09:03:31.000000000 -0700
> -+++ expect5.45/example/expectd.proto	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,10 @@
> --#!/depot/tcl/src/expect/e --
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -+
> - # Description: Simple fragment to begin a telnet daemon
> - # For more information, see Chapter 17 of "Exploring Expect"
> - # Author: Don Libes, NIST
> -Index: expect5.45/example/irsh
> -===================================================================
> ---- expect5.45.orig/example/irsh	2010-07-02 09:03:31.000000000 -0700
> -+++ expect5.45/example/irsh	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,9 @@
> --#!/depot/path/expect --
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -
> - # Do rsh interactively.  For example, consider the following command:
> - #    rsh <remote> ls -l "|" more
> -Index: expect5.45/example/passwd.cgi
> -===================================================================
> ---- expect5.45.orig/example/passwd.cgi	2000-01-06 15:22:07.000000000 -0800
> -+++ expect5.45/example/passwd.cgi	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,9 @@
> --#!/depot/path/expect --
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -
> - # This is a CGI script to process requests created by the accompanying
> - # passwd.html form.  This script is pretty basic, although it is
> -Index: expect5.45/example/passwdprompt
> -===================================================================
> ---- expect5.45.orig/example/passwdprompt	2003-09-05 12:01:59.000000000 -0700
> -+++ expect5.45/example/passwdprompt	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,9 @@
> --#!/depot/path/expect
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -
> - # This script prompts for a passwd from stdin while echoing *'s
> -
> -Index: expect5.45/example/reprompt
> -===================================================================
> ---- expect5.45.orig/example/reprompt	2000-01-06 15:22:07.000000000 -0800
> -+++ expect5.45/example/reprompt	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,9 @@
> --#!/depot/path/expect --
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -
> - # Name: reprompt
> - # Description: reprompt every so often until user enters something
> -Index: expect5.45/example/term_expect
> -===================================================================
> ---- expect5.45.orig/example/term_expect	2005-02-15 10:11:31.000000000 -0800
> -+++ expect5.45/example/term_expect	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,9 @@
> --#!/depot/path/expectk
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec wish "$0" ${1+"$@"}
> -+
> -+package require Expect
> -
> - # Name: tkterm - terminal emulator using Expect and Tk text widget, v3.0
> - # Author: Don Libes, July '94
> -Index: expect5.45/example/vrfy
> -===================================================================
> ---- expect5.45.orig/example/vrfy	2010-07-02 09:03:31.000000000 -0700
> -+++ expect5.45/example/vrfy	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,9 @@
> --#!/depot/path/expect -f
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -
> -
> - # separate address into user and host
> -Index: expect5.45/example/xrlogin
> -===================================================================
> ---- expect5.45.orig/example/xrlogin	2000-01-06 15:22:08.000000000 -0800
> -+++ expect5.45/example/xrlogin	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,10 @@
> --#!/depot/path/expect --
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -+
> - # xrlogin - rlogin but with current DISPLAY
> - #
> - # You can extend this idea to save any arbitrary information across rlogin
> diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb
> index e27b0d9d71..4214ab0f27 100644
> --- a/meta/recipes-devtools/expect/expect_5.45.4.bb
> +++ b/meta/recipes-devtools/expect/expect_5.45.4.bb
> @@ -21,7 +21,6 @@ inherit autotools update-alternatives
>   SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
>              file://0001-configure.in.patch \
>              file://0002-tcl.m4.patch \
> -           file://01-example-shebang.patch \
>              file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \
>              file://0001-Resolve-string-formatting-issues.patch \
>              file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \
> @@ -39,7 +38,6 @@ do_install:append() {
>   	install -d ${D}${libdir}
>           install -m 0755 ${D}${libdir}/expect${PV}/libexpect*.so   ${D}${libdir}/
>           install -m 0755 ${S}/fixline1           ${D}${libdir}/expect${PV}/
> -        install -m 0755 ${S}/example/*          ${D}${libdir}/expect${PV}/
>           rm ${D}${libdir}/expect${PV}/libexpect*.so
>           sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl
>   }
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#158428): https://lists.openembedded.org/g/openembedded-core/message/158428
> Mute This Topic: https://lists.openembedded.org/mt/87122010/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Alexander Kanavin Nov. 17, 2021, 10 p.m. UTC | #2

On Wed, 17 Nov 2021 at 20:05, Khem Raj <raj.khem@gmail.com> wrote:

> yes perhaps as part of main PN package its not but as a separate package
> something like PN-examples or some such it will be better
>

If upstream doesn't install them, there's no need to override that; they're
just example code snippets that serve no purpose on embedded targets.

Alex



>
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >   .../expect/expect/01-example-shebang.patch    | 144 ------------------
> >   meta/recipes-devtools/expect/expect_5.45.4.bb |   2 -
> >   2 files changed, 146 deletions(-)
> >   delete mode 100644
> meta/recipes-devtools/expect/expect/01-example-shebang.patch
> >
> > diff --git
> a/meta/recipes-devtools/expect/expect/01-example-shebang.patch
> b/meta/recipes-devtools/expect/expect/01-example-shebang.patch
> > deleted file mode 100644
> > index 8597f31387..0000000000
> > --- a/meta/recipes-devtools/expect/expect/01-example-shebang.patch
> > +++ /dev/null
> > @@ -1,144 +0,0 @@
> > -Author: Mike Markley <mike@markley.org>
> > -Author: Sergei Golovan <sgolovan@debian.org>
> > -Description: Fixes shebangs in examples (Closes: #152367).
> > -
> > -Backported from Debian
> > -
> > -Upstream-Status: Pending
> > -Index: expect5.45/example/beer.exp
> > -===================================================================
> > ---- expect5.45.orig/example/beer.exp 2006-01-25 13:51:39.000000000 -0800
> > -+++ expect5.45/example/beer.exp      2013-11-01 17:35:19.817318341 -0700
> > -@@ -1,4 +1,9 @@
> > --#!/depot/path/expect -f
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -
> > - # 99 bottles of beer on the wall, Expect-style
> > - # Author: Don Libes <libes@nist.gov>
> > -Index: expect5.45/example/expectd.proto
> > -===================================================================
> > ---- expect5.45.orig/example/expectd.proto    2010-07-02
> 09:03:31.000000000 -0700
> > -+++ expect5.45/example/expectd.proto 2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,10 @@
> > --#!/depot/tcl/src/expect/e --
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -+
> > - # Description: Simple fragment to begin a telnet daemon
> > - # For more information, see Chapter 17 of "Exploring Expect"
> > - # Author: Don Libes, NIST
> > -Index: expect5.45/example/irsh
> > -===================================================================
> > ---- expect5.45.orig/example/irsh     2010-07-02 09:03:31.000000000 -0700
> > -+++ expect5.45/example/irsh  2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,9 @@
> > --#!/depot/path/expect --
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -
> > - # Do rsh interactively.  For example, consider the following command:
> > - #    rsh <remote> ls -l "|" more
> > -Index: expect5.45/example/passwd.cgi
> > -===================================================================
> > ---- expect5.45.orig/example/passwd.cgi       2000-01-06
> 15:22:07.000000000 -0800
> > -+++ expect5.45/example/passwd.cgi    2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,9 @@
> > --#!/depot/path/expect --
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -
> > - # This is a CGI script to process requests created by the accompanying
> > - # passwd.html form.  This script is pretty basic, although it is
> > -Index: expect5.45/example/passwdprompt
> > -===================================================================
> > ---- expect5.45.orig/example/passwdprompt     2003-09-05
> 12:01:59.000000000 -0700
> > -+++ expect5.45/example/passwdprompt  2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,9 @@
> > --#!/depot/path/expect
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -
> > - # This script prompts for a passwd from stdin while echoing *'s
> > -
> > -Index: expect5.45/example/reprompt
> > -===================================================================
> > ---- expect5.45.orig/example/reprompt 2000-01-06 15:22:07.000000000 -0800
> > -+++ expect5.45/example/reprompt      2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,9 @@
> > --#!/depot/path/expect --
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -
> > - # Name: reprompt
> > - # Description: reprompt every so often until user enters something
> > -Index: expect5.45/example/term_expect
> > -===================================================================
> > ---- expect5.45.orig/example/term_expect      2005-02-15
> 10:11:31.000000000 -0800
> > -+++ expect5.45/example/term_expect   2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,9 @@
> > --#!/depot/path/expectk
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec wish "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -
> > - # Name: tkterm - terminal emulator using Expect and Tk text widget,
> v3.0
> > - # Author: Don Libes, July '94
> > -Index: expect5.45/example/vrfy
> > -===================================================================
> > ---- expect5.45.orig/example/vrfy     2010-07-02 09:03:31.000000000 -0700
> > -+++ expect5.45/example/vrfy  2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,9 @@
> > --#!/depot/path/expect -f
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -
> > -
> > - # separate address into user and host
> > -Index: expect5.45/example/xrlogin
> > -===================================================================
> > ---- expect5.45.orig/example/xrlogin  2000-01-06 15:22:08.000000000 -0800
> > -+++ expect5.45/example/xrlogin       2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,10 @@
> > --#!/depot/path/expect --
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -+
> > - # xrlogin - rlogin but with current DISPLAY
> > - #
> > - # You can extend this idea to save any arbitrary information across
> rlogin
> > diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb
> b/meta/recipes-devtools/expect/expect_5.45.4.bb
> > index e27b0d9d71..4214ab0f27 100644
> > --- a/meta/recipes-devtools/expect/expect_5.45.4.bb
> > +++ b/meta/recipes-devtools/expect/expect_5.45.4.bb
> > @@ -21,7 +21,6 @@ inherit autotools update-alternatives
> >   SRC_URI =
> "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
> >              file://0001-configure.in.patch \
> >              file://0002-tcl.m4.patch \
> > -           file://01-example-shebang.patch \
> >
> file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \
> >              file://0001-Resolve-string-formatting-issues.patch \
> >
> file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \
> > @@ -39,7 +38,6 @@ do_install:append() {
> >       install -d ${D}${libdir}
> >           install -m 0755 ${D}${libdir}/expect${PV}/libexpect*.so
>  ${D}${libdir}/
> >           install -m 0755 ${S}/fixline1
>  ${D}${libdir}/expect${PV}/
> > -        install -m 0755 ${S}/example/*
> ${D}${libdir}/expect${PV}/
> >           rm ${D}${libdir}/expect${PV}/libexpect*.so
> >           sed -e 's|$dir|${libdir}|' -i
> ${D}${libdir}/expect${PV}/pkgIndex.tcl
> >   }
> >
> >
> >
> >
> >
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#158455):
> https://lists.openembedded.org/g/openembedded-core/message/158455
> Mute This Topic: https://lists.openembedded.org/mt/87122010/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

Khem Raj Nov. 17, 2021, 11:09 p.m. UTC | #3

On Wed, Nov 17, 2021 at 2:00 PM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> On Wed, 17 Nov 2021 at 20:05, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> yes perhaps as part of main PN package its not but as a separate package
>> something like PN-examples or some such it will be better
>
>
> If upstream doesn't install them, there's no need to override that; they're just example code snippets that serve no purpose on embedded targets.
>

Yes examples perhaps can be removed, thats perhaps fine, atleast its
clear change if someone needs to re-introduce it.
separately when looking at code I do see examples/ as folder being
referenced for EXECSCRIPTDIR and SCRIPTDIR in exp_main_sub.c
 that sounds interesting, hopefully not an issue but worth checking

> Alex
>
>
>>
>>
>> >
>> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>> > ---
>> >   .../expect/expect/01-example-shebang.patch    | 144 ------------------
>> >   meta/recipes-devtools/expect/expect_5.45.4.bb |   2 -
>> >   2 files changed, 146 deletions(-)
>> >   delete mode 100644 meta/recipes-devtools/expect/expect/01-example-shebang.patch
>> >
>> > diff --git a/meta/recipes-devtools/expect/expect/01-example-shebang.patch b/meta/recipes-devtools/expect/expect/01-example-shebang.patch
>> > deleted file mode 100644
>> > index 8597f31387..0000000000
>> > --- a/meta/recipes-devtools/expect/expect/01-example-shebang.patch
>> > +++ /dev/null
>> > @@ -1,144 +0,0 @@
>> > -Author: Mike Markley <mike@markley.org>
>> > -Author: Sergei Golovan <sgolovan@debian.org>
>> > -Description: Fixes shebangs in examples (Closes: #152367).
>> > -
>> > -Backported from Debian
>> > -
>> > -Upstream-Status: Pending
>> > -Index: expect5.45/example/beer.exp
>> > -===================================================================
>> > ---- expect5.45.orig/example/beer.exp 2006-01-25 13:51:39.000000000 -0800
>> > -+++ expect5.45/example/beer.exp      2013-11-01 17:35:19.817318341 -0700
>> > -@@ -1,4 +1,9 @@
>> > --#!/depot/path/expect -f
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -
>> > - # 99 bottles of beer on the wall, Expect-style
>> > - # Author: Don Libes <libes@nist.gov>
>> > -Index: expect5.45/example/expectd.proto
>> > -===================================================================
>> > ---- expect5.45.orig/example/expectd.proto    2010-07-02 09:03:31.000000000 -0700
>> > -+++ expect5.45/example/expectd.proto 2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,10 @@
>> > --#!/depot/tcl/src/expect/e --
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -+
>> > - # Description: Simple fragment to begin a telnet daemon
>> > - # For more information, see Chapter 17 of "Exploring Expect"
>> > - # Author: Don Libes, NIST
>> > -Index: expect5.45/example/irsh
>> > -===================================================================
>> > ---- expect5.45.orig/example/irsh     2010-07-02 09:03:31.000000000 -0700
>> > -+++ expect5.45/example/irsh  2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,9 @@
>> > --#!/depot/path/expect --
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -
>> > - # Do rsh interactively.  For example, consider the following command:
>> > - #    rsh <remote> ls -l "|" more
>> > -Index: expect5.45/example/passwd.cgi
>> > -===================================================================
>> > ---- expect5.45.orig/example/passwd.cgi       2000-01-06 15:22:07.000000000 -0800
>> > -+++ expect5.45/example/passwd.cgi    2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,9 @@
>> > --#!/depot/path/expect --
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -
>> > - # This is a CGI script to process requests created by the accompanying
>> > - # passwd.html form.  This script is pretty basic, although it is
>> > -Index: expect5.45/example/passwdprompt
>> > -===================================================================
>> > ---- expect5.45.orig/example/passwdprompt     2003-09-05 12:01:59.000000000 -0700
>> > -+++ expect5.45/example/passwdprompt  2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,9 @@
>> > --#!/depot/path/expect
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -
>> > - # This script prompts for a passwd from stdin while echoing *'s
>> > -
>> > -Index: expect5.45/example/reprompt
>> > -===================================================================
>> > ---- expect5.45.orig/example/reprompt 2000-01-06 15:22:07.000000000 -0800
>> > -+++ expect5.45/example/reprompt      2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,9 @@
>> > --#!/depot/path/expect --
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -
>> > - # Name: reprompt
>> > - # Description: reprompt every so often until user enters something
>> > -Index: expect5.45/example/term_expect
>> > -===================================================================
>> > ---- expect5.45.orig/example/term_expect      2005-02-15 10:11:31.000000000 -0800
>> > -+++ expect5.45/example/term_expect   2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,9 @@
>> > --#!/depot/path/expectk
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec wish "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -
>> > - # Name: tkterm - terminal emulator using Expect and Tk text widget, v3.0
>> > - # Author: Don Libes, July '94
>> > -Index: expect5.45/example/vrfy
>> > -===================================================================
>> > ---- expect5.45.orig/example/vrfy     2010-07-02 09:03:31.000000000 -0700
>> > -+++ expect5.45/example/vrfy  2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,9 @@
>> > --#!/depot/path/expect -f
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -
>> > -
>> > - # separate address into user and host
>> > -Index: expect5.45/example/xrlogin
>> > -===================================================================
>> > ---- expect5.45.orig/example/xrlogin  2000-01-06 15:22:08.000000000 -0800
>> > -+++ expect5.45/example/xrlogin       2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,10 @@
>> > --#!/depot/path/expect --
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -+
>> > - # xrlogin - rlogin but with current DISPLAY
>> > - #
>> > - # You can extend this idea to save any arbitrary information across rlogin
>> > diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb
>> > index e27b0d9d71..4214ab0f27 100644
>> > --- a/meta/recipes-devtools/expect/expect_5.45.4.bb
>> > +++ b/meta/recipes-devtools/expect/expect_5.45.4.bb
>> > @@ -21,7 +21,6 @@ inherit autotools update-alternatives
>> >   SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
>> >              file://0001-configure.in.patch \
>> >              file://0002-tcl.m4.patch \
>> > -           file://01-example-shebang.patch \
>> >              file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \
>> >              file://0001-Resolve-string-formatting-issues.patch \
>> >              file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \
>> > @@ -39,7 +38,6 @@ do_install:append() {
>> >       install -d ${D}${libdir}
>> >           install -m 0755 ${D}${libdir}/expect${PV}/libexpect*.so   ${D}${libdir}/
>> >           install -m 0755 ${S}/fixline1           ${D}${libdir}/expect${PV}/
>> > -        install -m 0755 ${S}/example/*          ${D}${libdir}/expect${PV}/
>> >           rm ${D}${libdir}/expect${PV}/libexpect*.so
>> >           sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl
>> >   }
>> >
>> >
>> >
>> >
>> >
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#158455): https://lists.openembedded.org/g/openembedded-core/message/158455
>> Mute This Topic: https://lists.openembedded.org/mt/87122010/1686489
>> Group Owner: openembedded-core+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>

diff --git a/meta/recipes-devtools/expect/expect/01-example-shebang.patch b/meta/recipes-devtools/expect/expect/01-example-shebang.patch
deleted file mode 100644
index 8597f31387..0000000000
--- a/meta/recipes-devtools/expect/expect/01-example-shebang.patch
+++ /dev/null
@@ -1,144 +0,0 @@ 
-Author: Mike Markley <mike@markley.org>
-Author: Sergei Golovan <sgolovan@debian.org>
-Description: Fixes shebangs in examples (Closes: #152367).
-
-Backported from Debian
-
-Upstream-Status: Pending
-Index: expect5.45/example/beer.exp
-===================================================================
---- expect5.45.orig/example/beer.exp	2006-01-25 13:51:39.000000000 -0800
-+++ expect5.45/example/beer.exp	2013-11-01 17:35:19.817318341 -0700
-@@ -1,4 +1,9 @@
--#!/depot/path/expect -f
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
- 
- # 99 bottles of beer on the wall, Expect-style
- # Author: Don Libes <libes@nist.gov>
-Index: expect5.45/example/expectd.proto
-===================================================================
---- expect5.45.orig/example/expectd.proto	2010-07-02 09:03:31.000000000 -0700
-+++ expect5.45/example/expectd.proto	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,10 @@
--#!/depot/tcl/src/expect/e --
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
-+
- # Description: Simple fragment to begin a telnet daemon
- # For more information, see Chapter 17 of "Exploring Expect"
- # Author: Don Libes, NIST
-Index: expect5.45/example/irsh
-===================================================================
---- expect5.45.orig/example/irsh	2010-07-02 09:03:31.000000000 -0700
-+++ expect5.45/example/irsh	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,9 @@
--#!/depot/path/expect --
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
- 
- # Do rsh interactively.  For example, consider the following command:
- #    rsh <remote> ls -l "|" more
-Index: expect5.45/example/passwd.cgi
-===================================================================
---- expect5.45.orig/example/passwd.cgi	2000-01-06 15:22:07.000000000 -0800
-+++ expect5.45/example/passwd.cgi	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,9 @@
--#!/depot/path/expect --
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
- 
- # This is a CGI script to process requests created by the accompanying
- # passwd.html form.  This script is pretty basic, although it is
-Index: expect5.45/example/passwdprompt
-===================================================================
---- expect5.45.orig/example/passwdprompt	2003-09-05 12:01:59.000000000 -0700
-+++ expect5.45/example/passwdprompt	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,9 @@
--#!/depot/path/expect
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
- 
- # This script prompts for a passwd from stdin while echoing *'s
- 
-Index: expect5.45/example/reprompt
-===================================================================
---- expect5.45.orig/example/reprompt	2000-01-06 15:22:07.000000000 -0800
-+++ expect5.45/example/reprompt	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,9 @@
--#!/depot/path/expect --
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
- 
- # Name: reprompt
- # Description: reprompt every so often until user enters something
-Index: expect5.45/example/term_expect
-===================================================================
---- expect5.45.orig/example/term_expect	2005-02-15 10:11:31.000000000 -0800
-+++ expect5.45/example/term_expect	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,9 @@
--#!/depot/path/expectk
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec wish "$0" ${1+"$@"}
-+
-+package require Expect
- 
- # Name: tkterm - terminal emulator using Expect and Tk text widget, v3.0
- # Author: Don Libes, July '94
-Index: expect5.45/example/vrfy
-===================================================================
---- expect5.45.orig/example/vrfy	2010-07-02 09:03:31.000000000 -0700
-+++ expect5.45/example/vrfy	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,9 @@
--#!/depot/path/expect -f
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
- 
- 
- # separate address into user and host
-Index: expect5.45/example/xrlogin
-===================================================================
---- expect5.45.orig/example/xrlogin	2000-01-06 15:22:08.000000000 -0800
-+++ expect5.45/example/xrlogin	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,10 @@
--#!/depot/path/expect --
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
-+
- # xrlogin - rlogin but with current DISPLAY
- #
- # You can extend this idea to save any arbitrary information across rlogin
diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb
index e27b0d9d71..4214ab0f27 100644
--- a/meta/recipes-devtools/expect/expect_5.45.4.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.4.bb
@@ -21,7 +21,6 @@  inherit autotools update-alternatives
 SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
            file://0001-configure.in.patch \
            file://0002-tcl.m4.patch \
-           file://01-example-shebang.patch \
            file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \
            file://0001-Resolve-string-formatting-issues.patch \
            file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \
@@ -39,7 +38,6 @@  do_install:append() {
 	install -d ${D}${libdir}
         install -m 0755 ${D}${libdir}/expect${PV}/libexpect*.so   ${D}${libdir}/
         install -m 0755 ${S}/fixline1           ${D}${libdir}/expect${PV}/
-        install -m 0755 ${S}/example/*          ${D}${libdir}/expect${PV}/
         rm ${D}${libdir}/expect${PV}/libexpect*.so
         sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl
 }

[33/36] expect: do not install examples, drop related patch

Commit Message

Comments

Patch