initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,51 @@
|
||||
From aff473ee28903775e1bb35793b9c4c50ee0c7270 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
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 <fontaine.fabrice@gmail.com>
|
||||
[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
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
From 34996ad1eb6d295382e7737ef34bd362abdd4944 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
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 <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
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 <dirent.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/sysmacros.h>
|
||||
+#include <limits.h>
|
||||
|
||||
#define SCALINGMAXCPU 8 // threshold for scaling info per CPU
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
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
|
||||
that is capable of reporting the activity of all processes
|
||||
(even if processes have finished during the interval), daily
|
||||
logging of system and process activity for long-term analysis,
|
||||
highlighting overloaded system resources by using colors, etc.
|
||||
At regular intervals, it shows system-level activity related
|
||||
to the CPU, memory, swap, disks (including LVM) and network
|
||||
layers, and for every process (and thread) it shows e.g. the
|
||||
CPU utilization, memory growth, disk utilization, priority,
|
||||
username, state, and exit code.
|
||||
|
||||
http://www.atoptool.nl
|
||||
|
||||
comment "atop needs a toolchain w/ wchar, headers >= 3.14"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || \
|
||||
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
|
||||
@@ -0,0 +1,5 @@
|
||||
# Locally computed:
|
||||
sha256 9ec2ca3a571692f7efaa095f99a5106432bcb71cc22cd6c49597ef0481058f72 atop-2.6.0.tar.gz
|
||||
|
||||
# Hash for license file:
|
||||
sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
|
||||
@@ -0,0 +1,29 @@
|
||||
################################################################################
|
||||
#
|
||||
# atop
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ATOP_VERSION = 2.6.0
|
||||
ATOP_SITE = http://www.atoptool.nl/download
|
||||
ATOP_LICENSE = GPL-2.0+
|
||||
ATOP_LICENSE_FILES = COPYING
|
||||
ATOP_CPE_ID_VENDOR = atop_project
|
||||
ATOP_DEPENDENCIES = ncurses zlib
|
||||
|
||||
ATOP_CFLAGS = $(TARGET_CFLAGS)
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
|
||||
ATOP_CFLAGS += -O0
|
||||
endif
|
||||
|
||||
define ATOP_BUILD_CMDS
|
||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(ATOP_CFLAGS)" \
|
||||
-C $(@D)
|
||||
endef
|
||||
|
||||
define ATOP_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -D -m 0755 $(@D)/atop $(TARGET_DIR)/usr/bin/atop
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user