BSP: mii-diag added/ network tool configuration split

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7.0-trunk@1774 33e552b5-05e3-0310-8538-816dae2090ed

5 files changed, 181 insertions, 43 deletions

diff --git a/config/Kconfig b/config/Kconfig
index 64d60a60b..ff3f27ce8 100644
--- a/config/Kconfig
+++ b/config/Kconfig
@@ -60,49 +60,9 @@ source "rules/util-linux.in"
 source "rules/vhll.in"
 
 ##############################################################################
-comment "Network Tools --- "
+# Network Tools
 ##############################################################################
-
-menu	"Network Security    "
-source "rules/dropbear.in"
-source "rules/iptables.in"
-source "rules/lsh.in"
-source "rules/openssl.in"
-source "rules/openssh.in"
-source "rules/shorewall.in"
-endmenu
-
-menu   "Networking Apps     "
-source "rules/betaftpd.in"
-source "rules/bind.in"
-source "rules/bing.in"
-source "rules/dhcp.in"
-source "rules/dnsmasq.in"
-source "rules/ethereal.in"
-source "rules/etherwake.in"
-source "rules/inetutils.in"
-source "rules/libnet.in"
-source "rules/libpcap.in"
-source "rules/netcat.in"
-source "rules/nfs-utils.in"
-source "rules/nmap.in"
-source "rules/ntp.in"
-source "rules/openafs.in"
-source "rules/portmap.in"
-source "rules/ppp.in"
-source "rules/proftpd.in"
-source "rules/rsync.in"
-source "rules/tcpdump.in"
-source "rules/tcpwrapper.in"
-source "rules/thttpd.in"
-source "rules/utelnetd.in"
-source "rules/wireless.in"
-source "rules/zebra.in"
-endmenu
-
-menu   "Realtime Networking "
-source "rules/rtnet.in"
-endmenu
+source "rules/networking.in"
 
 ############################################################################## 
 comment	"Disk and file ---   "
diff --git a/rules/mii-diag.in b/rules/mii-diag.in
new file mode 100644
index 000000000..0e7ddc4a3
--- /dev/null
+++ b/rules/mii-diag.in
@@ -0,0 +1,6 @@
+menu    "mii-diag            "
+
+config MII-DIAG
+        bool
+        prompt "Compile mii-diag"
+endmenu
diff --git a/rules/mii-diag.make b/rules/mii-diag.make
new file mode 100644
index 000000000..bc511edda
--- /dev/null
+++ b/rules/mii-diag.make
@@ -0,0 +1,127 @@
+# -*-makefile-*-
+# $Id: template 1681 2004-09-01 18:12:49Z  $
+#
+# Copyright (C) 2004 by BSP
+#          
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_MII-DIAG
+PACKAGES += mii-diag
+endif
+
+#
+# Paths and names
+#
+MII-DIAG_VERSION	= 2.09
+MII-DIAG		= mii-diag-$(MII-DIAG_VERSION).orig
+MII-DIAG_SUFFIX		= tar.gz
+MII-DIAG_URL		= http://ftp.debian.org/debian/pool/main/m/mii-diag/mii-diag_$(MII-DIAG_VERSION).orig.$(MII-DIAG_SUFFIX)
+MII-DIAG_SOURCE		= $(SRCDIR)/mii-diag_$(MII-DIAG_VERSION).orig.$(MII-DIAG_SUFFIX)
+MII-DIAG_DIR		= $(BUILDDIR)/$(MII-DIAG)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+mii-diag_get: $(STATEDIR)/mii-diag.get
+
+mii-diag_get_deps = $(MII-DIAG_SOURCE)
+
+$(STATEDIR)/mii-diag.get: $(mii-diag_get_deps)
+	@$(call targetinfo, $@)
+	@$(call get_patches, $(MII-DIAG))
+	touch $@
+
+$(MII-DIAG_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, $(MII-DIAG_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+mii-diag_extract: $(STATEDIR)/mii-diag.extract
+
+mii-diag_extract_deps = $(STATEDIR)/mii-diag.get
+
+$(STATEDIR)/mii-diag.extract: $(mii-diag_extract_deps)
+	@$(call targetinfo, $@)
+	@$(call clean, $(MII-DIAG_DIR))
+	@$(call extract, $(MII-DIAG_SOURCE))
+	@$(call patchin, $(MII-DIAG))
+	touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+mii-diag_prepare: $(STATEDIR)/mii-diag.prepare
+
+#
+# dependencies
+#
+mii-diag_prepare_deps = \
+	$(STATEDIR)/mii-diag.extract \
+	$(STATEDIR)/virtual-xchain.install
+
+MII-DIAG_PATH	=  PATH=$(CROSS_PATH)
+MII-DIAG_ENV 	=  $(CROSS_ENV)
+
+$(STATEDIR)/mii-diag.prepare: $(mii-diag_prepare_deps)
+	@$(call targetinfo, $@)
+	touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+mii-diag_compile: $(STATEDIR)/mii-diag.compile
+
+mii-diag_compile_deps = $(STATEDIR)/mii-diag.prepare
+
+$(STATEDIR)/mii-diag.compile: $(mii-diag_compile_deps)
+	@$(call targetinfo, $@)
+	cd $(MII-DIAG_DIR) && $(MII-DIAG_ENV) $(MII-DIAG_PATH) make
+	touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+mii-diag_install: $(STATEDIR)/mii-diag.install
+
+$(STATEDIR)/mii-diag.install: $(STATEDIR)/mii-diag.compile
+	@$(call targetinfo, $@)
+	touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+mii-diag_targetinstall: $(STATEDIR)/mii-diag.targetinstall
+
+mii-diag_targetinstall_deps = $(STATEDIR)/mii-diag.compile
+
+$(STATEDIR)/mii-diag.targetinstall: $(mii-diag_targetinstall_deps)
+	@$(call targetinfo, $@)
+	install -d $(ROOTDIR)/usr/sbin
+	install  $(MII-DIAG_DIR)/mii-diag $(ROOTDIR)/usr/sbin
+	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/mii-diag
+	touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+mii-diag_clean:
+	rm -rf $(STATEDIR)/mii-diag.*
+	rm -rf $(MII-DIAG_DIR)
+
+# vim: syntax=make
diff --git a/rules/networking.in b/rules/networking.in
new file mode 100644
index 000000000..48737c308
--- /dev/null
+++ b/rules/networking.in
@@ -0,0 +1,45 @@
+##############################################################################
+comment "Network Tools --- "
+##############################################################################
+
+menu    "Network Security    "
+source "rules/dropbear.in"
+source "rules/iptables.in"
+source "rules/lsh.in"
+source "rules/openssl.in"
+source "rules/openssh.in"
+source "rules/shorewall.in"
+endmenu
+
+menu   "Networking Apps     "
+source "rules/betaftpd.in"
+source "rules/bind.in"
+source "rules/bing.in"
+source "rules/dhcp.in"
+source "rules/dnsmasq.in"
+source "rules/ethereal.in"
+source "rules/etherwake.in"
+source "rules/inetutils.in"
+source "rules/libnet.in"
+source "rules/libpcap.in"
+source "rules/mii-diag.in"
+source "rules/netcat.in"
+source "rules/nfs-utils.in"
+source "rules/nmap.in"
+source "rules/ntp.in"
+source "rules/openafs.in"
+source "rules/portmap.in"
+source "rules/ppp.in"
+source "rules/proftpd.in"
+source "rules/rsync.in"
+source "rules/tcpdump.in"
+source "rules/tcpwrapper.in"
+source "rules/thttpd.in"
+source "rules/utelnetd.in"
+source "rules/wireless.in"
+source "rules/zebra.in"
+endmenu
+
+menu   "Realtime Networking "
+source "rules/rtnet.in"
+endmenu
diff --git a/rules/rn.make b/rules/rn.make
index c70c85e3e..aa450829a 100644
--- a/rules/rn.make
+++ b/rules/rn.make
@@ -22,7 +22,7 @@ endif
 RN_VERSION	= 0.4
 RN		= rn-$(RN_VERSION)
 RN_SUFFIX	= tar.gz
-RN_URL		= www.kegel.com/rn/$(RN).$(RN_SUFFIX)
+RN_URL		= http://www.kegel.com/rn/$(RN).$(RN_SUFFIX)
 RN_SOURCE	= $(SRCDIR)/$(RN).$(RN_SUFFIX)
 RN_DIR		= $(BUILDDIR)/$(RN)