- 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
This commit is contained in:
+8
-2
@@ -1,6 +1,6 @@
|
|||||||
SubDir HAIKU_TOP src bin arp ;
|
SubDir HAIKU_TOP src bin arp ;
|
||||||
|
|
||||||
SetSubDirSupportedPlatforms haiku ;
|
SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
|
||||||
|
|
||||||
if $(TARGET_PLATFORM) != haiku {
|
if $(TARGET_PLATFORM) != haiku {
|
||||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||||
@@ -12,13 +12,19 @@ UsePrivateHeaders net ;
|
|||||||
|
|
||||||
BinCommand arp :
|
BinCommand arp :
|
||||||
arp.c
|
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
|
# Installation -- in the test directory for the time being
|
||||||
HaikuInstall install-networking
|
HaikuInstall install-networking
|
||||||
: [ FDirName $(HAIKU_TEST_DIR) kits net ]
|
: [ FDirName $(HAIKU_TEST_DIR) kits net ]
|
||||||
: arp ;
|
: arp ;
|
||||||
|
|
||||||
|
HaikuInstall install-userland-networking
|
||||||
|
: [ FDirName $(HAIKU_TEST_DIR) kits net userland ]
|
||||||
|
: arp
|
||||||
|
: installed-userland-networking
|
||||||
|
;
|
||||||
|
|
||||||
Package haiku-networkingkit-cvs :
|
Package haiku-networkingkit-cvs :
|
||||||
arp :
|
arp :
|
||||||
# boot home config bin ;
|
# boot home config bin ;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
SubDir HAIKU_TOP src bin ifconfig ;
|
SubDir HAIKU_TOP src bin ifconfig ;
|
||||||
|
|
||||||
SetSubDirSupportedPlatforms haiku ;
|
SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
|
||||||
|
|
||||||
if $(TARGET_PLATFORM) != haiku {
|
if $(TARGET_PLATFORM) != haiku {
|
||||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||||
@@ -12,13 +12,19 @@ UsePrivateHeaders net ;
|
|||||||
|
|
||||||
BinCommand ifconfig :
|
BinCommand ifconfig :
|
||||||
ifconfig.c
|
ifconfig.c
|
||||||
: $(NETWORK_LIBS) ;
|
: libbind.so libsocket.so ;
|
||||||
|
|
||||||
# Installation -- in the test directory for the time being
|
# Installation -- in the test directory for the time being
|
||||||
HaikuInstall install-networking
|
HaikuInstall install-networking
|
||||||
: [ FDirName $(HAIKU_TEST_DIR) kits net ]
|
: [ FDirName $(HAIKU_TEST_DIR) kits net ]
|
||||||
: ifconfig ;
|
: ifconfig ;
|
||||||
|
|
||||||
|
HaikuInstall install-userland-networking
|
||||||
|
: [ FDirName $(HAIKU_TEST_DIR) kits net userland ]
|
||||||
|
: ifconfig
|
||||||
|
: installed-userland-networking
|
||||||
|
;
|
||||||
|
|
||||||
Package haiku-networkingkit-cvs :
|
Package haiku-networkingkit-cvs :
|
||||||
ifconfig :
|
ifconfig :
|
||||||
# boot home config bin ;
|
# boot home config bin ;
|
||||||
|
|||||||
@@ -19,6 +19,12 @@ HaikuInstall install-networking
|
|||||||
: [ FDirName $(HAIKU_TEST_DIR) kits net ]
|
: [ FDirName $(HAIKU_TEST_DIR) kits net ]
|
||||||
: ping ;
|
: ping ;
|
||||||
|
|
||||||
|
HaikuInstall install-userland-networking
|
||||||
|
: [ FDirName $(HAIKU_TEST_DIR) kits net userland ]
|
||||||
|
: ping
|
||||||
|
: installed-userland-networking
|
||||||
|
;
|
||||||
|
|
||||||
Package haiku-networkingkit-cvs :
|
Package haiku-networkingkit-cvs :
|
||||||
ping :
|
ping :
|
||||||
# boot home config bin ;
|
# boot home config bin ;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
SubDir HAIKU_TOP src bin route ;
|
SubDir HAIKU_TOP src bin route ;
|
||||||
|
|
||||||
SetSubDirSupportedPlatforms haiku ;
|
SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
|
||||||
|
|
||||||
if $(TARGET_PLATFORM) != haiku {
|
if $(TARGET_PLATFORM) != haiku {
|
||||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||||
@@ -14,7 +14,7 @@ BinCommand <bin>route :
|
|||||||
keywords.c
|
keywords.c
|
||||||
route.c
|
route.c
|
||||||
show.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
|
# Installation -- in the test directory for the time being
|
||||||
HaikuInstall install-networking
|
HaikuInstall install-networking
|
||||||
@@ -22,6 +22,12 @@ HaikuInstall install-networking
|
|||||||
: <bin>route
|
: <bin>route
|
||||||
: binroute ;
|
: binroute ;
|
||||||
|
|
||||||
|
HaikuInstall install-userland-networking
|
||||||
|
: [ FDirName $(HAIKU_TEST_DIR) kits net userland ]
|
||||||
|
: <bin>route
|
||||||
|
: installed-userland-bin-networking
|
||||||
|
;
|
||||||
|
|
||||||
Package haiku-networkingkit-cvs :
|
Package haiku-networkingkit-cvs :
|
||||||
<bin>route :
|
<bin>route :
|
||||||
# boot home config bin ;
|
# boot home config bin ;
|
||||||
|
|||||||
@@ -12,13 +12,19 @@ UsePrivateHeaders net ;
|
|||||||
|
|
||||||
BinCommand traceroute :
|
BinCommand traceroute :
|
||||||
traceroute.c
|
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
|
# Installation -- in the test directory for the time being
|
||||||
HaikuInstall install-networking
|
HaikuInstall install-networking
|
||||||
: [ FDirName $(HAIKU_TEST_DIR) kits net ]
|
: [ FDirName $(HAIKU_TEST_DIR) kits net ]
|
||||||
: traceroute ;
|
: traceroute ;
|
||||||
|
|
||||||
|
HaikuInstall install-userland-networking
|
||||||
|
: [ FDirName $(HAIKU_TEST_DIR) kits net userland ]
|
||||||
|
: traceroute
|
||||||
|
: installed-userland-networking
|
||||||
|
;
|
||||||
|
|
||||||
Package haiku-networkingkit-cvs :
|
Package haiku-networkingkit-cvs :
|
||||||
traceroute :
|
traceroute :
|
||||||
# boot home config bin ;
|
# boot home config bin ;
|
||||||
|
|||||||
@@ -21,41 +21,6 @@ HaikuInstall install-userland-networking
|
|||||||
: installed-userland-networking
|
: installed-userland-networking
|
||||||
;
|
;
|
||||||
|
|
||||||
SEARCH_SOURCE = [ FDirName $(HAIKU_TOP) src bin arp ] ;
|
|
||||||
SimpleTest <userland>arp :
|
|
||||||
arp.c
|
|
||||||
: <installed-userland-networking>libbind.so
|
|
||||||
<installed-userland-networking>libsocket.so
|
|
||||||
$(SELECT_UNAME_ETC_LIB)
|
|
||||||
;
|
|
||||||
|
|
||||||
SEARCH_SOURCE = [ FDirName $(HAIKU_TOP) src bin ifconfig ] ;
|
|
||||||
SimpleTest <userland>ifconfig :
|
|
||||||
ifconfig.c
|
|
||||||
: <installed-userland-networking>libbind.so
|
|
||||||
<installed-userland-networking>libsocket.so
|
|
||||||
;
|
|
||||||
|
|
||||||
SEARCH_SOURCE = [ FDirName $(HAIKU_TOP) src bin route ] ;
|
|
||||||
SimpleTest <userland-bin>route :
|
|
||||||
keywords.c
|
|
||||||
route.c
|
|
||||||
show.c
|
|
||||||
: <installed-userland-networking>libbind.so
|
|
||||||
<installed-userland-networking>libnet.so
|
|
||||||
<installed-userland-networking>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 ]
|
|
||||||
: <userland>arp
|
|
||||||
<userland>ifconfig
|
|
||||||
<userland-bin>route
|
|
||||||
: installed-userland-networking-bin
|
|
||||||
;
|
|
||||||
|
|
||||||
SubInclude HAIKU_TOP src tests add-ons kernel network core ;
|
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 interfaces ;
|
||||||
SubInclude HAIKU_TOP src tests add-ons kernel network ppp ;
|
SubInclude HAIKU_TOP src tests add-ons kernel network ppp ;
|
||||||
|
|||||||
Reference in New Issue
Block a user