From 01b0c586973a3dcec37faba1c2c935c16ae7c102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 14 Feb 2010 19:42:46 +0000 Subject: [PATCH] * Renamed "nc" to "netcat" which seems to be its usual name. * Removed the test driver from the image; it serves no practical purpose. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35459 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 4 ++-- src/bin/network/Jamfile | 2 +- src/bin/network/{nc => netcat}/Jamfile | 14 ++------------ src/bin/network/{nc => netcat}/generic.h | 0 src/bin/network/{nc => netcat}/netcat.c | 0 5 files changed, 5 insertions(+), 15 deletions(-) rename src/bin/network/{nc => netcat}/Jamfile (56%) rename src/bin/network/{nc => netcat}/generic.h (100%) rename src/bin/network/{nc => netcat}/netcat.c (100%) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 1fcda5a3d1..064812a195 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -49,7 +49,7 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2 listport listres listsem listusb ln locate logger login logname ls lsindex mail2mbox makebootable mbox2mail md5sum merge message mimeset mkdos mkdir mkfifo mkfs mkindex modifiers mount mount_nfs mountvolume mv - nc netstat nl nohup + netcat netstat nl nohup od open passwd paste patch pathchk pc ping play playfile playsound playwav pr prio printenv printf profile ps ptx pwd @@ -248,7 +248,7 @@ AddDriversToHaikuImage disk virtual : nbd ; AddDriversToHaikuImage dvb : cx23882 ; AddDriversToHaikuImage graphics : $(SYSTEM_ADD_ONS_DRIVERS_GRAPHICS) ; AddDriversToHaikuImage input : ps2_hid usb_hid wacom ; -AddDriversToHaikuImage misc : poke test mem ; +AddDriversToHaikuImage misc : poke mem ; AddDriversToHaikuImage net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ; #AddDriversToHaikuImage power : $(SYSTEM_ADD_ONS_DRIVERS_POWER) ; diff --git a/src/bin/network/Jamfile b/src/bin/network/Jamfile index ddd65a3abd..e1c321bca2 100644 --- a/src/bin/network/Jamfile +++ b/src/bin/network/Jamfile @@ -10,7 +10,7 @@ SubInclude HAIKU_TOP src bin network ftp ; SubInclude HAIKU_TOP src bin network ftpd ; SubInclude HAIKU_TOP src bin network ifconfig ; SubInclude HAIKU_TOP src bin network mount_nfs ; -SubInclude HAIKU_TOP src bin network nc ; +SubInclude HAIKU_TOP src bin network netcat ; SubInclude HAIKU_TOP src bin network netstat ; #SubInclude HAIKU_TOP src bin network pppconfig ; #SubInclude HAIKU_TOP src bin network ppp_up ; diff --git a/src/bin/network/nc/Jamfile b/src/bin/network/netcat/Jamfile similarity index 56% rename from src/bin/network/nc/Jamfile rename to src/bin/network/netcat/Jamfile index 71a78855c3..727d20ee09 100644 --- a/src/bin/network/nc/Jamfile +++ b/src/bin/network/netcat/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src bin network nc ; +SubDir HAIKU_TOP src bin network netcat ; SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ; @@ -8,17 +8,7 @@ if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { # Unfortunately we get more than we want, namely all POSIX headers. } -BinCommand nc : +BinCommand netcat : netcat.c : $(TARGET_NETWORK_LIBS) ; - -HaikuInstall install-networking - : [ FDirName $(HAIKU_TEST_DIR) kits net ] - : nc ; - -HaikuInstall install-userland-networking - : [ FDirName $(HAIKU_TEST_DIR) kits net userland ] - : nc - : installed-userland-networking -; diff --git a/src/bin/network/nc/generic.h b/src/bin/network/netcat/generic.h similarity index 100% rename from src/bin/network/nc/generic.h rename to src/bin/network/netcat/generic.h diff --git a/src/bin/network/nc/netcat.c b/src/bin/network/netcat/netcat.c similarity index 100% rename from src/bin/network/nc/netcat.c rename to src/bin/network/netcat/netcat.c