* [ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0
@ 2018-04-10 15:14 Roland Hieber
2018-04-10 15:34 ` Bastian Stender
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Roland Hieber @ 2018-04-10 15:14 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
rules/htop.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/htop.make b/rules/htop.make
index 4d3505f29..eff67cdda 100644
--- a/rules/htop.make
+++ b/rules/htop.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
#
# Paths and names
#
-HTOP_VERSION := 2.1.0
-HTOP_MD5 := f262b66ad6c194782f4d3a80627e84c8
+HTOP_VERSION := 2.2.0
+HTOP_MD5 := 0d816b6beed31edc75babcfbf863ffa8
HTOP := htop-$(HTOP_VERSION)
HTOP_SUFFIX := tar.gz
HTOP_URL := http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0
2018-04-10 15:14 [ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0 Roland Hieber
@ 2018-04-10 15:34 ` Bastian Stender
2018-04-11 6:56 ` Alexander Dahl
2018-04-15 19:17 ` [ptxdist] [PATCH v2] " Roland Hieber
2018-04-18 8:28 ` [ptxdist] [PATCH v3] " Roland Hieber
2 siblings, 1 reply; 9+ messages in thread
From: Bastian Stender @ 2018-04-10 15:34 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist
Hi,
On 04/10/2018 05:14 PM, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
> ---
> rules/htop.make | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/rules/htop.make b/rules/htop.make
> index 4d3505f29..eff67cdda 100644
> --- a/rules/htop.make
> +++ b/rules/htop.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
> #
> # Paths and names
> #
> -HTOP_VERSION := 2.1.0
> -HTOP_MD5 := f262b66ad6c194782f4d3a80627e84c8
> +HTOP_VERSION := 2.2.0
> +HTOP_MD5 := 0d816b6beed31edc75babcfbf863ffa8
> HTOP := htop-$(HTOP_VERSION)
> HTOP_SUFFIX := tar.gz
> HTOP_URL := http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)
>
There are patches on top of htop 2.1.0. You should port them or drop
them as needed.
Regards,
Bastian
--
Pengutronix e.K.
Industrial Linux Solutions
http://www.pengutronix.de/
Peiner Str. 6-8, 31137 Hildesheim, Germany
Amtsgericht Hildesheim, HRA 2686
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0
2018-04-10 15:34 ` Bastian Stender
@ 2018-04-11 6:56 ` Alexander Dahl
2018-04-11 7:36 ` Michael Olbrich
2018-04-11 8:49 ` Roland Hieber
0 siblings, 2 replies; 9+ messages in thread
From: Alexander Dahl @ 2018-04-11 6:56 UTC (permalink / raw)
To: ptxdist, Roland Hieber
Hei hei,
Am Dienstag, 10. April 2018, 17:34:09 CEST schrieb Bastian Stender:
> There are patches on top of htop 2.1.0. You should port them or drop
> them as needed.
FWIW …
0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch was applied
upstream.
0002-configure-check-for-ncurses-with-ncurses6-config.patch applies cleanly to
htop 2.2.0, but I'm not sure it's needed, they changed ncurses CFLAGS use in
upstream commit bc5d46982f3504000567e00f59e4f7a5905597a9, maybe more info on
that in #695 [1] and #745 [2]. Also they fixed things with pkg-config, so I'm
not sure if it is really needed anymore. Maybe see the discussions about
ncurses6 earlier this year on this list or the commit introducing that patch
(74ffd1f57d0d68a89183ea2bf47c0cd67a989520).
HTH & Greets
Alex
[1] https://github.com/hishamhm/htop/issues/695
[2] https://github.com/hishamhm/htop/pull/745
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0
2018-04-11 6:56 ` Alexander Dahl
@ 2018-04-11 7:36 ` Michael Olbrich
2018-04-11 8:49 ` Roland Hieber
1 sibling, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2018-04-11 7:36 UTC (permalink / raw)
To: ptxdist
Hi,
On Wed, Apr 11, 2018 at 08:56:02AM +0200, Alexander Dahl wrote:
> Am Dienstag, 10. April 2018, 17:34:09 CEST schrieb Bastian Stender:
> > There are patches on top of htop 2.1.0. You should port them or drop
> > them as needed.
>
> FWIW …
>
> 0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch was applied
> upstream.
>
> 0002-configure-check-for-ncurses-with-ncurses6-config.patch applies cleanly to
> htop 2.2.0, but I'm not sure it's needed, they changed ncurses CFLAGS use in
> upstream commit bc5d46982f3504000567e00f59e4f7a5905597a9, maybe more info on
> that in #695 [1] and #745 [2]. Also they fixed things with pkg-config, so I'm
> not sure if it is really needed anymore. Maybe see the discussions about
> ncurses6 earlier this year on this list or the commit introducing that patch
> (74ffd1f57d0d68a89183ea2bf47c0cd67a989520).
The problem is, that configure looks for libncurses6 with ncurses6-config.
We don't have that combination. The fallback is ncurses5-config. That may
be picked up from the system, which is bad.
HTOP_NCURSES_CONFIG_SCRIPT=ncurses6-config in the _CONF_ENV should work
instead of the patch.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0
2018-04-11 6:56 ` Alexander Dahl
2018-04-11 7:36 ` Michael Olbrich
@ 2018-04-11 8:49 ` Roland Hieber
1 sibling, 0 replies; 9+ messages in thread
From: Roland Hieber @ 2018-04-11 8:49 UTC (permalink / raw)
To: ptxdist
Ah, thank you for reminding me. It builds fine without the patches, but
I will send v2 nevertheless to delete them.
- Roland
On Wed, Apr 11, 2018 at 08:56:02AM +0200, Alexander Dahl wrote:
> Hei hei,
>
> Am Dienstag, 10. April 2018, 17:34:09 CEST schrieb Bastian Stender:
> > There are patches on top of htop 2.1.0. You should port them or drop
> > them as needed.
>
> FWIW …
>
> 0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch was applied
> upstream.
>
> 0002-configure-check-for-ncurses-with-ncurses6-config.patch applies cleanly to
> htop 2.2.0, but I'm not sure it's needed, they changed ncurses CFLAGS use in
> upstream commit bc5d46982f3504000567e00f59e4f7a5905597a9, maybe more info on
> that in #695 [1] and #745 [2]. Also they fixed things with pkg-config, so I'm
> not sure if it is really needed anymore. Maybe see the discussions about
> ncurses6 earlier this year on this list or the commit introducing that patch
> (74ffd1f57d0d68a89183ea2bf47c0cd67a989520).
>
> HTH & Greets
> Alex
>
> [1] https://github.com/hishamhm/htop/issues/695
> [2] https://github.com/hishamhm/htop/pull/745
>
>
--
Roland Hieber | r.hieber@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread
* [ptxdist] [PATCH v2] htop: version bump 2.1.0 -> 2.2.0
2018-04-10 15:14 [ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0 Roland Hieber
2018-04-10 15:34 ` Bastian Stender
@ 2018-04-15 19:17 ` Roland Hieber
2018-04-16 15:39 ` Michael Olbrich
2018-04-17 8:10 ` Ladislav Michl
2018-04-18 8:28 ` [ptxdist] [PATCH v3] " Roland Hieber
2 siblings, 2 replies; 9+ messages in thread
From: Roland Hieber @ 2018-04-15 19:17 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Removed all patches:
- 0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch:
applied upstream in https://github.com/hishamhm/htop/commit/70ed51a303
- 0002-configure-check-for-ncurses-with-ncurses6-config.patch:
replaced by setting HTOP_NCURSES_CONFIG_SCRIPT=ncurses6-config in
HTOP_CONF_ENV
Fixes: 74ffd1f57d0d68a8918 ("htop: fix configure to discover ncurses6")
Cc: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
v2:
- take care of the patches
- set HTOP_NCURSES_CONFIG_SCRIPT. This is functionally equivalent to
Ladislav's 0002.patch, but I prefer setting a small variable in
htop.make to a configure.ac patch.
---
...ProcessList-fix-reading-of-number-of-read.patch | 28 ----------------------
...re-check-for-ncurses-with-ncurses6-config.patch | 20 ----------------
patches/htop-2.1.0/autogen.sh | 1 -
patches/htop-2.1.0/series | 5 ----
rules/htop.make | 5 ++--
5 files changed, 3 insertions(+), 56 deletions(-)
delete mode 100644 patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
delete mode 100644 patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch
delete mode 120000 patches/htop-2.1.0/autogen.sh
delete mode 100644 patches/htop-2.1.0/series
diff --git a/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch b/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
deleted file mode 100644
index e1267a32a..000000000
--- a/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Wed, 7 Feb 2018 23:16:37 +0100
-Subject: [PATCH] linux/LinuxProcessList: fix reading of number of read
- syscalls of process
-
-The "if" tests if the character at index "5" is 'r', as a first quick
-check. However at index "5" will always be a colon ":". This patch fixes
-the off-by-one error. htop now shows proper values in the RD_SYSC
-column.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- linux/LinuxProcessList.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
-index 6f2631afa12f..230770258084 100644
---- a/linux/LinuxProcessList.c
-+++ b/linux/LinuxProcessList.c
-@@ -436,7 +436,7 @@ static void LinuxProcessList_readIoFile(LinuxProcess* process, const char* dirna
- }
- break;
- case 's':
-- if (line[5] == 'r' && strncmp(line+1, "yscr: ", 6) == 0) {
-+ if (line[4] == 'r' && strncmp(line+1, "yscr: ", 6) == 0) {
- process->io_syscr = strtoull(line+7, NULL, 10);
- } else if (strncmp(line+1, "yscw: ", 6) == 0) {
- process->io_syscw = strtoull(line+7, NULL, 10);
diff --git a/patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch b/patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch
deleted file mode 100644
index 04714a4bb..000000000
--- a/patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- htop-2.1.0/configure.ac.orig 2018-02-27 11:23:08.615702344 +0100
-+++ htop-2.1.0/configure.ac 2018-02-27 11:24:21.287425809 +0100
-@@ -202,11 +202,12 @@
- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
- else
- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
-- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
-- HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
-- HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
-- missing_libraries="$missing_libraries libncurses"
-- ))))
-+ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
-+ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
-+ HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
-+ HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
-+ missing_libraries="$missing_libraries libncurses"
-+ )))))
-
- AC_CHECK_HEADERS([curses.h],[:],
- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
diff --git a/patches/htop-2.1.0/autogen.sh b/patches/htop-2.1.0/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/htop-2.1.0/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/htop-2.1.0/series b/patches/htop-2.1.0/series
deleted file mode 100644
index 87b59abe7..000000000
--- a/patches/htop-2.1.0/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
-0002-configure-check-for-ncurses-with-ncurses6-config.patch
-# f87a037f960f427f6ab7ebcbb54e5e4e - git-ptx-patches magic
diff --git a/rules/htop.make b/rules/htop.make
index 4d3505f29..6ea05f15c 100644
--- a/rules/htop.make
+++ b/rules/htop.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
#
# Paths and names
#
-HTOP_VERSION := 2.1.0
-HTOP_MD5 := f262b66ad6c194782f4d3a80627e84c8
+HTOP_VERSION := 2.2.0
+HTOP_MD5 := 0d816b6beed31edc75babcfbf863ffa8
HTOP := htop-$(HTOP_VERSION)
HTOP_SUFFIX := tar.gz
HTOP_URL := http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)
@@ -34,6 +34,7 @@ HTOP_LICENSE := GPL-2.0-only
# autoconf
#
HTOP_CONF_TOOL := autoconf
+HTOP_CONF_ENV := HTOP_NCURSES_CONFIG_SCRIPT=ncurses6-config
HTOP_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--enable-proc \
--
2.16.3
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH v2] htop: version bump 2.1.0 -> 2.2.0
2018-04-15 19:17 ` [ptxdist] [PATCH v2] " Roland Hieber
@ 2018-04-16 15:39 ` Michael Olbrich
2018-04-17 8:10 ` Ladislav Michl
1 sibling, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2018-04-16 15:39 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
On Sun, Apr 15, 2018 at 09:17:55PM +0200, Roland Hieber wrote:
> Removed all patches:
> - 0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch:
> applied upstream in https://github.com/hishamhm/htop/commit/70ed51a303
> - 0002-configure-check-for-ncurses-with-ncurses6-config.patch:
> replaced by setting HTOP_NCURSES_CONFIG_SCRIPT=ncurses6-config in
> HTOP_CONF_ENV
>
> Fixes: 74ffd1f57d0d68a8918 ("htop: fix configure to discover ncurses6")
> Cc: Ladislav Michl <ladis@linux-mips.org>
> Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
>
> ---
> v2:
> - take care of the patches
> - set HTOP_NCURSES_CONFIG_SCRIPT. This is functionally equivalent to
> Ladislav's 0002.patch, but I prefer setting a small variable in
> htop.make to a configure.ac patch.
> ---
> ...ProcessList-fix-reading-of-number-of-read.patch | 28 ----------------------
> ...re-check-for-ncurses-with-ncurses6-config.patch | 20 ----------------
> patches/htop-2.1.0/autogen.sh | 1 -
> patches/htop-2.1.0/series | 5 ----
> rules/htop.make | 5 ++--
> 5 files changed, 3 insertions(+), 56 deletions(-)
> delete mode 100644 patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
> delete mode 100644 patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch
> delete mode 120000 patches/htop-2.1.0/autogen.sh
> delete mode 100644 patches/htop-2.1.0/series
>
> diff --git a/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch b/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
> deleted file mode 100644
> index e1267a32a..000000000
> --- a/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From: Marc Kleine-Budde <mkl@pengutronix.de>
> -Date: Wed, 7 Feb 2018 23:16:37 +0100
> -Subject: [PATCH] linux/LinuxProcessList: fix reading of number of read
> - syscalls of process
> -
> -The "if" tests if the character at index "5" is 'r', as a first quick
> -check. However at index "5" will always be a colon ":". This patch fixes
> -the off-by-one error. htop now shows proper values in the RD_SYSC
> -column.
> -
> -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ----
> - linux/LinuxProcessList.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
> -index 6f2631afa12f..230770258084 100644
> ---- a/linux/LinuxProcessList.c
> -+++ b/linux/LinuxProcessList.c
> -@@ -436,7 +436,7 @@ static void LinuxProcessList_readIoFile(LinuxProcess* process, const char* dirna
> - }
> - break;
> - case 's':
> -- if (line[5] == 'r' && strncmp(line+1, "yscr: ", 6) == 0) {
> -+ if (line[4] == 'r' && strncmp(line+1, "yscr: ", 6) == 0) {
> - process->io_syscr = strtoull(line+7, NULL, 10);
> - } else if (strncmp(line+1, "yscw: ", 6) == 0) {
> - process->io_syscw = strtoull(line+7, NULL, 10);
> diff --git a/patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch b/patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch
> deleted file mode 100644
> index 04714a4bb..000000000
> --- a/patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch
> +++ /dev/null
> @@ -1,20 +0,0 @@
> ---- htop-2.1.0/configure.ac.orig 2018-02-27 11:23:08.615702344 +0100
> -+++ htop-2.1.0/configure.ac 2018-02-27 11:24:21.287425809 +0100
> -@@ -202,11 +202,12 @@
> - [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
> - else
> - HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
> -- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
> -- HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
> -- HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
> -- missing_libraries="$missing_libraries libncurses"
> -- ))))
> -+ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
> -+ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
> -+ HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
> -+ HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
> -+ missing_libraries="$missing_libraries libncurses"
> -+ )))))
> -
> - AC_CHECK_HEADERS([curses.h],[:],
> - [AC_CHECK_HEADERS([ncurses/curses.h],[:],
> diff --git a/patches/htop-2.1.0/autogen.sh b/patches/htop-2.1.0/autogen.sh
> deleted file mode 120000
> index 9f8a4cb7d..000000000
> --- a/patches/htop-2.1.0/autogen.sh
> +++ /dev/null
> @@ -1 +0,0 @@
> -../autogen.sh
> \ No newline at end of file
> diff --git a/patches/htop-2.1.0/series b/patches/htop-2.1.0/series
> deleted file mode 100644
> index 87b59abe7..000000000
> --- a/patches/htop-2.1.0/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
> -0002-configure-check-for-ncurses-with-ncurses6-config.patch
> -# f87a037f960f427f6ab7ebcbb54e5e4e - git-ptx-patches magic
> diff --git a/rules/htop.make b/rules/htop.make
> index 4d3505f29..6ea05f15c 100644
> --- a/rules/htop.make
> +++ b/rules/htop.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
> #
> # Paths and names
> #
> -HTOP_VERSION := 2.1.0
> -HTOP_MD5 := f262b66ad6c194782f4d3a80627e84c8
> +HTOP_VERSION := 2.2.0
> +HTOP_MD5 := 0d816b6beed31edc75babcfbf863ffa8
> HTOP := htop-$(HTOP_VERSION)
> HTOP_SUFFIX := tar.gz
> HTOP_URL := http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)
> @@ -34,6 +34,7 @@ HTOP_LICENSE := GPL-2.0-only
> # autoconf
> #
> HTOP_CONF_TOOL := autoconf
> +HTOP_CONF_ENV := HTOP_NCURSES_CONFIG_SCRIPT=ncurses6-config
HTOP_CONF_ENV := \
$(CROSS_ENV) \
HTOP_NCURSES_CONFIG_SCRIPT=ncurses6-config
and put it above the
#
# autoconf
#
Michael
> HTOP_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> --enable-proc \
> --
> 2.16.3
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH v2] htop: version bump 2.1.0 -> 2.2.0
2018-04-15 19:17 ` [ptxdist] [PATCH v2] " Roland Hieber
2018-04-16 15:39 ` Michael Olbrich
@ 2018-04-17 8:10 ` Ladislav Michl
1 sibling, 0 replies; 9+ messages in thread
From: Ladislav Michl @ 2018-04-17 8:10 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist
On Sun, Apr 15, 2018 at 09:17:55PM +0200, Roland Hieber wrote:
> Removed all patches:
> - 0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch:
> applied upstream in https://github.com/hishamhm/htop/commit/70ed51a303
> - 0002-configure-check-for-ncurses-with-ncurses6-config.patch:
> replaced by setting HTOP_NCURSES_CONFIG_SCRIPT=ncurses6-config in
> HTOP_CONF_ENV
>
> Fixes: 74ffd1f57d0d68a8918 ("htop: fix configure to discover ncurses6")
> Cc: Ladislav Michl <ladis@linux-mips.org>
> Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
>
> ---
> v2:
> - take care of the patches
> - set HTOP_NCURSES_CONFIG_SCRIPT. This is functionally equivalent to
> Ladislav's 0002.patch, but I prefer setting a small variable in
> htop.make to a configure.ac patch.
Yes, I consider it a better solution as well. Go for it :)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread
* [ptxdist] [PATCH v3] htop: version bump 2.1.0 -> 2.2.0
2018-04-10 15:14 [ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0 Roland Hieber
2018-04-10 15:34 ` Bastian Stender
2018-04-15 19:17 ` [ptxdist] [PATCH v2] " Roland Hieber
@ 2018-04-18 8:28 ` Roland Hieber
2 siblings, 0 replies; 9+ messages in thread
From: Roland Hieber @ 2018-04-18 8:28 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Removed all patches:
- 0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch:
applied upstream in https://github.com/hishamhm/htop/commit/70ed51a303
- 0002-configure-check-for-ncurses-with-ncurses6-config.patch:
replaced by setting HTOP_NCURSES_CONFIG_SCRIPT=ncurses6-config in
HTOP_CONF_ENV
Fixes: 74ffd1f57d0d68a8918 ("htop: fix configure to discover ncurses6")
Cc: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
v3:
- format HTOP_CONF_ENV and move it above the autoconf header
v2:
- take care of the patches
- set HTOP_NCURSES_CONFIG_SCRIPT. This is functionally equivalent to
Ladislav's 0002.patch, but I prefer setting a small variable in
htop.make to a configure.ac patch.
---
...ProcessList-fix-reading-of-number-of-read.patch | 28 ----------------------
...re-check-for-ncurses-with-ncurses6-config.patch | 20 ----------------
patches/htop-2.1.0/autogen.sh | 1 -
patches/htop-2.1.0/series | 5 ----
rules/htop.make | 7 ++++--
5 files changed, 5 insertions(+), 56 deletions(-)
delete mode 100644 patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
delete mode 100644 patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch
delete mode 120000 patches/htop-2.1.0/autogen.sh
delete mode 100644 patches/htop-2.1.0/series
diff --git a/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch b/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
deleted file mode 100644
index e1267a32a..000000000
--- a/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Wed, 7 Feb 2018 23:16:37 +0100
-Subject: [PATCH] linux/LinuxProcessList: fix reading of number of read
- syscalls of process
-
-The "if" tests if the character at index "5" is 'r', as a first quick
-check. However at index "5" will always be a colon ":". This patch fixes
-the off-by-one error. htop now shows proper values in the RD_SYSC
-column.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- linux/LinuxProcessList.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
-index 6f2631afa12f..230770258084 100644
---- a/linux/LinuxProcessList.c
-+++ b/linux/LinuxProcessList.c
-@@ -436,7 +436,7 @@ static void LinuxProcessList_readIoFile(LinuxProcess* process, const char* dirna
- }
- break;
- case 's':
-- if (line[5] == 'r' && strncmp(line+1, "yscr: ", 6) == 0) {
-+ if (line[4] == 'r' && strncmp(line+1, "yscr: ", 6) == 0) {
- process->io_syscr = strtoull(line+7, NULL, 10);
- } else if (strncmp(line+1, "yscw: ", 6) == 0) {
- process->io_syscw = strtoull(line+7, NULL, 10);
diff --git a/patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch b/patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch
deleted file mode 100644
index 04714a4bb..000000000
--- a/patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- htop-2.1.0/configure.ac.orig 2018-02-27 11:23:08.615702344 +0100
-+++ htop-2.1.0/configure.ac 2018-02-27 11:24:21.287425809 +0100
-@@ -202,11 +202,12 @@
- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
- else
- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
-- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
-- HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
-- HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
-- missing_libraries="$missing_libraries libncurses"
-- ))))
-+ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
-+ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
-+ HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
-+ HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
-+ missing_libraries="$missing_libraries libncurses"
-+ )))))
-
- AC_CHECK_HEADERS([curses.h],[:],
- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
diff --git a/patches/htop-2.1.0/autogen.sh b/patches/htop-2.1.0/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/htop-2.1.0/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/htop-2.1.0/series b/patches/htop-2.1.0/series
deleted file mode 100644
index 87b59abe7..000000000
--- a/patches/htop-2.1.0/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
-0002-configure-check-for-ncurses-with-ncurses6-config.patch
-# f87a037f960f427f6ab7ebcbb54e5e4e - git-ptx-patches magic
diff --git a/rules/htop.make b/rules/htop.make
index 4d3505f29..83ec8e61d 100644
--- a/rules/htop.make
+++ b/rules/htop.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
#
# Paths and names
#
-HTOP_VERSION := 2.1.0
-HTOP_MD5 := f262b66ad6c194782f4d3a80627e84c8
+HTOP_VERSION := 2.2.0
+HTOP_MD5 := 0d816b6beed31edc75babcfbf863ffa8
HTOP := htop-$(HTOP_VERSION)
HTOP_SUFFIX := tar.gz
HTOP_URL := http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)
@@ -30,6 +30,9 @@ HTOP_LICENSE := GPL-2.0-only
# Prepare
# ----------------------------------------------------------------------------
+HTOP_CONF_ENV := \
+ $(CROSS_ENV) \
+ HTOP_NCURSES_CONFIG_SCRIPT=ncurses6-config
#
# autoconf
#
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-04-18 8:28 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-10 15:14 [ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0 Roland Hieber
2018-04-10 15:34 ` Bastian Stender
2018-04-11 6:56 ` Alexander Dahl
2018-04-11 7:36 ` Michael Olbrich
2018-04-11 8:49 ` Roland Hieber
2018-04-15 19:17 ` [ptxdist] [PATCH v2] " Roland Hieber
2018-04-16 15:39 ` Michael Olbrich
2018-04-17 8:10 ` Ladislav Michl
2018-04-18 8:28 ` [ptxdist] [PATCH v3] " Roland Hieber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox