webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-24 18:03:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

sysstat: Update to version 12.5.4

Browse Source 
- Update from 6.0.2 (2005) to 12.5.4 (2021)
- sysstat-6.0.2-sysconf.patch no longer required. Built into source as standard now.
- Update rootfile
   rootfile made the same as previous version. New options are available, such as
   pidstat and tapestat but they have been commented out in the rootfile. If required
   in the future they can be uncommented.
- iso that was built with this sysstat was installed into vm testbed and confirmed
   that all graphs working, especially those related to disk stats.
- Changelog is too large to show here. Full details for all previous versions can be
   found in the CHANGES file in the source tarball.
- At least 25 bugs fixed between the two versions.

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Adolf Belka
2021-07-15 14:46:19 +02:00
committed by Arne Fitzenreiter
parent a673226e42
commit 1f60759eab
3 changed files with 64 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
config/rootfiles/common/sysstat
View File

@@ -1,25 +1,70 @@
#etc/sysconfig/sysstat
#etc/sysconfig/sysstat.ioconf
#usr/bin/cifsiostat
usr/bin/iostat
usr/bin/mpstat
#usr/bin/pidstat
usr/bin/sadf
usr/bin/sar
#usr/doc
#usr/doc/sysstat-6.0.2
#usr/doc/sysstat-6.0.2/CHANGES
#usr/doc/sysstat-6.0.2/COPYING
#usr/doc/sysstat-6.0.2/CREDITS
#usr/doc/sysstat-6.0.2/FAQ
#usr/doc/sysstat-6.0.2/README
#usr/doc/sysstat-6.0.2/sysstat-6.0.2.lsm
#usr/bin/tapestat
#usr/lib/sa
usr/lib/sa/sa1
usr/lib/sa/sa2
usr/lib/sa/sadc
#usr/man/man1/iostat.1
#usr/man/man1/mpstat.1
#usr/man/man1/sadf.1
#usr/man/man1/sar.1
#usr/man/man8/sa1.8
#usr/man/man8/sa2.8
#usr/man/man8/sadc.8
#usr/share/doc/sysstat-12.5.4
#usr/share/doc/sysstat-12.5.4/CHANGES
#usr/share/doc/sysstat-12.5.4/COPYING
#usr/share/doc/sysstat-12.5.4/CREDITS
#usr/share/doc/sysstat-12.5.4/FAQ.md
#usr/share/doc/sysstat-12.5.4/README.md
#usr/share/doc/sysstat-12.5.4/sysstat-12.5.4.lsm
#usr/share/locale/af/LC_MESSAGES/sysstat.mo
#usr/share/locale/cs/LC_MESSAGES/sysstat.mo
#usr/share/locale/da/LC_MESSAGES/sysstat.mo
#usr/share/locale/de/LC_MESSAGES/sysstat.mo
#usr/share/locale/eo/LC_MESSAGES/sysstat.mo
#usr/share/locale/es/LC_MESSAGES/sysstat.mo
#usr/share/locale/eu/LC_MESSAGES/sysstat.mo
#usr/share/locale/fi/LC_MESSAGES/sysstat.mo
#usr/share/locale/fr/LC_MESSAGES/sysstat.mo
#usr/share/locale/fur/LC_MESSAGES/sysstat.mo
#usr/share/locale/gl/LC_MESSAGES/sysstat.mo
#usr/share/locale/hr/LC_MESSAGES/sysstat.mo
#usr/share/locale/hu/LC_MESSAGES/sysstat.mo
#usr/share/locale/id/LC_MESSAGES/sysstat.mo
#usr/share/locale/it/LC_MESSAGES/sysstat.mo
#usr/share/locale/ja/LC_MESSAGES/sysstat.mo
#usr/share/locale/ko/LC_MESSAGES/sysstat.mo
#usr/share/locale/ky/LC_MESSAGES/sysstat.mo
#usr/share/locale/lv/LC_MESSAGES/sysstat.mo
#usr/share/locale/mt
#usr/share/locale/mt/LC_MESSAGES
#usr/share/locale/mt/LC_MESSAGES/sysstat.mo
#usr/share/locale/nb/LC_MESSAGES/sysstat.mo
#usr/share/locale/nl/LC_MESSAGES/sysstat.mo
#usr/share/locale/nn/LC_MESSAGES/sysstat.mo
#usr/share/locale/pl/LC_MESSAGES/sysstat.mo
#usr/share/locale/pt/LC_MESSAGES/sysstat.mo
#usr/share/locale/pt_BR/LC_MESSAGES/sysstat.mo
#usr/share/locale/ro/LC_MESSAGES/sysstat.mo
#usr/share/locale/ru/LC_MESSAGES/sysstat.mo
#usr/share/locale/sk/LC_MESSAGES/sysstat.mo
#usr/share/locale/sr/LC_MESSAGES/sysstat.mo
#usr/share/locale/sv/LC_MESSAGES/sysstat.mo
#usr/share/locale/tr/LC_MESSAGES/sysstat.mo
#usr/share/locale/uk/LC_MESSAGES/sysstat.mo
#usr/share/locale/vi/LC_MESSAGES/sysstat.mo
#usr/share/locale/zh_CN/LC_MESSAGES/sysstat.mo
#usr/share/locale/zh_TW/LC_MESSAGES/sysstat.mo
#usr/share/man/man1/cifsiostat.1.xz
#usr/share/man/man1/iostat.1.xz
#usr/share/man/man1/mpstat.1.xz
#usr/share/man/man1/pidstat.1.xz
#usr/share/man/man1/sadf.1.xz
#usr/share/man/man1/sar.1.xz
#usr/share/man/man1/tapestat.1.xz
#usr/share/man/man5/sysstat.5.xz
#usr/share/man/man8/sa1.8.xz
#usr/share/man/man8/sa2.8.xz
#usr/share/man/man8/sadc.8.xz
var/log/sa

10
lfs/sysstat
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2021 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 6.0.2
VER = 12.5.4
THISAPP = sysstat-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 99ed143d7e753f0b2220baa115859b44
$(DL_FILE)_MD5 = e2616e42f1b613ca8113ee8de7b7eafd
install : $(TARGET)
@@ -70,9 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysstat-6.0.2-sysconf.patch
cd $(DIR_APP) && sed "/asm\/page.h/d" -i common.c
cd $(DIR_APP) && cp -vf $(DIR_SRC)/config/sysstat/CONFIG build/
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)

26
src/patches/sysstat-6.0.2-sysconf.patch
View File

@@ -1,26 +0,0 @@
--- sysstat-6.0.2/common.c.sysc 2005-11-28 11:14:29.000000000 +0100
+++ sysstat-6.0.2/common.c 2006-05-11 10:40:18.000000000 +0200
@@ -31,8 +31,9 @@
#include <sys/param.h> /* for HZ */
/*
+ * PAGE_SIZE should be get by sysconf function -
* For PAGE_SIZE (which may be itself a call to getpagesize()).
- * PAGE_SHIFT no longer necessarily exists in <asm/page.h>. So
+ * PAGE_SHIFT no longer necessarily exists. So
* we use PAGE_SIZE to compute PAGE_SHIFT...
*/
#include <asm/page.h>
@@ -408,8 +409,10 @@
{
int shift = 0;
int size;
+ int p_size;
- size = PAGE_SIZE >> 10; /* Assume that a page has a minimum size of 1 kB */
+ p_size = sysconf(_SC_PAGE_SIZE);
+ size = p_size >> 10; /* Assume that a page has a minimum size of 1 kB */
while (size > 1) {
shift++;
size >>= 1;