NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iostat: migrate to gentargets

Browse Source 
Also make the cpu counting routine more reliable (for ARM it's
"Processor" in cpuinfo rather than "processor").

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Gustavo Zacarias 2010-07-22 12:50:54 -03:00 committed by Peter Korsgaard
parent ebf21166b7
commit ee77963588
5 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -31,8 +31,8 @@
cdrkit, cmake, dash, dhcp, dialog, diffutils, distcc, dmalloc, cdrkit, cmake, dash, dhcp, dialog, diffutils, distcc, dmalloc,
dnsmasq, dropbear, e2fsprogs, fbv, file, flex, fontconfig, dnsmasq, dropbear, e2fsprogs, fbv, file, flex, fontconfig,
gawk, gmpc, gnuchess, gst-plugins-base, gst-plugins-good, gawk, gmpc, gnuchess, gst-plugins-base, gst-plugins-good,
gstreamer, gzip, icu, intltool, ipsec-tools, iptables, iw, gstreamer, gzip, icu, intltool, iostat, ipsec-tools, iptables,
libart, libcgi, libdrm, libfuse, libglib2, libgpg-error, iw, libart, libcgi, libdrm, libfuse, libglib2, libgpg-error,
libidn, liblockfile, libpng, libsoup, lighttpd, links, libidn, liblockfile, libpng, libsoup, lighttpd, links,
linux-fusion, lmbench, lrzsz, ltrace, make, midori, linux-fusion, lmbench, lrzsz, ltrace, make, midori,
module-init-tools, mplayer, mysql_client, nbd, ncurses, neon, module-init-tools, mplayer, mysql_client, nbd, ncurses, neon,

2
package/iostat/Config.in
View File

@ -3,4 +3,4 @@ config BR2_PACKAGE_IOSTAT
help help
An I/O performance monitoring utility. An I/O performance monitoring utility.
http://linux.inet.hr/ http://www.linuxinsight.com/iostat_utility.html

27
package/iostat/iostat-cpunum.patch Normal file
View File

@ -0,0 +1,27 @@
From bf646965f75cdad77a45fa3b0046e093b202b2ce Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 22 Jul 2010 12:42:10 -0300
Subject: [PATCH] Make cpu number counter more reliable
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
iostat.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iostat.c b/iostat.c
index 13e2af7..5d74085 100644
--- a/iostat.c
+++ b/iostat.c
@@ -140,7 +140,7 @@ void get_number_of_cpus()
handle_error("Can't open /proc/cpuinfo", !ncpufp);
while (fgets(buffer, sizeof(buffer), ncpufp)) {
- if (!strncmp(buffer, "processor\t:", 11))
+ if (!strncasecmp(buffer, "processor\t", 10))
ncpu++;
}
fclose(ncpufp);
--
1.7.1

51
package/iostat/iostat.mk
View File

@ -3,44 +3,29 @@
# iostat # iostat
# #
############################################################# #############################################################
IOSTAT_VERSION:=2.2
IOSTAT_SOURCE:=iostat-$(IOSTAT_VERSION).tar.gz
IOSTAT_SITE:=http://linux.inet.hr/files
IOSTAT_DIR:=$(BUILD_DIR)/iostat-$(IOSTAT_VERSION)
IOSTAT_BINARY:=iostat
IOSTAT_TARGET_BINARY:=usr/bin/iostat
$(DL_DIR)/$(IOSTAT_SOURCE): IOSTAT_VERSION = 2.2
$(call DOWNLOAD,$(IOSTAT_SITE),$(IOSTAT_SOURCE)) IOSTAT_SITE = http://www.linuxinsight.com/files
iostat-source: $(DL_DIR)/$(IOSTAT_SOURCE) iostat-source: $(DL_DIR)/$(IOSTAT_SOURCE)
$(IOSTAT_DIR)/.unpacked: $(DL_DIR)/$(IOSTAT_SOURCE) define IOSTAT_BUILD_CMDS
$(ZCAT) $(DL_DIR)/$(IOSTAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)"
toolchain/patch-kernel.sh $(IOSTAT_DIR) package/iostat/ iostat\*.patch endef
touch $(IOSTAT_DIR)/.unpacked
$(IOSTAT_DIR)/$(IOSTAT_BINARY): $(IOSTAT_DIR)/.unpacked define IOSTAT_CLEAN_CMDS
$(MAKE) CC="$(TARGET_CC)" -C $(IOSTAT_DIR) $(MAKE) -C $(@D) clean
$(STRIPCMD) $(IOSTAT_DIR)/$(IOSTAT_BINARY) endef
$(TARGET_DIR)/$(IOSTAT_TARGET_BINARY): $(IOSTAT_DIR)/$(IOSTAT_BINARY) define IOSTAT_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 -D $(IOSTAT_DIR)/$(IOSTAT_BINARY) $(TARGET_DIR)/$(IOSTAT_TARGET_BINARY) $(INSTALL) -D $(IOSTAT_DIR)/iostat $(TARGET_DIR)/usr/bin/iostat
$(INSTALL) -D $(IOSTAT_DIR)/iostat.8 \
$(TARGET_DIR)/usr/share/man/man8/iostat.8
endef
iostat: $(TARGET_DIR)/$(IOSTAT_TARGET_BINARY) define IOSTAT_UNINSTALL_TARGET_CMDS
rm -f $(TARGET_DIR)/usr/bin/iostat
rm -f $(TARGET_DIR)/usr/share/man/man8/iostat.8
endef
iostat-clean: $(eval $(call GENTARGETS,package,iostat))
rm -f $(TARGET_DIR)/$(IOSTAT_TARGET_BINARY)
-$(MAKE) -C $(IOSTAT_DIR) clean
iostat-dirclean:
rm -rf $(IOSTAT_DIR)
#############################################################
#
# Toplevel Makefile options
#
#############################################################
ifeq ($(BR2_PACKAGE_IOSTAT),y)
TARGETS+=iostat
endif

11
package/iostat/iostat.patch
View File

@ -1,11 +0,0 @@
--- iostat-2.2/iostat.c.orig 2005-02-14 12:44:03.000000000 -0800
+++ iostat-2.2/iostat.c 2005-03-10 15:24:09.000000000 -0800
@@ -140,7 +140,7 @@
handle_error("Can't open /proc/cpuinfo", !ncpufp);
while (fgets(buffer, sizeof(buffer), ncpufp)) {
- if (!strncmp(buffer, "processor\t:", 11))
+ if (!strncmp(buffer, "processor\t", 10))
ncpu++;
}
fclose(ncpufp);