Changeset 5203e256 in mainline for boot


Ignore:
Timestamp:
2011-06-20T19:54:22Z (15 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a40dea3
Parents:
73d288c
Message:

keep the drivers source tree tidy by using logical subdirectories

Location:
boot
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    r73d288c r5203e256  
    6565        done
    6666        for drv in $(RD_DRVS) ; do \
    67                 mkdir -p "$(DIST_PATH)/$(DRVS_PATH)/$$drv" ; \
    68                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv/$$drv" "$(DIST_PATH)/$(DRVS_PATH)/$$drv/$$drv" ; \
    69                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv/$$drv.ma" "$(DIST_PATH)/$(DRVS_PATH)/$$drv/$$drv.ma" ; \
     67                drv_dir="`dirname "$$drv"`" ; \
     68                drv_name="`basename "$$drv"`" ; \
     69                mkdir -p "$(DIST_PATH)/$(DRVS_PATH)/$$drv_name" ; \
     70                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv_dir/$$drv_name/$$drv_name" "$(DIST_PATH)/$(DRVS_PATH)/$$drv_name/" ; \
     71                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv_dir/$$drv_name/$$drv_name.ma" "$(DIST_PATH)/$(DRVS_PATH)/$$drv_name/" ; \
    7072        done
    7173        for file in $(RD_DRV_CFG) ; do \
    72                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file" "$(DIST_PATH)/$(DRVS_PATH)/$$file" ; \
     74                file_dir="`dirname "$$file"`" ; \
     75                file_name="`basename "$$file"`" ; \
     76                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.dev" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
    7377        done
    7478       

  • boot/Makefile.common

    r73d288c r5203e256  
    110110        $(USPACE_PATH)/srv/net/net/net \
    111111        $(USPACE_PATH)/srv/devman/devman
    112        
     112
    113113RD_DRVS = \
    114         root \
    115         rootvirt \
    116         test1 \
    117         test2 \
    118         test3
    119 
    120 RD_DRV_CFG = 
     114        infrastructure/root \
     115        infrastructure/rootvirt \
     116        test/test1 \
     117        test/test2 \
     118        test/test3
     119
     120RD_DRV_CFG =
    121121
    122122RD_LIBS =

  • boot/arch/amd64/Makefile.inc

    r73d288c r5203e256  
    3939
    4040RD_DRVS += \
    41         rootpc \
    42         pciintel \
    43         isa \
    44         ns8250 \
    45         ehci\
    46         ohci \
    47         uhci \
    48         uhcirh \
    49         usbflbk \
    50         usbhub \
    51         usbhid \
    52         usbmast \
    53         usbmid \
    54         usbmouse \
    55         vhc
     41        infrastructure/rootpc \
     42        bus/pci/pciintel \
     43        bus/isa \
     44        char/ns8250 \
     45        bus/usb/ehci\
     46        bus/usb/ohci \
     47        bus/usb/uhci \
     48        bus/usb/uhcirh \
     49        bus/usb/usbflbk \
     50        bus/usb/usbhub \
     51        bus/usb/usbhid \
     52        bus/usb/usbmast \
     53        bus/usb/usbmid \
     54        bus/usb/usbmouse \
     55        bus/usb/vhc
    5656
    5757RD_DRV_CFG += \
    58         isa/isa.dev
     58        bus/isa
    5959
    6060BOOT_OUTPUT = $(ROOT_PATH)/image.iso

  • boot/arch/ppc32/Makefile.inc

    r73d288c r5203e256  
    4747
    4848RD_DRVS += \
    49         rootmac
     49        infrastructure/rootmac
    5050
    5151SOURCES = \
Note: See TracChangeset for help on using the changeset viewer.