mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/nethogs: bump to version 0.8.8

Browse Source 
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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Marcus Hoffmann
2024-10-29 13:13:44 +01:00
committed by Thomas Petazzoni
parent 21a72fb275
commit ded7184a58
3 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
package/nethogs/0001-determineVersion-sh-prevent-traversing.patch
View File

@@ -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

2
package/nethogs/nethogs.hash
View File

@@ -1,3 +1,3 @@
# Locally computed # Locally computed
sha256 957d6afcc220dfbba44c819162f44818051c5b4fb793c47ba98294393986617d nethogs-0.8.7.tar.gz sha256 111ade20cc545e8dfd7ce4e293bd6b31cd1678a989b6a730bd2fa2acc6254818 nethogs-0.8.8.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING

2
package/nethogs/nethogs.mk
View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
NETHOGS_VERSION = 0.8.7 NETHOGS_VERSION = 0.8.8
NETHOGS_SITE = $(call github,raboof,nethogs,v$(NETHOGS_VERSION)) NETHOGS_SITE = $(call github,raboof,nethogs,v$(NETHOGS_VERSION))
NETHOGS_LICENSE = GPL-2.0+ NETHOGS_LICENSE = GPL-2.0+
NETHOGS_LICENSE_FILES = COPYING NETHOGS_LICENSE_FILES = COPYING