Changeset 8fefd8b in mainline


Ignore:
Timestamp:
2018-10-11T14:16:33Z (6 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0e8c158
Parents:
9286475
Message:

Preserve srv directory structure

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    r9286475 r8fefd8b  
    4444        mkdir -p "$(DIST_PATH)/loc/"
    4545        mkdir -p "$(DIST_PATH)/log/"
    46         mkdir -p "$(DIST_PATH)/srv/"
    4746        mkdir -p "$(DIST_PATH)/test/"
    4847        mkdir -p "$(DIST_PATH)/tmp/"
    4948        mkdir -p "$(DIST_PATH)/vol/"
    5049        mkdir -p "$(DIST_PATH)/w/"
    51         for file in $(RD_SRVS) ; do \
    52                 cp "$$file" "$(DIST_PATH)/srv/" ; \
     50
     51        for srv in $(RD_SRVS) ; do \
     52                srv_dir="`dirname "$$srv"`" ; \
     53                srv_name="`basename "$$srv"`" ; \
     54                mkdir -p "$(DIST_PATH)/srv/$$srv_dir" ; \
     55                cp "$(USPACE_PATH)/srv/$$srv/$$srv_name" "$(DIST_PATH)/srv/$$srv" ; \
    5356        done
     57
    5458        for file in $(RD_LIBS) ; do \
    5559                cp "$$file" "$(DIST_PATH)/lib/" ; \
    5660        done
     61
    5762ifeq ($(CONFIG_DEVEL_FILES), y)
    5863        mkdir -p "$(DIST_PATH)/inc/c/"

  • boot/Makefile.common

    r9286475 r8fefd8b  
    8989
    9090RD_SRVS_ESSENTIAL = \
    91         $(USPACE_PATH)/srv/hid/input/input \
    92         $(USPACE_PATH)/srv/hid/output/output \
    93         $(USPACE_PATH)/srv/hid/console/console \
    94         $(USPACE_PATH)/srv/devman/devman \
    95         $(USPACE_PATH)/srv/fs/locfs/locfs \
    96         $(USPACE_PATH)/srv/hid/compositor/compositor \
    97         $(USPACE_PATH)/srv/klog/klog
     91        hid/input \
     92        hid/output \
     93        hid/console \
     94        devman \
     95        fs/locfs \
     96        hid/compositor \
     97        klog
    9898
    9999RD_SRVS_NON_ESSENTIAL = \
    100         $(USPACE_PATH)/srv/bd/file_bd/file_bd \
    101         $(USPACE_PATH)/srv/bd/sata_bd/sata_bd \
    102         $(USPACE_PATH)/srv/bd/vbd/vbd \
    103         $(USPACE_PATH)/srv/clipboard/clipboard \
    104         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
    105         $(USPACE_PATH)/srv/fs/fat/fat \
    106         $(USPACE_PATH)/srv/fs/mfs/mfs \
    107         $(USPACE_PATH)/srv/fs/cdfs/cdfs \
    108         $(USPACE_PATH)/srv/fs/exfat/exfat \
    109         $(USPACE_PATH)/srv/fs/udf/udf \
    110         $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
    111         $(USPACE_PATH)/srv/hid/remcons/remcons \
    112         $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
    113         $(USPACE_PATH)/srv/hid/rfb/rfb \
    114         $(USPACE_PATH)/srv/net/dhcp/dhcp \
    115         $(USPACE_PATH)/srv/net/dnsrsrv/dnsrsrv \
    116         $(USPACE_PATH)/srv/net/ethip/ethip \
    117         $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
    118         $(USPACE_PATH)/srv/net/loopip/loopip \
    119         $(USPACE_PATH)/srv/net/nconfsrv/nconfsrv \
    120         $(USPACE_PATH)/srv/net/slip/slip \
    121         $(USPACE_PATH)/srv/net/tcp/tcp \
    122         $(USPACE_PATH)/srv/net/udp/udp \
    123         $(USPACE_PATH)/srv/taskmon/taskmon \
    124         $(USPACE_PATH)/srv/test/chardev-test/chardev-test \
    125         $(USPACE_PATH)/srv/volsrv/volsrv
     100        bd/file_bd \
     101        bd/sata_bd \
     102        bd/vbd \
     103        clipboard \
     104        fs/tmpfs \
     105        fs/fat \
     106        fs/mfs \
     107        fs/cdfs \
     108        fs/exfat \
     109        fs/udf \
     110        fs/ext4fs \
     111        hid/remcons \
     112        hid/isdv4_tablet \
     113        hid/rfb \
     114        net/dhcp \
     115        net/dnsrsrv \
     116        net/ethip \
     117        net/inetsrv \
     118        net/loopip \
     119        net/nconfsrv \
     120        net/slip \
     121        net/tcp \
     122        net/udp \
     123        taskmon \
     124        test/chardev-test \
     125        volsrv
    126126
    127127RD_DRVS_ESSENTIAL = \

  • boot/arch/amd64/Makefile.inc

    r9286475 r8fefd8b  
    2828
    2929RD_SRVS_ESSENTIAL += \
    30         $(USPACE_PATH)/srv/audio/hound/hound \
    31         $(USPACE_PATH)/srv/devman/devman
     30        audio/hound \
     31        devman
    3232
    3333RD_DRVS_ESSENTIAL += \

  • boot/arch/arm32/Makefile.inc

    r9286475 r8fefd8b  
    6161ifeq ($(MACHINE), gta02)
    6262        RD_SRVS_ESSENTIAL += \
    63                 $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
    64                 $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
     63                hid/s3c24xx_ts \
     64                hw/char/s3c24xx_uart
    6565endif
    6666

  • boot/arch/ppc32/Makefile.inc

    r9286475 r8fefd8b  
    4040
    4141RD_SRVS_ESSENTIAL += \
    42         $(USPACE_PATH)/srv/hw/bus/cuda_adb/cuda_adb
     42        hw/bus/cuda_adb
    4343
    4444RD_DRVS_ESSENTIAL += \

  • uspace/app/init/init.c

    r9286475 r8fefd8b  
    6060#define TMPFS_MOUNT_POINT  "/tmp"
    6161
    62 #define SRV_CONSOLE  "/srv/console"
     62#define SRV_CONSOLE  "/srv/hid/console"
    6363#define APP_GETTERM  "/app/getterm"
    6464
    65 #define SRV_COMPOSITOR  "/srv/compositor"
     65#define SRV_COMPOSITOR  "/srv/hid/compositor"
    6666
    6767#define HID_INPUT              "hid/input"
    … …  
    413413        /* Make sure file systems are running. */
    414414        if (str_cmp(STRING(RDFMT), "tmpfs") != 0)
    415                 srv_start("/srv/tmpfs");
     415                srv_start("/srv/fs/tmpfs");
    416416        if (str_cmp(STRING(RDFMT), "exfat") != 0)
    417                 srv_start("/srv/exfat");
     417                srv_start("/srv/fs/exfat");
    418418        if (str_cmp(STRING(RDFMT), "fat") != 0)
    419                 srv_start("/srv/fat");
    420         srv_start("/srv/cdfs");
    421         srv_start("/srv/mfs");
     419                srv_start("/srv/fs/fat");
     420        srv_start("/srv/fs/cdfs");
     421        srv_start("/srv/fs/mfs");
    422422
    423423        srv_start("/srv/klog");
    424         srv_start("/srv/locfs");
     424        srv_start("/srv/fs/locfs");
    425425        srv_start("/srv/taskmon");
    426426
    … …  
    433433
    434434        srv_start("/srv/devman");
    435         srv_start("/srv/s3c24xx_uart");
    436         srv_start("/srv/s3c24xx_ts");
    437 
    438         srv_start("/srv/vbd");
     435        srv_start("/srv/hid/s3c24xx_uart");
     436        srv_start("/srv/hid/s3c24xx_ts");
     437
     438        srv_start("/srv/bd/vbd");
    439439        srv_start("/srv/volsrv");
    440440
    441         srv_start("/srv/loopip");
    442         srv_start("/srv/ethip");
    443         srv_start("/srv/inetsrv");
    444         srv_start("/srv/tcp");
    445         srv_start("/srv/udp");
    446         srv_start("/srv/dnsrsrv");
    447         srv_start("/srv/dhcp");
    448         srv_start("/srv/nconfsrv");
     441        srv_start("/srv/net/loopip");
     442        srv_start("/srv/net/ethip");
     443        srv_start("/srv/net/inetsrv");
     444        srv_start("/srv/net/tcp");
     445        srv_start("/srv/net/udp");
     446        srv_start("/srv/net/dnsrsrv");
     447        srv_start("/srv/net/dhcp");
     448        srv_start("/srv/net/nconfsrv");
    449449
    450450        srv_start("/srv/clipboard");
    451         srv_start("/srv/remcons");
    452 
    453         srv_start("/srv/input", HID_INPUT);
    454         srv_start("/srv/output", HID_OUTPUT);
    455         srv_start("/srv/hound");
     451        srv_start("/srv/hid/remcons");
     452
     453        srv_start("/srv/hid/input", HID_INPUT);
     454        srv_start("/srv/hid/output", HID_OUTPUT);
     455        srv_start("/srv/audio/hound");
    456456
    457457        init_sysvol();

  • uspace/app/sysinst/rdimg.c

    r9286475 r8fefd8b  
    4343#include "rdimg.h"
    4444
    45 #define FILE_BD "/srv/file_bd"
     45#define FILE_BD "/srv/bd/file_bd"
    4646#define RD_SVC "bd/iird"
    4747#define RD_LABEL "HelenOS-rd"

  • uspace/srv/hw/char/s3c24xx_uart/Makefile

    r9286475 r8fefd8b  
    3030USPACE_PREFIX = ../../../..
    3131
    32 # Need to use short name because of FAT 8+3 limit
    33 BINARY = s3c24ser
     32BINARY = s3c24xx_uart
    3433
    3534SOURCES = \
Note: See TracChangeset for help on using the changeset viewer.