Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 0e8c158 in mainline


Ignore:
Timestamp:
2018-10-12T12:18:16Z (3 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master
Children:
6d00aff
Parents:
8fefd8b
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-12 12:09:54)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-12 12:18:16)
Message:

App listing in boot doesn't need whole binary path for each entry

This is not purely cosmetic. Making most of the information implicit
might allow us to automatically install app-associated data and tests,
reducing the amount of metadata maintained.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile

    r8fefd8b r0e8c158  
    6767        cat "$(USPACE_PATH)/lib/c/arch/$(UARCH)/_link.ld" | sed 's/^STARTUP(.*)$$//g' > "$(DIST_PATH)/inc/_link.ld"
    6868endif
    69         for file in $(RD_APPS) ; do \
    70                 cp "$$file" "$(DIST_PATH)/app/" ; \
     69        for app in $(RD_APPS) ; do \
     70                app_dir="`dirname "$$app"`" ; \
     71                app_name="`basename "$$app"`" ; \
     72                mkdir -p "$(DIST_PATH)/app/$$app_dir" ; \
     73                cp "$(USPACE_PATH)/app/$$app/$$app_name" "$(DIST_PATH)/app/$$app" ; \
    7174        done
    7275        for file in $(RD_DATA) ; do \
  • boot/Makefile.common

    r8fefd8b r0e8c158  
    161161endif
    162162
    163 RD_APPS_ESSENTIAL = \
    164         $(USPACE_PATH)/app/bdsh/bdsh \
    165         $(USPACE_PATH)/app/getterm/getterm \
    166         $(USPACE_PATH)/app/kio/kio \
    167         $(USPACE_PATH)/app/vlaunch/vlaunch \
    168         $(USPACE_PATH)/app/vterm/vterm
     163RD_APPS_ESSENTIAL = bdsh getterm kio vlaunch vterm
    169164
    170165RD_APPS_NON_ESSENTIAL = \
    171         $(USPACE_PATH)/app/barber/barber \
    172         $(USPACE_PATH)/app/bithenge/bithenge \
    173         $(USPACE_PATH)/app/blkdump/blkdump \
    174         $(USPACE_PATH)/app/bnchmark/bnchmark \
    175         $(USPACE_PATH)/app/contacts/contacts \
    176         $(USPACE_PATH)/app/corecfg/corecfg \
    177         $(USPACE_PATH)/app/cpptest/cpptest \
    178         $(USPACE_PATH)/app/devctl/devctl \
    179         $(USPACE_PATH)/app/dnscfg/dnscfg \
    180         $(USPACE_PATH)/app/dnsres/dnsres \
    181         $(USPACE_PATH)/app/download/download \
    182         $(USPACE_PATH)/app/edit/edit \
    183         $(USPACE_PATH)/app/fdisk/fdisk \
    184         $(USPACE_PATH)/app/gunzip/gunzip \
    185         $(USPACE_PATH)/app/inet/inet \
    186         $(USPACE_PATH)/app/kill/kill \
    187         $(USPACE_PATH)/app/killall/killall \
    188         $(USPACE_PATH)/app/loc/loc \
    189         $(USPACE_PATH)/app/mixerctl/mixerctl \
    190         $(USPACE_PATH)/app/modplay/modplay \
    191         $(USPACE_PATH)/app/logset/logset \
    192         $(USPACE_PATH)/app/mkfat/mkfat \
    193         $(USPACE_PATH)/app/mkexfat/mkexfat \
    194         $(USPACE_PATH)/app/mkext4/mkext4 \
    195         $(USPACE_PATH)/app/mkmfs/mkmfs \
    196         $(USPACE_PATH)/app/nic/nic \
    197         $(USPACE_PATH)/app/rcutest/rcutest \
    198         $(USPACE_PATH)/app/rcubench/rcubench \
    199         $(USPACE_PATH)/app/sbi/sbi \
    200         $(USPACE_PATH)/app/sportdmp/sportdmp \
    201         $(USPACE_PATH)/app/redir/redir \
    202         $(USPACE_PATH)/app/taskdump/taskdump \
    203         $(USPACE_PATH)/app/tester/tester \
    204         $(USPACE_PATH)/app/testread/testread \
    205         $(USPACE_PATH)/app/testwrit/testwrit \
    206         $(USPACE_PATH)/app/tetris/tetris \
    207         $(USPACE_PATH)/app/tmon/tmon \
    208         $(USPACE_PATH)/app/trace/trace \
    209         $(USPACE_PATH)/app/netecho/netecho \
    210         $(USPACE_PATH)/app/nterm/nterm \
    211         $(USPACE_PATH)/app/ping/ping \
    212         $(USPACE_PATH)/app/pkg/pkg \
    213         $(USPACE_PATH)/app/stats/stats \
    214         $(USPACE_PATH)/app/sysinfo/sysinfo \
    215         $(USPACE_PATH)/app/sysinst/sysinst \
    216         $(USPACE_PATH)/app/top/top \
    217         $(USPACE_PATH)/app/untar/untar \
    218         $(USPACE_PATH)/app/usbinfo/usbinfo \
    219         $(USPACE_PATH)/app/vol/vol \
    220         $(USPACE_PATH)/app/vuhid/vuh \
    221         $(USPACE_PATH)/app/mkbd/mkbd \
    222         $(USPACE_PATH)/app/websrv/websrv \
    223         $(USPACE_PATH)/app/date/date \
    224         $(USPACE_PATH)/app/vcalc/vcalc \
    225         $(USPACE_PATH)/app/vdemo/vdemo \
    226         $(USPACE_PATH)/app/viewer/viewer \
    227         $(USPACE_PATH)/app/df/df \
    228         $(USPACE_PATH)/app/fontviewer/fontviewer \
    229         $(USPACE_PATH)/app/wifi_supplicant/wifi_supplicant
     166        barber \
     167        bithenge \
     168        blkdump \
     169        bnchmark \
     170        contacts \
     171        corecfg \
     172        cpptest \
     173        devctl \
     174        dnscfg \
     175        dnsres \
     176        download \
     177        edit \
     178        fdisk \
     179        gunzip \
     180        inet \
     181        kill \
     182        killall \
     183        loc \
     184        mixerctl \
     185        modplay \
     186        logset \
     187        mkfat \
     188        mkexfat \
     189        mkext4 \
     190        mkmfs \
     191        nic \
     192        rcutest \
     193        rcubench \
     194        sbi \
     195        sportdmp \
     196        redir \
     197        taskdump \
     198        tester \
     199        testread \
     200        testwrit \
     201        tetris \
     202        tmon \
     203        trace \
     204        netecho \
     205        nterm \
     206        ping \
     207        pkg \
     208        stats \
     209        sysinfo \
     210        sysinst \
     211        top \
     212        untar \
     213        usbinfo \
     214        vol \
     215        vuhid \
     216        mkbd \
     217        websrv \
     218        date \
     219        vcalc \
     220        vdemo \
     221        viewer \
     222        df \
     223        fontviewer \
     224        wifi_supplicant
    230225
    231226ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
    232         RD_APPS_NON_ESSENTIAL += \
    233                 $(USPACE_PATH)/app/dltest/dltest \
    234                 $(USPACE_PATH)/app/dltests/dltests
     227        RD_APPS_NON_ESSENTIAL += dltest dltests
    235228endif
    236229
  • boot/arch/amd64/Makefile.inc

    r8fefd8b r0e8c158  
    6363
    6464RD_APPS_ESSENTIAL += \
    65         $(USPACE_PATH)/app/edit/edit \
    66         $(USPACE_PATH)/app/mixerctl/mixerctl \
    67         $(USPACE_PATH)/app/wavplay/wavplay
     65        edit \
     66        mixerctl \
     67        wavplay
    6868
    6969RD_DATA_NON_ESSENTIAL += \
  • uspace/app/vuhid/Makefile

    r8fefd8b r0e8c158  
    3030# acronym for virtual USB human input device
    3131# (it is really annoying to write long names)
    32 BINARY = vuh
     32BINARY = vuhid
    3333
    3434LIBS = usb usbdev usbhid usbvirt drv
Note: See TracChangeset for help on using the changeset viewer.