From patchwork Tue Jan 19 21:22:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1428873 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=kWn8+nzM; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DL1pz1NRNz9sRR for ; Wed, 20 Jan 2021 08:23:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9FC708609B; Tue, 19 Jan 2021 21:23:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3PSwgUiv+9IY; Tue, 19 Jan 2021 21:23:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id ABA9D86D88; Tue, 19 Jan 2021 21:23:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9BD4C1BF2FA for ; Tue, 19 Jan 2021 21:23:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 94F55864D7 for ; Tue, 19 Jan 2021 21:23:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VBDt46TGPzml for ; Tue, 19 Jan 2021 21:23:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 79F2886663 for ; Tue, 19 Jan 2021 21:23:11 +0000 (UTC) Received: by mail-wr1-f43.google.com with SMTP id 6so13849331wri.3 for ; Tue, 19 Jan 2021 13:23:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WsqSN+52thjUThoKzlEfBuQWQle4V/mTu32bFpYdfnU=; b=kWn8+nzMEFYzR0yVqNAG2uG68jBQvHZjRm8jVtsL9ya9yD/2KctY1cYsqdE57e9bWJ DiQCnc9jresi5nxhk5IGtwK6aZSGkSMoJytU0BqcMZvhkoab/Fv2gOqhYGsegiqs6TfK NooR/itlImMZ3U4+P5BbGw7IJ9nSKe0YMIvfiBlC73FXo6gFmkFgIUp50HLy6eWc8n7u 9i2T8HSawlYVIyrQPUfkCASItcuJvz0/beneryrXS8q3wjH9l4LiRKwA3TqzIIQ/TH9S xJCLNt5Qt3XyNPGM3XtCtmIUg/hjZW3PIXobGnQh3hlCW5Cyo1Ld95ixkVRzWuAP9loC MwEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WsqSN+52thjUThoKzlEfBuQWQle4V/mTu32bFpYdfnU=; b=bNFbkUzoZlxN+kEKNo+4Q+hg3335wSfKbwx0TXBvTFtDwtCz16wd02fRpigBG8HpUg vyAB+YUn4mCce9xAfX6JMqsj+QPabboeyBdfM8gAYQH9RlmO7JIoPLklPbcu0oGl99P4 yZd1UyOxUjfIIte5clyQAnvMqEItX5azXqQ2yuPNeC8j/ykS4pOhm2fj3LbMCYl61BH8 +omIsXodwbO4HYUi1VOz6O6veXmO7V0gPeSu+GepVSLlIEc4bUwxxRKkmkioCjj4/rcf HmVq129Ah6px10xGHOWfVxYxjVPGHMCHB30JFgVsu+NTCwFbW5jSPYvCnlOT29A/l4mZ 4wOA== X-Gm-Message-State: AOAM5303vxxdOLMa2iAvya2DbMHDEWFidv/Gqu7gS7qicO7u0SMDDSJc WwD5uuzqrp2JlRKztzd7u2ZejWUylSF3vA== X-Google-Smtp-Source: ABdhPJwvz6HZjOME8oW2bmXXjgl9Okg56Ll4J7hlOd219a8lROBsT71eE43KetB90eQZZ1YzuU4ujg== X-Received: by 2002:adf:ec05:: with SMTP id x5mr4726909wrn.282.1611091389452; Tue, 19 Jan 2021 13:23:09 -0800 (PST) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id g12sm43042wmh.14.2021.01.19.13.23.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 13:23:08 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Tue, 19 Jan 2021 22:22:26 +0100 Message-Id: <20210119212226.792731-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/atop: bump to version 2.6.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Giulio Benetti , Ricardo Martincoski , Thomas Petazzoni , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" wchar is needed since https://github.com/Atoptool/atop/commit/fa101b4dc5d3729d84466f708c29959570bd0919 https://www.atoptool.nl/downloadatop.php Signed-off-by: Fabrice Fontaine --- ...1-ifprop.c-fix-build-with-kernel-4.6.patch | 51 +++++++++++++++++++ .../0002-photosyst.c-fix-build-on-musl.patch | 38 ++++++++++++++ package/atop/Config.in | 7 ++- package/atop/atop.hash | 2 +- package/atop/atop.mk | 2 +- 5 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 package/atop/0001-ifprop.c-fix-build-with-kernel-4.6.patch create mode 100644 package/atop/0002-photosyst.c-fix-build-on-musl.patch diff --git a/package/atop/0001-ifprop.c-fix-build-with-kernel-4.6.patch b/package/atop/0001-ifprop.c-fix-build-with-kernel-4.6.patch new file mode 100644 index 0000000000..0dfe4f4301 --- /dev/null +++ b/package/atop/0001-ifprop.c-fix-build-with-kernel-4.6.patch @@ -0,0 +1,51 @@ +From aff473ee28903775e1bb35793b9c4c50ee0c7270 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 22 Dec 2020 12:23:33 +0100 +Subject: [PATCH] ifprop.c: fix build with kernel < 4.6 + +Build fails with kernel headers < 4.6 since version 2.6.0 and +https://github.com/Atoptool/atop/commit/08c622ecaa5bb0bb260984ceaddc4730d1b312a7 + +Indeed, ethtool_link_settings and ETHTOOL_GLINKSETTINGS are only +available since +https://github.com/torvalds/linux/commit/3f1ac7a700d039c61d8d8b99f28d605d489a60cf + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/Atoptool/atop/pull/142] +--- + ifprop.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ifprop.c b/ifprop.c +index 60fa3fa..63fce5a 100644 +--- a/ifprop.c ++++ b/ifprop.c +@@ -104,7 +104,9 @@ initifprop(void) + char *cp, linebuf[2048]; + int i=0, sockfd; + ++#ifdef ETHTOOL_GLINKSETTINGS + struct ethtool_link_settings ethlink; // preferred! ++#endif + struct ethtool_cmd ethcmd; // deprecated + + struct ifreq ifreq; +@@ -153,6 +155,7 @@ initifprop(void) + strncpy((void *)&ifreq.ifr_ifrn.ifrn_name, ifprops[i].name, + sizeof ifreq.ifr_ifrn.ifrn_name-1); + ++#ifdef ETHTOOL_GLINKSETTINGS + ethlink.cmd = ETHTOOL_GLINKSETTINGS; + ifreq.ifr_ifru.ifru_data = (void *)ðlink; + +@@ -164,6 +167,7 @@ initifprop(void) + phy_addr = ethlink.phy_address; + } + else ++#endif + { + ethcmd.cmd = ETHTOOL_GSET; + ifreq.ifr_ifru.ifru_data = (void *)ðcmd; +-- +2.29.2 + diff --git a/package/atop/0002-photosyst.c-fix-build-on-musl.patch b/package/atop/0002-photosyst.c-fix-build-on-musl.patch new file mode 100644 index 0000000000..8573d59d6b --- /dev/null +++ b/package/atop/0002-photosyst.c-fix-build-on-musl.patch @@ -0,0 +1,38 @@ +From 34996ad1eb6d295382e7737ef34bd362abdd4944 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 19 Jan 2021 22:15:45 +0100 +Subject: [PATCH] photosyst.c: fix build on musl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Build on musl is broken since version 2.6.0 and +https://github.com/Atoptool/atop/commit/e889c66fbe1d0b7ae38fbcbaa46cea749257f486 +because limits.h is not included: + +photosyst.c: In function ‘lvmmapname’: +photosyst.c:1624:14: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean ‘AF_MAX’? + char path[PATH_MAX]; + ^~~~~~~~ + AF_MAX + +Signed-off-by: Fabrice Fontaine +--- + photosyst.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/photosyst.c b/photosyst.c +index 3de874b..67ae92f 100644 +--- a/photosyst.c ++++ b/photosyst.c +@@ -165,6 +165,7 @@ + #include + #include + #include ++#include + + #define SCALINGMAXCPU 8 // threshold for scaling info per CPU + +-- +2.29.2 + diff --git a/package/atop/Config.in b/package/atop/Config.in index 9e42eddb57..4d405bb0f3 100644 --- a/package/atop/Config.in +++ b/package/atop/Config.in @@ -1,8 +1,10 @@ config BR2_PACKAGE_ATOP bool "atop" depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR # ncurses wchar depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 # PERF_FLAG_FD_CLOEXEC select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR select BR2_PACKAGE_ZLIB help Atop is an ASCII full-screen performance monitor for Linux @@ -18,6 +20,7 @@ config BR2_PACKAGE_ATOP http://www.atoptool.nl -comment "atop needs a toolchain w/ headers >= 3.14" +comment "atop needs a toolchain w/ wchar, headers >= 3.14" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 + depends on !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 diff --git a/package/atop/atop.hash b/package/atop/atop.hash index f404ed5d1b..65148b8578 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33 atop-2.5.0.tar.gz +sha256 9ec2ca3a571692f7efaa095f99a5106432bcb71cc22cd6c49597ef0481058f72 atop-2.6.0.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index 587a5b3604..acbaf2995a 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATOP_VERSION = 2.5.0 +ATOP_VERSION = 2.6.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING