diff options
| -rw-r--r-- | meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch | 26 | ||||
| -rw-r--r-- | meta-oe/recipes-support/htop/htop_2.2.0.bb | 4 |
2 files changed, 29 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch b/meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch new file mode 100644 index 0000000000..6153bdedbe --- /dev/null +++ b/meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | From 08aca4816cc798fce58b6235c26585a0063fa8af Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 26 Nov 2019 10:43:49 -0800 | ||
| 4 | Subject: [PATCH] Ask for python3 specifically | ||
| 5 | |||
| 6 | python2 is on its way out | ||
| 7 | |||
| 8 | Upstream-Status: Submitted [https://github.com/hishamhm/htop/pull/968] | ||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | --- | ||
| 11 | scripts/MakeHeader.py | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py | ||
| 15 | index 7c48fdd..7a7586d 100755 | ||
| 16 | --- a/scripts/MakeHeader.py | ||
| 17 | +++ b/scripts/MakeHeader.py | ||
| 18 | @@ -1,4 +1,4 @@ | ||
| 19 | -#!/usr/bin/env python | ||
| 20 | +#!/usr/bin/env python3 | ||
| 21 | import os, sys, string, io | ||
| 22 | try: | ||
| 23 | from StringIO import StringIO | ||
| 24 | -- | ||
| 25 | 2.24.0 | ||
| 26 | |||
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..64eb0c571f 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,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3" | |||
| 7 | DEPENDS = "ncurses" | 7 | DEPENDS = "ncurses" |
| 8 | 8 | ||
| 9 | SRC_URI = "http://hisham.hm/htop/releases/${PV}/${BP}.tar.gz \ | 9 | SRC_URI = "http://hisham.hm/htop/releases/${PV}/${BP}.tar.gz \ |
| 10 | file://0001-Use-pkg-config.patch" | 10 | file://0001-Use-pkg-config.patch \ |
| 11 | file://0001-Ask-for-python3-specifically.patch \ | ||
| 12 | " | ||
| 11 | SRC_URI[md5sum] = "0d816b6beed31edc75babcfbf863ffa8" | 13 | SRC_URI[md5sum] = "0d816b6beed31edc75babcfbf863ffa8" |
| 12 | SRC_URI[sha256sum] = "d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57" | 14 | SRC_URI[sha256sum] = "d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57" |
| 13 | 15 | ||
