From e1aed9319ddecd70d8a6671cf1936f1361fc46bc Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 4 Jun 2006 13:26:53 +0000 Subject: [PATCH] - reactivated building of arp, ifconfig and route to all BONE-compatbile targets (by linking them to haiku's libsocket.so and libbind.so). This in turn greatly simplifies building their respective userland version as they now are the same as the standard version. - added ping and traceroute to install-userland-networking pseudotarget git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17717 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/bin/arp/Jamfile | 10 +++++-- src/bin/ifconfig/Jamfile | 10 +++++-- src/bin/ping/Jamfile | 6 ++++ src/bin/route/Jamfile | 10 +++++-- src/bin/traceroute/Jamfile | 8 +++++- src/tests/add-ons/kernel/network/Jamfile | 35 ------------------------ 6 files changed, 37 insertions(+), 42 deletions(-) diff --git a/src/bin/arp/Jamfile b/src/bin/arp/Jamfile index 98653e2bc0..09afd580c6 100644 --- a/src/bin/arp/Jamfile +++ b/src/bin/arp/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src bin arp ; -SetSubDirSupportedPlatforms haiku ; +SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ; if $(TARGET_PLATFORM) != haiku { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; @@ -12,13 +12,19 @@ UsePrivateHeaders net ; BinCommand arp : arp.c - : $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ; + : libbind.so libsocket.so $(SELECT_UNAME_ETC_LIB) ; # Installation -- in the test directory for the time being HaikuInstall install-networking : [ FDirName $(HAIKU_TEST_DIR) kits net ] : arp ; +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland ] + : arp + : installed-userland-networking +; + Package haiku-networkingkit-cvs : arp : # boot home config bin ; diff --git a/src/bin/ifconfig/Jamfile b/src/bin/ifconfig/Jamfile index 89fc7ecd5d..441366b48e 100644 --- a/src/bin/ifconfig/Jamfile +++ b/src/bin/ifconfig/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src bin ifconfig ; -SetSubDirSupportedPlatforms haiku ; +SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ; if $(TARGET_PLATFORM) != haiku { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; @@ -12,13 +12,19 @@ UsePrivateHeaders net ; BinCommand ifconfig : ifconfig.c -: $(NETWORK_LIBS) ; +: libbind.so libsocket.so ; # Installation -- in the test directory for the time being HaikuInstall install-networking : [ FDirName $(HAIKU_TEST_DIR) kits net ] : ifconfig ; +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland ] + : ifconfig + : installed-userland-networking +; + Package haiku-networkingkit-cvs : ifconfig : # boot home config bin ; diff --git a/src/bin/ping/Jamfile b/src/bin/ping/Jamfile index 272358ed05..701c3b55ed 100644 --- a/src/bin/ping/Jamfile +++ b/src/bin/ping/Jamfile @@ -19,6 +19,12 @@ HaikuInstall install-networking : [ FDirName $(HAIKU_TEST_DIR) kits net ] : ping ; +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland ] + : ping + : installed-userland-networking +; + Package haiku-networkingkit-cvs : ping : # boot home config bin ; diff --git a/src/bin/route/Jamfile b/src/bin/route/Jamfile index ffbca8d9a7..2eb6bf3c62 100644 --- a/src/bin/route/Jamfile +++ b/src/bin/route/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src bin route ; -SetSubDirSupportedPlatforms haiku ; +SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ; if $(TARGET_PLATFORM) != haiku { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; @@ -14,7 +14,7 @@ BinCommand route : keywords.c route.c show.c - : $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ; + : libbind.so libsocket.so $(SELECT_UNAME_ETC_LIB) ; # Installation -- in the test directory for the time being HaikuInstall install-networking @@ -22,6 +22,12 @@ HaikuInstall install-networking : route : binroute ; +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland ] + : route + : installed-userland-bin-networking +; + Package haiku-networkingkit-cvs : route : # boot home config bin ; diff --git a/src/bin/traceroute/Jamfile b/src/bin/traceroute/Jamfile index 1d3c081db3..5895fac271 100644 --- a/src/bin/traceroute/Jamfile +++ b/src/bin/traceroute/Jamfile @@ -12,13 +12,19 @@ UsePrivateHeaders net ; BinCommand traceroute : traceroute.c - : $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ; + : libbind.so libsocket.so $(SELECT_UNAME_ETC_LIB) ; # Installation -- in the test directory for the time being HaikuInstall install-networking : [ FDirName $(HAIKU_TEST_DIR) kits net ] : traceroute ; +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland ] + : traceroute + : installed-userland-networking +; + Package haiku-networkingkit-cvs : traceroute : # boot home config bin ; diff --git a/src/tests/add-ons/kernel/network/Jamfile b/src/tests/add-ons/kernel/network/Jamfile index 15e19b0615..9ebe698c82 100644 --- a/src/tests/add-ons/kernel/network/Jamfile +++ b/src/tests/add-ons/kernel/network/Jamfile @@ -21,41 +21,6 @@ HaikuInstall install-userland-networking : installed-userland-networking ; -SEARCH_SOURCE = [ FDirName $(HAIKU_TOP) src bin arp ] ; -SimpleTest arp : - arp.c - : libbind.so - libsocket.so - $(SELECT_UNAME_ETC_LIB) -; - -SEARCH_SOURCE = [ FDirName $(HAIKU_TOP) src bin ifconfig ] ; -SimpleTest ifconfig : - ifconfig.c - : libbind.so - libsocket.so -; - -SEARCH_SOURCE = [ FDirName $(HAIKU_TOP) src bin route ] ; -SimpleTest route : - keywords.c - route.c - show.c - : libbind.so - libnet.so - libsocket.so - $(SELECT_UNAME_ETC_LIB) -; - -# Installation -- in the test directory for the time being -HaikuInstall install-userland-networking - : [ FDirName $(HAIKU_TEST_DIR) kits net userland ] - : arp - ifconfig - route - : installed-userland-networking-bin -; - SubInclude HAIKU_TOP src tests add-ons kernel network core ; SubInclude HAIKU_TOP src tests add-ons kernel network interfaces ; SubInclude HAIKU_TOP src tests add-ons kernel network ppp ;