Changeset 7b1ae09 in mainline

Timestamp:

2019-08-17T12:49:43Z (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:

a8ccc7e

Parents:

bc48242

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-27 09:56:43)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

cleanup

Files:

• boot/Makefile.common (modified) (2 diffs)
• meson.build (modified) (2 diffs)

boot/Makefile.common

@@ -86 +86 @@
 endif
 
-RD_SRVS_ESSENTIAL = \
-        hid/input \
-        hid/output \
-        hid/console \
-        devman \
-        fs/locfs \
-        klog
-
-ifeq ($(CONFIG_FB), y)
-        RD_SRVS_ESSENTIAL += \
-                hid/compositor
-endif
-
-RD_SRVS_NON_ESSENTIAL = \
-        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 \
-        test/ipc-test \
-        volsrv
-
-RD_DRVS_ESSENTIAL = \
-        root/root \
-        root/virt \
-        fb/kfb
-
-RD_DRVS_NON_ESSENTIAL = \
-        test/test1 \
-        test/test2 \
-        test/test3 \
-        nic/ne2k \
-        nic/e1k \
-        nic/rtl8139 \
-        nic/rtl8169 \
-        nic/ar9271 \
-        nic/virtio-net \
-        block/ahci \
-        block/virtio-blk
-
-RD_APPS_ESSENTIAL = \
-        bdsh \
-        getterm \
-        kio
-
-ifeq ($(CONFIG_FB), y)
-        RD_APPS_ESSENTIAL += \
-                vlaunch \
-                vterm
-endif
-
-RD_APPS_NON_ESSENTIAL = \
-        barber \
-        bithenge \
-        blkdump \
-        contacts \
-        corecfg \
-        cpptest \
-        devctl \
-        dnscfg \
-        dnsres \
-        download \
-        edit \
-        fdisk \
-        gunzip \
-        hbench \
-        inet \
-        kill \
-        killall \
-        loc \
-        lprint \
-        mixerctl \
-        modplay \
-        logset \
-        mkfat \
-        mkexfat \
-        mkext4 \
-        mkmfs \
-        nic \
-        sbi \
-        sportdmp \
-        redir \
-        taskdump \
-        tester \
-        testread \
-        testrunner \
-        testwrit \
-        tetris \
-        tmon \
-        trace \
-        netecho \
-        nterm \
-        pci \
-        ping \
-        pkg \
-        stats \
-        sysinfo \
-        sysinst \
-        top \
-        untar \
-        usbinfo \
-        vol \
-        vuhid \
-        mkbd \
-        websrv \
-        date \
-        vcalc \
-        vdemo \
-        viewer \
-        df \
-        fontviewer \
-        wifi_supplicant
-
-ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
-        RD_APPS_NON_ESSENTIAL += dltest dltests
-endif
-
 COMPONENTS = \
         $(DIST_PATH)/boot/kernel.elf \
@@ -235 +98 @@
 -include arch/$(BARCH)/Makefile.inc
 
-ifeq ($(CONFIG_BAREBONE),y)
-        RD_SRVS = $(RD_SRVS_ESSENTIAL)
-        RD_APPS = $(RD_APPS_ESSENTIAL)
-        RD_DRVS = $(RD_DRVS_ESSENTIAL)
-else
-        RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
-        RD_APPS = $(RD_APPS_ESSENTIAL) $(RD_APPS_NON_ESSENTIAL)
-        RD_DRVS = $(RD_DRVS_ESSENTIAL) $(RD_DRVS_NON_ESSENTIAL)
-endif
-
 MODULES := $(notdir $(COMPONENTS))
 

meson.build

@@ -275 +275 @@
         'srv/devman',
         'srv/fs/locfs',
+        'srv/hid/console',
         'srv/hid/input',
         'srv/hid/output',
-        'srv/hid/compositor',
-        'srv/hid/console',
         'srv/klog',
 
@@ -290 +289 @@
                 'app/vlaunch',
                 'app/vterm',
+
+                'srv/hid/compositor',
         ]
 endif