From d6963f27b4134966e0211c9c9b250a81f7c3966d Mon Sep 17 00:00:00 2001 From: Jani Suonpera Date: Fri, 8 Oct 2021 13:11:15 +0300 Subject: coin: add yocto branches Hardknott and Honister to Coin integration - Configure build targets Hardknott and Honister. Task-number: QTBUG-96439 Change-Id: I97dd2ac622adbf9cde051ffab3d40c279472eca0 Reviewed-by: Samuli Piippo --- coin/module_config.yaml | 24 +++++++++++++++++++----- coin/test-configs.inc | 36 ++++++++++++++++++------------------ 2 files changed, 37 insertions(+), 23 deletions(-) diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 64610010..17778c70 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -7,7 +7,7 @@ accept_configuration: equals_value: Yocto - condition: property property: target.arch - in_values: [TARGET1, TARGET2, TARGET3] + in_values: [TARGET1, TARGET2, TARGET3, TARGET4] machine_type: Build: @@ -15,9 +15,9 @@ machine_type: # Target build matrix: # -# [target1] [target2] [target3] -# [machine] qemuarm64 qemux86 qemuarm -# [yocto] gatesgarth dunfell gatesgarth +# [target1] [target2] [target3] [target4] +# [machine] qemuarm64 qemux86 qemuarm qemux86-64 +# [yocto] gatesgarth dunfell hardknott honister # target1: &target1 @@ -54,17 +54,31 @@ target3: &target3 variableValue: qemuarm - type: EnvironmentVariable variableName: YOCTO_BRANCH - variableValue: gatesgarth + variableValue: hardknott enable_if: condition: property property: target.arch equals_value: TARGET3 +target4: &target4 + type: Group + instructions: + - type: EnvironmentVariable + variableName: MACHINE + variableValue: qemux86-64 + - type: EnvironmentVariable + variableName: YOCTO_BRANCH + variableValue: honister + enable_if: + condition: property + property: target.arch + equals_value: TARGET4 instructions: Build: - *target1 - *target2 - *target3 + - *target4 - type: EnvironmentVariable variableName: DL_DIR variableValue: "/mnt/yocto-cache/downloads" diff --git a/coin/test-configs.inc b/coin/test-configs.inc index 5ebfff8f..f983cc00 100644 --- a/coin/test-configs.inc +++ b/coin/test-configs.inc @@ -7,18 +7,18 @@ TCLIBCAPPEND = "fs" PREFERRED_PROVIDER_udev = "systemd" PREFERRED_PROVIDER_virtual/fftw = "fftw" # use gold -DISTRO_FEATURES_append = " ld-is-gold" +DISTRO_FEATURES:append = " ld-is-gold" # use ptest -DISTRO_FEATURES_append = " ptest" +DISTRO_FEATURES:append = " ptest" # use systemd -DISTRO_FEATURES_append = " systemd" +DISTRO_FEATURES:append = " systemd" DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit" VIRTUAL-RUNTIME_init_manager = "systemd" VIRTUAL-RUNTIME_initscripts = "" # use opengl -DISTRO_FEATURES_append = " opengl" +DISTRO_FEATURES:append = " opengl" # use wayland to fix building weston and qtwayland -DISTRO_FEATURES_append = " wayland" +DISTRO_FEATURES:append = " wayland" PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" PREFERRED_PROVIDER_jpeg-native = "libjpeg-turbo-native" PREFERRED_PROVIDER_gpsd = "gpsd" @@ -32,25 +32,25 @@ PREFERRED_PROVIDER_virtual/egl ?= "mesa" # to fix fsoaudiod, alsa-state conflict in shr-image-all VIRTUAL-RUNTIME_alsa-state = "" # to prevent alsa-state being pulled into -dev or -dbg images -RDEPENDS_${PN}-dev_pn-alsa-state = "" -RDEPENDS_${PN}-dbg_pn-alsa-state = "" +RDEPENDS:${PN}-dev:pn-alsa-state = "" +RDEPENDS:${PN}-dbg:pn-alsa-state = "" # to fix dependency on conflicting x11-common from packagegroup-core-x11 VIRTUAL-RUNTIME_xserver_common ?= "xserver-common" -RDEPENDS_${PN}-dev_pn-x11-common = "" -RDEPENDS_${PN}-dbg_pn-x11-common = "" +RDEPENDS:${PN}-dev:pn-x11-common = "" +RDEPENDS:${PN}-dbg:pn-x11-common = "" # to fix apm, fso-apm conflict in shr-image-all VIRTUAL-RUNTIME_apm = "fso-apm" # require conf/distro/include/qt5-versions.inc # QT5_VERSION = "5.4.0+git%" # for qtwebkit etc # see https://bugzilla.yoctoproject.org/show_bug.cgi?id=5013 -# DEPENDS_append_pn-qtbase = " mesa" -PACKAGECONFIG_append_pn-qtbase = " icu gl accessibility freetype fontconfig" +# DEPENDS:append:pn-qtbase = " mesa" +PACKAGECONFIG:append:pn-qtbase = " icu gl accessibility freetype fontconfig" # qtwayland doesn't like egl and xcomposite-glx enabled at the same time # http://lists.openembedded.org/pipermail/openembedded-devel/2016-December/110444.html -PACKAGECONFIG_remove_pn-qtwayland = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG:remove:pn-qtwayland = "xcomposite-egl xcomposite-glx" # for webkit-efl -PACKAGECONFIG_append_pn-harfbuzz = " icu" +PACKAGECONFIG:append:pn-harfbuzz = " icu" inherit blacklist # PNBLACKLIST[samsung-rfs-mgr] = "needs newer libsamsung-ipc with negative D_P: Requested 'samsung-ipc-1.0 >= 0.2' but version of libsamsung-ipc is 0.1.0" PNBLACKLIST[android-system] = "depends on lxc from meta-virtualiazation which isn't included in my world builds" @@ -71,15 +71,15 @@ PNBLACKLIST[build-appliance-image] = "tries to include whole downloads directory # needs patch with buildstats-summary.bbclass INHERIT += "buildstats buildstats-summary" # be more strict with QA warnings, turn them all to errors: -ERROR_QA_append = " ldflags useless-rpaths rpaths staticdev libdir xorg-driver-abi textrel already-stripped incompatible-license files-invalid installed-vs-shipped compile-host-path install-host-path pn-overrides infodir build-deps unknown-configure-option symlink-to-sysroot multilib invalid-packageconfig host-user-contaminated uppercase-pn" -WARN_QA_remove = " ldflags useless-rpaths rpaths staticdev libdir xorg-driver-abi textrel already-stripped incompatible-license files-invalid installed-vs-shipped compile-host-path install-host-path pn-overrides infodir build-deps unknown-configure-option symlink-to-sysroot multilib invalid-packageconfig host-user-contaminated uppercase-pn" +ERROR_QA:append = " ldflags useless-rpaths rpaths staticdev libdir xorg-driver-abi textrel already-stripped incompatible-license files-invalid installed-vs-shipped compile-host-path install-host-path pn-overrides infodir build-deps unknown-configure-option symlink-to-sysroot multilib invalid-packageconfig host-user-contaminated uppercase-pn" +WARN_QA:remove = " ldflags useless-rpaths rpaths staticdev libdir xorg-driver-abi textrel already-stripped incompatible-license files-invalid installed-vs-shipped compile-host-path install-host-path pn-overrides infodir build-deps unknown-configure-option symlink-to-sysroot multilib invalid-packageconfig host-user-contaminated uppercase-pn" # enable thumb for broader test coverage (oe-core autobuilder doesn't have thumb enabled) PREFERRED_ARM_INSTRUCTION_SET ?= "thumb" ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}" # use musl for qemux86 and qemux86copy -TCLIBC_qemux86 = "musl" -TCLIBC_qemux86copy = "musl" +TCLIBC:qemux86 = "musl" +TCLIBC:qemux86copy = "musl" # limit parallel make to avoid OOM -PARALLEL_MAKE_pn-qtwebkit = "-j 8" +PARALLEL_MAKE:pn-qtwebkit = "-j 8" # For decrease memory usage. SDK_XZ_COMPRESSION_LEVEL = "-1" -- cgit v1.2.3