Changeset 5e718d9 in mainline for boot/Makefile.common
- Timestamp:
- 2012-08-21T10:04:16Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 67edca6
- Parents:
- 0da6c04 (diff), 6a97f2e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile.common
r0da6c04 r5e718d9 55 55 MKTMPFS = $(TOOLS_PATH)/mktmpfs.py 56 56 MKFAT = $(TOOLS_PATH)/mkfat.py 57 MKEXT 2 = $(TOOLS_PATH)/mkext2.py57 MKEXT4 = $(TOOLS_PATH)/mkext4.py 58 58 MKUIMAGE = $(TOOLS_PATH)/mkuimage.py 59 59 … … 84 84 endif 85 85 86 ifeq ($(RDFMT),ext 2fs)87 INIT_TASKS += $(USPACE_PATH)/srv/fs/ext 2fs/ext2fs86 ifeq ($(RDFMT),ext4fs) 87 INIT_TASKS += $(USPACE_PATH)/srv/fs/ext4fs/ext4fs 88 88 endif 89 89 90 90 RD_SRVS_ESSENTIAL = \ 91 $(USPACE_PATH)/srv/hid/fb/fb \92 91 $(USPACE_PATH)/srv/hid/input/input \ 92 $(USPACE_PATH)/srv/hid/output/output \ 93 93 $(USPACE_PATH)/srv/hid/console/console \ 94 $(USPACE_PATH)/srv/fs/locfs/locfs 94 $(USPACE_PATH)/srv/devman/devman \ 95 $(USPACE_PATH)/srv/fs/locfs/locfs \ 96 $(USPACE_PATH)/srv/hid/compositor/compositor 95 97 96 98 RD_SRVS_NON_ESSENTIAL = \ … … 106 108 $(USPACE_PATH)/srv/fs/exfat/exfat \ 107 109 $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \ 110 $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \ 108 111 $(USPACE_PATH)/srv/hid/remcons/remcons \ 112 $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \ 109 113 $(USPACE_PATH)/srv/net/ethip/ethip \ 110 114 $(USPACE_PATH)/srv/net/inetsrv/inetsrv \ … … 112 116 $(USPACE_PATH)/srv/net/tcp/tcp \ 113 117 $(USPACE_PATH)/srv/net/udp/udp \ 114 $(USPACE_PATH)/srv/taskmon/taskmon \ 115 $(USPACE_PATH)/srv/devman/devman 118 $(USPACE_PATH)/srv/taskmon/taskmon 116 119 117 120 RD_DRVS = \ 118 121 infrastructure/root \ 119 122 infrastructure/rootvirt \ 123 fb/kfb \ 120 124 test/test1 \ 121 125 test/test2 \ … … 148 152 $(USPACE_PATH)/app/bdsh/bdsh \ 149 153 $(USPACE_PATH)/app/getterm/getterm \ 150 $(USPACE_PATH)/app/klog/klog 154 $(USPACE_PATH)/app/klog/klog \ 155 $(USPACE_PATH)/app/vlaunch/vlaunch \ 156 $(USPACE_PATH)/app/vterm/vterm 151 157 152 158 RD_APPS_NON_ESSENTIAL = \ … … 174 180 $(USPACE_PATH)/app/tester/tester \ 175 181 $(USPACE_PATH)/app/testread/testread \ 182 $(USPACE_PATH)/app/testwrit/testwrit \ 176 183 $(USPACE_PATH)/app/tetris/tetris \ 177 184 $(USPACE_PATH)/app/trace/trace \ … … 188 195 $(USPACE_PATH)/app/vuhid/vuh \ 189 196 $(USPACE_PATH)/app/mkbd/mkbd \ 190 $(USPACE_PATH)/app/websrv/websrv 197 $(USPACE_PATH)/app/websrv/websrv \ 198 $(USPACE_PATH)/app/vdemo/vdemo 191 199 192 200 ifeq ($(CONFIG_PCC),y)
Note:
See TracChangeset
for help on using the changeset viewer.