Changeset a91b828 in mainline for boot/Makefile.common

Timestamp:

2019-01-10T20:37:54Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6480827

Parents:

0a520db (diff), 272a293 (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.

git-author:

Vojtech Horky <vojtech.horky@…> (2019-01-10 20:37:54)

git-committer:

GitHub <noreply@…> (2019-01-10 20:37:54)

Message:

Merge PR #150 from vhotspur/defaults

This is change is mostly motivated by better coverage in CI:

• Smaller image means we can pack more ported software to the image for testing (currently, this means only mips32 on MSIM).
• Inclusion of PCUT tests means that we can run them regularly too (patch to CI for that is almost ready).

File:

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

boot/Makefile.common

@@ -94 +94 @@
         devman \
         fs/locfs \
-        hid/compositor \
         klog
+
+ifeq ($(CONFIG_FB), y)
+        RD_SRVS_ESSENTIAL += \
+                hid/compositor
+endif
 
 RD_SRVS_NON_ESSENTIAL = \
@@ -162 +166 @@
 endif
 
-RD_APPS_ESSENTIAL = bdsh getterm kio vlaunch vterm
+RD_APPS_ESSENTIAL = \
+        bdsh \
+        getterm \
+        kio
+
+ifeq ($(CONFIG_FB), y)
+        RD_APPS_ESSENTIAL += \
+                vlaunch \
+                vterm
+endif
 
 RD_APPS_NON_ESSENTIAL = \