diff options
author | cajun-rat <p@beta16.co.uk> | 2017-05-22 08:34:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-22 08:34:20 +0200 |
commit | 7f79a6cd2542bcb01b5232aa7011e78683141d2c (patch) | |
tree | b57f1c89076a32fee4acfdea890a5ae740acfcf2 /conf | |
parent | 108c545b5843ce6a3ed2c7484440c981a3b4a038 (diff) | |
parent | c82a50cbd3814b3d779fdf7e5cb024e2db27e243 (diff) | |
download | meta-updater-7f79a6cd2542bcb01b5232aa7011e78683141d2c.tar.gz |
Merge pull request #61 from advancedtelematic/feat/noop
Make layer inclusion a neutral operation
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/poky-sota-systemd.conf | 4 | ||||
-rw-r--r-- | conf/distro/poky-sota.conf | 2 | ||||
-rw-r--r-- | conf/include/bblayers/sota_porter.inc | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf index 3a50d66..62b682a 100644 --- a/conf/distro/poky-sota-systemd.conf +++ b/conf/distro/poky-sota-systemd.conf | |||
@@ -1,5 +1,7 @@ | |||
1 | require conf/distro/poky.conf | 1 | require conf/distro/poky.conf |
2 | 2 | ||
3 | DISTRO_FEATURES_append = " sota" | ||
4 | |||
3 | DISTRO = "poky-sota" | 5 | DISTRO = "poky-sota" |
4 | DISTRO_NAME = "OTA-enabled Linux" | 6 | DISTRO_NAME = "OTA-enabled Linux" |
5 | DISTRO_VERSION = "1.0" | 7 | DISTRO_VERSION = "1.0" |
@@ -8,7 +10,7 @@ DISTRO_CODENAME = "sota" | |||
8 | DISTRO_FEATURES_append = " systemd" | 10 | DISTRO_FEATURES_append = " systemd" |
9 | VIRTUAL-RUNTIME_init_manager = "systemd" | 11 | VIRTUAL-RUNTIME_init_manager = "systemd" |
10 | 12 | ||
11 | INHERIT += " sota" | 13 | INHERIT_prepend = " sota" |
12 | IMAGE_INSTALL_append = " connman connman-client rvi-sota-client" | 14 | IMAGE_INSTALL_append = " connman connman-client rvi-sota-client" |
13 | 15 | ||
14 | # Prelinking increases the size of downloads and causes build errors | 16 | # Prelinking increases the size of downloads and causes build errors |
diff --git a/conf/distro/poky-sota.conf b/conf/distro/poky-sota.conf index d6d2a1e..c52395d 100644 --- a/conf/distro/poky-sota.conf +++ b/conf/distro/poky-sota.conf | |||
@@ -1,5 +1,7 @@ | |||
1 | require conf/distro/poky.conf | 1 | require conf/distro/poky.conf |
2 | 2 | ||
3 | DISTRO_FEATURES_append = " sota" | ||
4 | |||
3 | DISTRO = "poky-sota" | 5 | DISTRO = "poky-sota" |
4 | DISTRO_NAME = "OTA-enabled Linux" | 6 | DISTRO_NAME = "OTA-enabled Linux" |
5 | DISTRO_VERSION = "1.0" | 7 | DISTRO_VERSION = "1.0" |
diff --git a/conf/include/bblayers/sota_porter.inc b/conf/include/bblayers/sota_porter.inc index a0888d5..6964ef0 100644 --- a/conf/include/bblayers/sota_porter.inc +++ b/conf/include/bblayers/sota_porter.inc | |||
@@ -1,2 +1,2 @@ | |||
1 | 1 | ||
2 | BBLAYERS += " ${METADIR}/meta-updater-porter ${METADIR}/meta-renesas " | 2 | BBLAYERS += " ${METADIR}/meta-renesas ${METADIR}/meta-renesas/meta-rcar-gen2 ${METADIR}/meta-openembedded/meta-multimedia ${METADIR}/meta-updater-porter" |