diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2022-01-31 16:14:21 +0000 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-24 15:46:26 +0000 |
commit | 20b5fb31c713ebf74b9c457c8150958721c26c9d (patch) | |
tree | a47398794064c2b15a3cb69be497085866abe5b7 | |
parent | e31b6352a04f2d53f66d38fc2cfb25de5113611e (diff) |
Coin: use include files for configuration
Restructure the Coin build configs so that all configurations
are already in .inc files that can be easily included.
Change-Id: I93d74254804b7d17106a3f08af2973464e669928
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 0708a33ea6a68d87a31189bc6560524056dd038c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | coin/module_config.yaml | 35 | ||||
-rw-r--r-- | coin/test-ci.inc | 4 | ||||
-rw-r--r-- | coin/test-configs.inc | 2 | ||||
-rw-r--r-- | coin/test-mingw.inc | 1 | ||||
-rw-r--r-- | coin/test-no-webengine.inc (renamed from coin/test-dunfell.inc) | 0 | ||||
-rw-r--r-- | coin/test-wayland.inc | 2 |
6 files changed, 20 insertions, 24 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index a9beb56..92104ca 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -32,8 +32,8 @@ target1: &target1 variableName: MANIFEST variableValue: master.xml - type: EnvironmentVariable - variableName: DISABLE_X11 - variableValue: true + variableName: TEST_CONFIGS + variableValue: ci configs wayland enable_if: condition: property property: target.arch @@ -48,11 +48,8 @@ target2: &target2 variableName: MANIFEST variableValue: honister.xml - type: EnvironmentVariable - variableName: DISABLE_X11 - variableValue: true - - type: EnvironmentVariable - variableName: MINGW - variableValue: true + variableName: TEST_CONFIGS + variableValue: ci configs wayland mingw enable_if: condition: property property: target.arch @@ -66,6 +63,9 @@ target3: &target3 - type: EnvironmentVariable variableName: MANIFEST variableValue: hardknott.xml + - type: EnvironmentVariable + variableName: TEST_CONFIGS + variableValue: ci configs enable_if: condition: property property: target.arch @@ -79,6 +79,9 @@ target4: &target4 - type: EnvironmentVariable variableName: MANIFEST variableValue: dunfell.xml + - type: EnvironmentVariable + variableName: TEST_CONFIGS + variableValue: ci configs no-webengine enable_if: condition: property property: target.arch @@ -123,12 +126,6 @@ instructions: ./repo sync source ./poky/oe-init-build-env - export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE SSTATE_DIR DL_DIR" - export DL_DIR=/mnt/yocto-cache/downloads - export BB_GENERATE_MIRROR_TARBALLS=1 - export BB_NUMBER_THREADS=8 - DISTRO_CODENAME=$(sed -n -e "s/DISTRO_CODENAME.*\"\(.*\)\"/\1/p" ../poky/meta-*/conf/distro/poky.conf) - export SSTATE_DIR=/mnt/yocto-cache/sstate-caches/${DISTRO_CODENAME}-meta-qt6 bitbake-layers add-layer ../meta-openembedded/meta-oe bitbake-layers add-layer ../meta-openembedded/meta-python bitbake-layers add-layer ../meta-openembedded/meta-multimedia @@ -136,15 +133,9 @@ instructions: bitbake-layers add-layer ../meta-python2 bitbake-layers add-layer ${SOURCE_DIR} - if [ -n "${DISABLE_X11}" ] ; then - echo "DISTRO_FEATURES:remove = \"x11\"" >> conf/local.conf - fi - if [ -n "${MINGW}" ]; then - export SDKMACHINE=x86_64-mingw32 - fi - - echo "require ${SOURCE_DIR}/coin/test-configs.inc" >> conf/local.conf - echo "include ${SOURCE_DIR}/coin/test-${DISTRO_CODENAME}.inc" >> conf/local.conf + for conf in ${TEST_CONFIGS}; do + echo "require ${SOURCE_DIR}/coin/test-${conf}.inc" >> conf/local.conf + done # build toolchain which should include all supported recipes bitbake meta-toolchain-qt6 nativesdk-packagegroup-qt6-toolchain-host packagegroup-qt6-modules diff --git a/coin/test-ci.inc b/coin/test-ci.inc new file mode 100644 index 0000000..1fdaf05 --- /dev/null +++ b/coin/test-ci.inc @@ -0,0 +1,4 @@ +SSTATE_DIR = "/mnt/yocto-cache/sstate-caches/${DISTRO_CODENAME}-meta-qt6" +DL_DIR = "/mnt/yocto-cache/downloads" +BB_GENERATE_MIRROR_TARBALLS = "1" +BB_NUMBER_THREADS = "8" diff --git a/coin/test-configs.inc b/coin/test-configs.inc index eaddb5e..c4b1905 100644 --- a/coin/test-configs.inc +++ b/coin/test-configs.inc @@ -6,8 +6,6 @@ DISTRO_FEATURES:append = " systemd" DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit" VIRTUAL-RUNTIME_init_manager = "systemd" VIRTUAL-RUNTIME_initscripts = "" -# use wayland -DISTRO_FEATURES:append = " wayland" INHERIT += "buildstats buildstats-summary" INHERIT += "rm_work" diff --git a/coin/test-mingw.inc b/coin/test-mingw.inc new file mode 100644 index 0000000..4382bed --- /dev/null +++ b/coin/test-mingw.inc @@ -0,0 +1 @@ +SDKMACHINE = "x86_64-mingw32" diff --git a/coin/test-dunfell.inc b/coin/test-no-webengine.inc index 1827495..1827495 100644 --- a/coin/test-dunfell.inc +++ b/coin/test-no-webengine.inc diff --git a/coin/test-wayland.inc b/coin/test-wayland.inc new file mode 100644 index 0000000..bd91fd8 --- /dev/null +++ b/coin/test-wayland.inc @@ -0,0 +1,2 @@ +DISTRO_FEATURES:remove = "x11" +DISTRO_FEATURES:append = " wayland" |