Changeset 8fefd8b in mainline for boot

Timestamp:

2018-10-11T14:16:33Z (7 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

Location:

boot

Files:

• Makefile (modified) (1 diff)
• Makefile.common (modified) (1 diff)
• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/arm32/Makefile.inc (modified) (1 diff)
• arch/ppc32/Makefile.inc (modified) (1 diff)

boot/Makefile

@@ -44 +44 @@
         mkdir -p "$(DIST_PATH)/loc/"
         mkdir -p "$(DIST_PATH)/log/"
-        mkdir -p "$(DIST_PATH)/srv/"
         mkdir -p "$(DIST_PATH)/test/"
         mkdir -p "$(DIST_PATH)/tmp/"
         mkdir -p "$(DIST_PATH)/vol/"
         mkdir -p "$(DIST_PATH)/w/"
-        for file in $(RD_SRVS) ; do \
-                cp "$$file" "$(DIST_PATH)/srv/" ; \
+
+        for srv in $(RD_SRVS) ; do \
+                srv_dir="`dirname "$$srv"`" ; \
+                srv_name="`basename "$$srv"`" ; \
+                mkdir -p "$(DIST_PATH)/srv/$$srv_dir" ; \
+                cp "$(USPACE_PATH)/srv/$$srv/$$srv_name" "$(DIST_PATH)/srv/$$srv" ; \
         done
+
         for file in $(RD_LIBS) ; do \
                 cp "$$file" "$(DIST_PATH)/lib/" ; \
         done
+
 ifeq ($(CONFIG_DEVEL_FILES), y)
         mkdir -p "$(DIST_PATH)/inc/c/"

boot/Makefile.common

@@ -89 +89 @@
 
 RD_SRVS_ESSENTIAL = \
-        $(USPACE_PATH)/srv/hid/input/input \
-        $(USPACE_PATH)/srv/hid/output/output \
-        $(USPACE_PATH)/srv/hid/console/console \
-        $(USPACE_PATH)/srv/devman/devman \
-        $(USPACE_PATH)/srv/fs/locfs/locfs \
-        $(USPACE_PATH)/srv/hid/compositor/compositor \
-        $(USPACE_PATH)/srv/klog/klog
+        hid/input \
+        hid/output \
+        hid/console \
+        devman \
+        fs/locfs \
+        hid/compositor \
+        klog
 
 RD_SRVS_NON_ESSENTIAL = \
-        $(USPACE_PATH)/srv/bd/file_bd/file_bd \
-        $(USPACE_PATH)/srv/bd/sata_bd/sata_bd \
-        $(USPACE_PATH)/srv/bd/vbd/vbd \
-        $(USPACE_PATH)/srv/clipboard/clipboard \
-        $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
-        $(USPACE_PATH)/srv/fs/fat/fat \
-        $(USPACE_PATH)/srv/fs/mfs/mfs \
-        $(USPACE_PATH)/srv/fs/cdfs/cdfs \
-        $(USPACE_PATH)/srv/fs/exfat/exfat \
-        $(USPACE_PATH)/srv/fs/udf/udf \
-        $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
-        $(USPACE_PATH)/srv/hid/remcons/remcons \
-        $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
-        $(USPACE_PATH)/srv/hid/rfb/rfb \
-        $(USPACE_PATH)/srv/net/dhcp/dhcp \
-        $(USPACE_PATH)/srv/net/dnsrsrv/dnsrsrv \
-        $(USPACE_PATH)/srv/net/ethip/ethip \
-        $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
-        $(USPACE_PATH)/srv/net/loopip/loopip \
-        $(USPACE_PATH)/srv/net/nconfsrv/nconfsrv \
-        $(USPACE_PATH)/srv/net/slip/slip \
-        $(USPACE_PATH)/srv/net/tcp/tcp \
-        $(USPACE_PATH)/srv/net/udp/udp \
-        $(USPACE_PATH)/srv/taskmon/taskmon \
-        $(USPACE_PATH)/srv/test/chardev-test/chardev-test \
-        $(USPACE_PATH)/srv/volsrv/volsrv
+        bd/file_bd \
+        bd/sata_bd \
+        bd/vbd \
+        clipboard \
+        fs/tmpfs \
+        fs/fat \
+        fs/mfs \
+        fs/cdfs \
+        fs/exfat \
+        fs/udf \
+        fs/ext4fs \
+        hid/remcons \
+        hid/isdv4_tablet \
+        hid/rfb \
+        net/dhcp \
+        net/dnsrsrv \
+        net/ethip \
+        net/inetsrv \
+        net/loopip \
+        net/nconfsrv \
+        net/slip \
+        net/tcp \
+        net/udp \
+        taskmon \
+        test/chardev-test \
+        volsrv
 
 RD_DRVS_ESSENTIAL = \

boot/arch/amd64/Makefile.inc

@@ -28 +28 @@
 
 RD_SRVS_ESSENTIAL += \
-        $(USPACE_PATH)/srv/audio/hound/hound \
-        $(USPACE_PATH)/srv/devman/devman
+        audio/hound \
+        devman
 
 RD_DRVS_ESSENTIAL += \

boot/arch/arm32/Makefile.inc

@@ -61 +61 @@
 ifeq ($(MACHINE), gta02)
         RD_SRVS_ESSENTIAL += \
-                $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
-                $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
+                hid/s3c24xx_ts \
+                hw/char/s3c24xx_uart
 endif
 

boot/arch/ppc32/Makefile.inc

@@ -40 +40 @@
 
 RD_SRVS_ESSENTIAL += \
-        $(USPACE_PATH)/srv/hw/bus/cuda_adb/cuda_adb
+        hw/bus/cuda_adb
 
 RD_DRVS_ESSENTIAL += \