diff options
Diffstat (limited to 'meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images')
4 files changed, 16 insertions, 50 deletions
diff --git a/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb b/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb index cfc465e6..5147ea44 100755 --- a/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb +++ b/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb @@ -8,8 +8,7 @@ require agl-image-graphical-qt5.bb LICENSE = "MIT" -IMAGE_FEATURES_append = " dev-pkgs" -IMAGE_INSTALL_append = " kernel-dev kernel-devsrc" +require agl-image-graphical-qt5-crosssdk.inc inherit populate_sdk populate_sdk_qt5 @@ -17,39 +16,3 @@ inherit populate_sdk populate_sdk_qt5 # Both exec "createrepo" on the same directory, and so one of them # can failed (randomly). addtask do_populate_sdk after do_rootfs - -# native tools to support Chromium build inside SDK (SPEC-942) -TOOLCHAIN_HOST_TASK += " \ - nativesdk-gn \ - nativesdk-ninja \ - nativesdk-gperf \ - nativesdk-zlib \ - nativesdk-xz \ - nativesdk-nspr-dev \ - nativesdk-nss-dev \ - nativesdk-lua \ - " - -# required dependencies for Chromium build inside SDK (SPEC-942) -TOOLCHAIN_TARGET_TASK += " \ - pciutils-dev \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'pipewire-dev wireplumber-dev', '', d)} \ - cairo-dev \ - nss-dev \ - cups-dev \ - gconf-dev \ - libexif-dev \ - pango-dev \ - libdrm-dev \ - lua-dev \ - lua-staticdev \ - ${@bb.utils.contains('LICENSE_FLAGS_WHITELIST', 'commercial', 'ffmpeg-dev', '', d)} \ - " - -# Add wayland-scanner to SDK (SPEC-945) -# Use TOOLCHAIN_HOST_TASK instead of adding to the packagegroup -# wayland-scanner is in nativesdk-wayland-dev ! -# option: add also nativesdk-qtwayland-tools -TOOLCHAIN_HOST_TASK_append = " nativesdk-wayland nativesdk-wayland-dev" - -TOOLCHAIN_HOST_TASK_append = " nativesdk-perl-modules " diff --git a/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.inc b/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.inc new file mode 100644 index 00000000..f43bb07d --- /dev/null +++ b/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.inc @@ -0,0 +1,14 @@ +require recipes-platform/images/agl-image-minimal-crosssdk.inc + +TOOLCHAIN_TARGET_TASK += "libafb-helpers-qt-staticdev" + +# Add wayland-scanner to SDK (SPEC-945) +# Use TOOLCHAIN_HOST_TASK instead of adding to the packagegroup +# wayland-scanner is in nativesdk-wayland-dev ! +# option: add also nativesdk-qtwayland-tools +TOOLCHAIN_HOST_TASK_append = " nativesdk-wayland nativesdk-wayland-dev" + +TOOLCHAIN_HOST_TASK_append = " nativesdk-perl-modules " + +# Add qtwaylandscanner to the SDK +TOOLCHAIN_HOST_TASK_append = " nativesdk-qtwayland-tools " diff --git a/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.bb b/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.bb index 35989819..bcfd724f 100644 --- a/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.bb +++ b/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.bb @@ -3,8 +3,3 @@ SUMMARY = "A very basic Wayland image with a terminal" require agl-image-graphical-qt5.inc LICENSE = "MIT" - -IMAGE_INSTALL_append = "\ - packagegroup-agl-image-weston \ - " - diff --git a/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc b/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc index ed1634fc..114d06a0 100644 --- a/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc +++ b/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc @@ -1,7 +1 @@ -require recipes-platform/images/agl-image-minimal.inc - -IMAGE_FEATURES += "splash package-management ssh-server-dropbear" - -inherit distro_features_check - -REQUIRED_DISTRO_FEATURES = "wayland" +require recipes-platform/images/agl-image-weston.inc |