Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2025-01-31 18:56:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

- reactivated building of arp, ifconfig and route to all BONE-compatbile targets

Browse Source 
(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:
Oliver Tappe 2006-06-04 13:26:53 +00:00
parent 1434300528
commit e1aed9319d
6 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/arp/Jamfile
View File

@ -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 ;

10
src/bin/ifconfig/Jamfile
View File

@ -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 ;

6
src/bin/ping/Jamfile
View File

@ -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 ;

10
src/bin/route/Jamfile
View File

@ -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 <bin>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
: <bin>route
: binroute ;
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland ]
: <bin>route
: installed-userland-bin-networking
;
Package haiku-networkingkit-cvs :
<bin>route :
# boot home config bin ;

8
src/bin/traceroute/Jamfile
View File

@ -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 ;

35
src/tests/add-ons/kernel/network/Jamfile
View File

@ -21,41 +21,6 @@ HaikuInstall install-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 interfaces ;
SubInclude HAIKU_TOP src tests add-ons kernel network ppp ;