Skip to content

Commit

Permalink
webos-qt-sdk=r0 nativesdk-packagegroup-sdk-host.bbappend=webos1 meta-…
Browse files Browse the repository at this point in the history
…environment.bbappend=webos1

:Release Notes:
webos-qt-sdk=r0 nativesdk-packagegroup-sdk-host.bbappend=webos1 meta-environment.bbappend=webos1

:Detailed Notes:
- webos-qt-sdk=r0
 -- Add packagegroup-qt5-toolchain-host into webos-qt-sdk
- nativesdk-packagegroup-sdk-host.bbappend=webos1
 -- The followings would be included in host toolchains
  nativesdk-qtwayland-tools for qtwaylanscanner
  nativesdk-wayland-dev for wayland-scanner
- meta-environment.bbappend=webos1
 -- The following variables should be exported in environment file to use
  mkspecs/features/webos-variables.prf in qmake projects with the toolchain
  generated by populate_sdk.
  WEBOS_INSTALL_BINS, WEBOS_INSTALL_LIBS, WEBOS_INSTALL_HEADERS,
  WEBOS_INSTALL_QML, WEBOS_INSTALL_QTPLUGINSDIR, webos_applicationsdir,
  webos_preferencesdir

:Testing Performed:
Test cases - QSDK-3148

1. Generate a toolchain by populate_sdk.
 $ bitbake webos-qt-sdk
2. Install the generated toolchain script.
3. Load environment file under the toolchain installation path.
 $ source [installed path]/environment-setup-[TargetArch]-webos-linux
4. Check whether the followings commands are avaiable.
 $ which wayland-scanner
 $ which qtwayland-scanner
 $ which qmake
5. If the above 3 commands exist under the toolchain path, it's ok.
  Otherwise, it is fault.

:QA Notes:
N/A

:Issues Addressed:
[PLAT-94864] CCC: webos-qt-sdk=r0 nativesdk-packagegroup-sdk-host.bbappend=webos1 meta-environment.bbappend=webos1 libcxx=auto1
[PLAT-77789] Make 'populate_sdk' option for containing qt tools

Change-Id: I76f3b02f75bba892b0c3cbaa410df46a44b24b8e
  • Loading branch information
sparkleholic authored and Minjae Kim committed Jan 22, 2020
1 parent e6301c0 commit 601ca9c
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 0 deletions.
14 changes: 14 additions & 0 deletions meta-webos/recipes-core/meta/meta-environment.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright (c) 2019 LG Electronics, Inc.

EXTENDPRAUTO_append = "webos1"

# Used by mkspecs/features/webos-variables.prf
toolchain_create_sdk_env_script_append() {
echo "export WEBOS_INSTALL_BINS=${target_exec_prefix}/bin" >> $script
echo "export WEBOS_INSTALL_LIBS=${target_libdir}" >> $script
echo "export WEBOS_INSTALL_HEADERS=${target_includedir}" >> $script
echo "export WEBOS_INSTALL_QML=${target_libdir}/qml" >> $script
echo "export WEBOS_INSTALL_QTPLUGINSDIR=${target_libdir}/plugins" >> $script
echo "export webos_applicationsdir=${target_prefix}/palm/applications" >> $script
echo "export webos_preferencesdir=${target_prefix}/preferences" >> $script
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Copyright (c) 2019 LG Electronics, Inc.

EXTENDPRAUTO_append = "webos1"

NATIVESDK_PKGGRP_HOST_FOR_WAYLAND = "\
nativesdk-qtwayland-tools \
nativesdk-wayland-dev \
"

RDEPENDS_${PN} += " \
${NATIVESDK_PKGGRP_HOST_FOR_WAYLAND} \
"
35 changes: 35 additions & 0 deletions meta-webos/recipes-core/webos-qt-sdk/webos-qt-sdk.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Copyright (c) 2019 LG Electronics, Inc.

SUMMARY = "webOS SDK Toolchain including qt host tools"

PR = "r0"

TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-sdk-host"
TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-qt5-toolchain-host"
# Only add packagegroup-cross-canadian-${MACHINE} to TOOLCHAIN_HOST_TASK when
# not using an external toolchain. Once we can figure out how to package up the
# native portion of external-lg-toolchain, the recipe that implements it will
# appear instead. For now, we are manually copying the external toolchain tree
# into the SDK's native sysroot.
EXTERNAL_TOOLCHAIN ??= ""
TOOLCHAIN_HOST_TASK += "${@oe.utils.conditional('EXTERNAL_TOOLCHAIN', '', 'packagegroup-cross-canadian-${MACHINE}', '${MLPREFIX}meta-environment-${MACHINE}', d)}"

# XXX When using external-lg-toolchain, need to explicitly include
# linux-libc-headers because external-lg-toolchain puts the headers in that
# package instead of in linux-libc-headers-dev (which is where the
# linux-libc-headers recipe puts them).
TOOLCHAIN_TARGET_TASK += "${@oe.utils.conditional('EXTERNAL_TOOLCHAIN', '', '', '${MLPREFIX}linux-libc-headers', d)}"

TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-${WEBOS_DISTRO_BUILD_ID}"

# By default, populate_sdk puts the toolchain in TOOLCHAIN_TARGET_TASK (which
# controls what the bbclass packages).
inherit populate_sdk
inherit populate_sdk_qt5_base

inherit webos_image

inherit webos_machine_impl_dep
inherit webos_machine_dep

SDK_NAME = "${BPN}-${DISTRO}-${SDK_ARCH}-${WEBOS_DISTRO_BUILD_CODENAME}-${MACHINE_ARCH}"

0 comments on commit 601ca9c

Please sign in to comment.