| Message ID | 20191126210206.15650-1-ross.burton@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [oe] htop: use Python 3 | expand |
I had similar fix staged On Tue, Nov 26, 2019 at 1:02 PM Ross Burton <ross.burton@intel.com> wrote: > > Signed-off-by: Ross Burton <ross.burton@intel.com> > --- > meta-oe/recipes-support/htop/files/py3.patch | 15 +++++++++++++++ > meta-oe/recipes-support/htop/htop_2.2.0.bb | 3 ++- > 2 files changed, 17 insertions(+), 1 deletion(-) > create mode 100644 meta-oe/recipes-support/htop/files/py3.patch > > diff --git a/meta-oe/recipes-support/htop/files/py3.patch b/meta-oe/recipes-support/htop/files/py3.patch > new file mode 100644 > index 0000000000..fd28d51d5c > --- /dev/null > +++ b/meta-oe/recipes-support/htop/files/py3.patch > @@ -0,0 +1,15 @@ > +Use Python 3 explicitly instead of python, which we don't export to HOSTTOOL. > + > +Upstream-Status: Pending > +Signed-off-by: Ross Burton <ross.burton@intel.com> > + > +diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py > +index 349531b..3336dea 100755 > +--- a/scripts/MakeHeader.py > ++++ b/scripts/MakeHeader.py > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + import os, sys, string, io > + try: > + from StringIO import StringIO > diff --git a/meta-oe/recipes-support/htop/htop_2.2.0.bb b/meta-oe/recipes-support/htop/htop_2.2.0.bb > index 01c856d123..5724c5b8c6 100644 > --- a/meta-oe/recipes-support/htop/htop_2.2.0.bb > +++ b/meta-oe/recipes-support/htop/htop_2.2.0.bb > @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3" > DEPENDS = "ncurses" > > SRC_URI = "http://hisham.hm/htop/releases/${PV}/${BP}.tar.gz \ > - file://0001-Use-pkg-config.patch" > + file://0001-Use-pkg-config.patch \ > + file://py3.patch" > SRC_URI[md5sum] = "0d816b6beed31edc75babcfbf863ffa8" > SRC_URI[sha256sum] = "d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57" > > -- > 2.20.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff --git a/meta-oe/recipes-support/htop/files/py3.patch b/meta-oe/recipes-support/htop/files/py3.patch new file mode 100644 index 0000000000..fd28d51d5c --- /dev/null +++ b/meta-oe/recipes-support/htop/files/py3.patch @@ -0,0 +1,15 @@ +Use Python 3 explicitly instead of python, which we don't export to HOSTTOOL. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py +index 349531b..3336dea 100755 +--- a/scripts/MakeHeader.py ++++ b/scripts/MakeHeader.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + import os, sys, string, io + try: + from StringIO import StringIO diff --git a/meta-oe/recipes-support/htop/htop_2.2.0.bb b/meta-oe/recipes-support/htop/htop_2.2.0.bb index 01c856d123..5724c5b8c6 100644 --- a/meta-oe/recipes-support/htop/htop_2.2.0.bb +++ b/meta-oe/recipes-support/htop/htop_2.2.0.bb @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3" DEPENDS = "ncurses" SRC_URI = "http://hisham.hm/htop/releases/${PV}/${BP}.tar.gz \ - file://0001-Use-pkg-config.patch" + file://0001-Use-pkg-config.patch \ + file://py3.patch" SRC_URI[md5sum] = "0d816b6beed31edc75babcfbf863ffa8" SRC_URI[sha256sum] = "d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57"
Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta-oe/recipes-support/htop/files/py3.patch | 15 +++++++++++++++ meta-oe/recipes-support/htop/htop_2.2.0.bb | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/htop/files/py3.patch -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel