diff options
| author | Roland Hieber <r.hieber@pengutronix.de> | 2018-04-18 10:28:28 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-04-20 14:33:01 +0200 |
| commit | 3fddf37417692ffe09de5a7ed42cb2c1a9f949ec (patch) | |
| tree | 59ba89fb3f3bcd54f97a756c5199baadec2743d4 /rules/htop.make | |
| parent | cafff4fedf851b8b1f6551d39a9b05c6ccdd358f (diff) | |
| download | ptxdist-3fddf37417692ffe09de5a7ed42cb2c1a9f949ec.tar.gz ptxdist-3fddf37417692ffe09de5a7ed42cb2c1a9f949ec.tar.xz | |
htop: version bump 2.1.0 -> 2.2.0
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>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/htop.make')
| -rw-r--r-- | rules/htop.make | 7 |
1 files changed, 5 insertions, 2 deletions
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 # |