* [Buildroot] [PATCH 1/3] package/htop: bump to version 3.1.0
@ 2021-10-03 8:13 Francois Perrad
2021-10-03 8:13 ` [Buildroot] [PATCH 2/3] package/htop: add optional dependency libcap Francois Perrad
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Francois Perrad @ 2021-10-03 8:13 UTC (permalink / raw)
To: buildroot
Updated COPYING file to remove the PLPA exemption (appendix 2)
With this change the license is now GPLv2 without any additional wording.
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/htop/htop.hash | 4 ++--
package/htop/htop.mk | 7 +------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/package/htop/htop.hash b/package/htop/htop.hash
index 34d95eb7a..812392340 100644
--- a/package/htop/htop.hash
+++ b/package/htop/htop.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 123476d56a5e6a219654eebb6b2ec747dfa364f39c01a6475bf8030a25c81bff htop-ce6d60e7def146c13d0b8bca4642e7401a0a8995.tar.gz
-sha256 c228cc14df980a23ea0c3c9ac957b904dd6a8514f6283db403de22e9179471be COPYING
+sha256 200a4f9331d0e5048bf9bda6a8dee38248c557e471b9e57ff3784853efd613a9 htop-3.1.0.tar.gz
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/package/htop/htop.mk b/package/htop/htop.mk
index bb2bcb29a..22cc739e2 100644
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@@ -4,12 +4,7 @@
#
################################################################################
-# This commit hash corresponds to version 3.0.5.
-# htop sources were moved from bintray to github and the sources tar archive
-# was also changed (the build process requires `HTOP_AUTORECONF = YES` now). We
-# use commit hash instead of git tag here to avoid breaking existing source
-# caches
-HTOP_VERSION = ce6d60e7def146c13d0b8bca4642e7401a0a8995
+HTOP_VERSION = 3.1.0
HTOP_SITE = $(call github,htop-dev,htop,$(HTOP_VERSION))
HTOP_DEPENDENCIES = ncurses
HTOP_AUTORECONF = YES
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/3] package/htop: add optional dependency libcap
2021-10-03 8:13 [Buildroot] [PATCH 1/3] package/htop: bump to version 3.1.0 Francois Perrad
@ 2021-10-03 8:13 ` Francois Perrad
2021-10-03 8:13 ` [Buildroot] [PATCH 3/3] package/htop: add optional dependency hwloc Francois Perrad
2021-10-03 20:22 ` [Buildroot] [PATCH 1/3] package/htop: bump to version 3.1.0 Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Francois Perrad @ 2021-10-03 8:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/htop/htop.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/htop/htop.mk b/package/htop/htop.mk
index 22cc739e2..140d620f2 100644
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@@ -13,6 +13,13 @@ HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONF
HTOP_LICENSE = GPL-2.0
HTOP_LICENSE_FILES = COPYING
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+HTOP_CONF_OPTS += --enable-capabilities
+HTOP_DEPENDENCIES += libcap
+else
+HTOP_CONF_OPTS += --disable-capabilities
+endif
+
ifeq ($(BR2_PACKAGE_LM_SENSORS),y)
HTOP_CONF_OPTS += --with-sensors
HTOP_DEPENDENCIES += lm-sensors
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 3/3] package/htop: add optional dependency hwloc
2021-10-03 8:13 [Buildroot] [PATCH 1/3] package/htop: bump to version 3.1.0 Francois Perrad
2021-10-03 8:13 ` [Buildroot] [PATCH 2/3] package/htop: add optional dependency libcap Francois Perrad
@ 2021-10-03 8:13 ` Francois Perrad
2021-10-03 20:22 ` [Buildroot] [PATCH 1/3] package/htop: bump to version 3.1.0 Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Francois Perrad @ 2021-10-03 8:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/htop/htop.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/htop/htop.mk b/package/htop/htop.mk
index 140d620f2..b5aab3c30 100644
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@@ -13,6 +13,13 @@ HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONF
HTOP_LICENSE = GPL-2.0
HTOP_LICENSE_FILES = COPYING
+ifeq ($(BR2_PACKAGE_HWLOC),y)
+HTOP_CONF_OPTS += --enable-hwloc
+HTOP_DEPENDENCIES += hwloc
+else
+HTOP_CONF_OPTS += --disable-hwloc
+endif
+
ifeq ($(BR2_PACKAGE_LIBCAP),y)
HTOP_CONF_OPTS += --enable-capabilities
HTOP_DEPENDENCIES += libcap
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/3] package/htop: bump to version 3.1.0
2021-10-03 8:13 [Buildroot] [PATCH 1/3] package/htop: bump to version 3.1.0 Francois Perrad
2021-10-03 8:13 ` [Buildroot] [PATCH 2/3] package/htop: add optional dependency libcap Francois Perrad
2021-10-03 8:13 ` [Buildroot] [PATCH 3/3] package/htop: add optional dependency hwloc Francois Perrad
@ 2021-10-03 20:22 ` Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2021-10-03 20:22 UTC (permalink / raw)
To: Francois Perrad; +Cc: buildroot
On Sun, 3 Oct 2021 10:13:24 +0200
Francois Perrad <fperrad@gmail.com> wrote:
> Updated COPYING file to remove the PLPA exemption (appendix 2)
> With this change the license is now GPLv2 without any additional wording.
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> package/htop/htop.hash | 4 ++--
> package/htop/htop.mk | 7 +------
> 2 files changed, 3 insertions(+), 8 deletions(-)
Series applied, thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-03 20:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-03 8:13 [Buildroot] [PATCH 1/3] package/htop: bump to version 3.1.0 Francois Perrad
2021-10-03 8:13 ` [Buildroot] [PATCH 2/3] package/htop: add optional dependency libcap Francois Perrad
2021-10-03 8:13 ` [Buildroot] [PATCH 3/3] package/htop: add optional dependency hwloc Francois Perrad
2021-10-03 20:22 ` [Buildroot] [PATCH 1/3] package/htop: bump to version 3.1.0 Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.