From 0e10a7f8034dda684c27a6f74f0392d534203dcd Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Thu, 6 Nov 2003 20:06:59 +0000 Subject: [PATCH] Fix sis900 and rtl8139 binaries final placement and installation rules. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5269 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/drivers/network/rtl8139/Jamfile | 26 ++++++++++++++++++- .../kernel/drivers/network/sis900/Jamfile | 24 ++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/rtl8139/Jamfile b/src/add-ons/kernel/drivers/network/rtl8139/Jamfile index 8c62ca0e66..d70bbc53d8 100644 --- a/src/add-ons/kernel/drivers/network/rtl8139/Jamfile +++ b/src/add-ons/kernel/drivers/network/rtl8139/Jamfile @@ -3,11 +3,22 @@ SubDir OBOS_TOP src add-ons kernel drivers network rtl8139 ; # set some additional flags SubDirCcFlags -Wall ; -R5KernelAddon rtl8139 : [ FDirName kernel drivers network ] : +R5KernelAddon rtl8139 : kernel drivers bin : driver.c util.c ; +# Link driver(s) to kernel/drivers/dev/net +{ + local dir = [ FDirName $(OBOS_ADDON_DIR) kernel drivers dev net ] ; + + local instDriver = rtl8139 ; + MakeLocate $(instDriver) : $(dir) ; + RelSymLink $(instDriver) : rtl8139 ; +} + + + rule InstallRTL8139 { Depends $(<) : $(>) ; @@ -19,3 +30,16 @@ actions ignore InstallRTL8139 } #InstallRTL8139 install : rtl8139 ; + +# Installation + +OBOSInstall install-networking : /boot/home/config/add-ons/kernel/drivers/bin : + rtl8139 +; + +OBOSInstallRelSymLink install-networking : /boot/home/config/add-ons/kernel/drivers/dev/net : + rtl8139 : + installed-symlink +; + + diff --git a/src/add-ons/kernel/drivers/network/sis900/Jamfile b/src/add-ons/kernel/drivers/network/sis900/Jamfile index 179ec881ce..719df3861e 100644 --- a/src/add-ons/kernel/drivers/network/sis900/Jamfile +++ b/src/add-ons/kernel/drivers/network/sis900/Jamfile @@ -3,13 +3,23 @@ SubDir OBOS_TOP src add-ons kernel drivers network sis900 ; # set some additional flags SubDirCcFlags -Wall ; -R5KernelAddon sis900 : [ FDirName kernel drivers network ] : +R5KernelAddon sis900 : kernel drivers bin : driver.c device.c interface.c sis900.c ; +# Link driver(s) to kernel/drivers/dev/net +{ + local dir = [ FDirName $(OBOS_ADDON_DIR) kernel drivers dev net ] ; + + local instDriver = sis900 ; + MakeLocate $(instDriver) : $(dir) ; + RelSymLink $(instDriver) : sis900 ; +} + + rule InstallSiS900 { Depends $(<) : $(>) ; @@ -21,3 +31,15 @@ actions ignore InstallSiS900 } #InstallSiS900 install : sis900 ; + +# Installation + +OBOSInstall install-networking : /boot/home/config/add-ons/kernel/drivers/bin : + sis900 +; + +OBOSInstallRelSymLink install-networking : /boot/home/config/add-ons/kernel/drivers/dev/net : + sis900 : + installed-symlink +; +