All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] package/nethogs: bump to version 0.8.8
@ 2024-10-29 12:13 Marcus Hoffmann via buildroot
  2024-10-29 18:51 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Marcus Hoffmann via buildroot @ 2024-10-29 12:13 UTC (permalink / raw)
  To: buildroot; +Cc: Marcus Hoffmann

Remove patch that was merged upstream.

Changelog: https://github.com/raboof/nethogs/releases/tag/v0.8.8

Signed-off-by: Marcus Hoffmann <buildroot@bubu1.eu>
---
 ...termineVersion-sh-prevent-traversing.patch | 31 -------------------
 package/nethogs/nethogs.hash                  |  2 +-
 package/nethogs/nethogs.mk                    |  2 +-
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 package/nethogs/0001-determineVersion-sh-prevent-traversing.patch

diff --git a/package/nethogs/0001-determineVersion-sh-prevent-traversing.patch b/package/nethogs/0001-determineVersion-sh-prevent-traversing.patch
deleted file mode 100644
index 6f39c53128..0000000000
--- a/package/nethogs/0001-determineVersion-sh-prevent-traversing.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6423bdf05d51efc5441c82248098f99e4c1f59c3 Mon Sep 17 00:00:00 2001
-From: Marcus Hoffmann <marcus.hoffmann@othermo.de>
-Date: Fri, 20 Sep 2024 12:06:26 +0200
-Subject: [PATCH] determineVersion.sh: prevent traversing into outer git repo
- for git-describe call
-
-When building nethogs inside another git repo (as is i.e. done as part
-of a buildroot build) the version is picked up from the outer git repo,
-which is confusing as well as introducing reproducibility problems when
-rebuilding the same nethogs version produces different results if the
-outer repository changes.
-
-Upstream: https://github.com/raboof/nethogs/commit/6423bdf05d51efc5441c82248098f99e4c1f59c3
-Signed-off-by: Marcus Hoffmann <buildroot@bubu1.eu>
----
- determineVersion.sh | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/determineVersion.sh b/determineVersion.sh
-index 7c5f1de..3d80d9d 100755
---- a/determineVersion.sh
-+++ b/determineVersion.sh
-@@ -1,3 +1,6 @@
- #!/bin/bash
--
--(git describe --tags 2>/dev/null || pwd | sed -e "s/.*\\///" | sed -e "s/[^-]*//") | tail -c +2
-+if [ $(git rev-parse --show-toplevel 2>/dev/null) == $(pwd) ]; then
-+  git describe --tags 2>/dev/null | tail -c +2
-+else
-+  pwd | sed -e "s/.*\\///" | sed -e "s/[^-]*//" | tail -c +2
-+fi
diff --git a/package/nethogs/nethogs.hash b/package/nethogs/nethogs.hash
index fd1f236250..b1ef5d7042 100644
--- a/package/nethogs/nethogs.hash
+++ b/package/nethogs/nethogs.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  957d6afcc220dfbba44c819162f44818051c5b4fb793c47ba98294393986617d  nethogs-0.8.7.tar.gz
+sha256  111ade20cc545e8dfd7ce4e293bd6b31cd1678a989b6a730bd2fa2acc6254818  nethogs-0.8.8.tar.gz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/package/nethogs/nethogs.mk b/package/nethogs/nethogs.mk
index 98c4f5f008..74387d7397 100644
--- a/package/nethogs/nethogs.mk
+++ b/package/nethogs/nethogs.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NETHOGS_VERSION = 0.8.7
+NETHOGS_VERSION = 0.8.8
 NETHOGS_SITE = $(call github,raboof,nethogs,v$(NETHOGS_VERSION))
 NETHOGS_LICENSE = GPL-2.0+
 NETHOGS_LICENSE_FILES = COPYING
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Buildroot] [PATCH] package/nethogs: bump to version 0.8.8
  2024-10-29 12:13 [Buildroot] [PATCH] package/nethogs: bump to version 0.8.8 Marcus Hoffmann via buildroot
@ 2024-10-29 18:51 ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-10-29 18:51 UTC (permalink / raw)
  To: Marcus Hoffmann via buildroot; +Cc: Marcus Hoffmann, Marcus Hoffmann

On Tue, 29 Oct 2024 13:13:44 +0100
Marcus Hoffmann via buildroot <buildroot@buildroot.org> wrote:

> Remove patch that was merged upstream.
> 
> Changelog: https://github.com/raboof/nethogs/releases/tag/v0.8.8
> 
> Signed-off-by: Marcus Hoffmann <buildroot@bubu1.eu>
> ---
>  ...termineVersion-sh-prevent-traversing.patch | 31 -------------------
>  package/nethogs/nethogs.hash                  |  2 +-
>  package/nethogs/nethogs.mk                    |  2 +-
>  3 files changed, 2 insertions(+), 33 deletions(-)
>  delete mode 100644 package/nethogs/0001-determineVersion-sh-prevent-traversing.patch

Applied to master, 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] 2+ messages in thread

end of thread, other threads:[~2024-10-29 18:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-29 12:13 [Buildroot] [PATCH] package/nethogs: bump to version 0.8.8 Marcus Hoffmann via buildroot
2024-10-29 18:51 ` Thomas Petazzoni via buildroot

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.