Skip to content

Commit

Permalink
webos: webos_image: replace import with addpylib
Browse files Browse the repository at this point in the history
:Release Notes:
OE_IMPORTS was replaced with addpylib in bitbake and oe-core

:Detailed Notes:
Follow:
https://git.openembedded.org/bitbake/commit/?id=afb8478d3853f6edf3669b93588314627d617d6b
https://git.openembedded.org/openembedded-core/commit/?id=1f56155e91da2030ee0a5e93037c62e1349ba89f

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRQ-693] Create GPVB with Yocto 4.2 Mickledore

Change-Id: Ibde3e483d9370469b64c64addc6ef1ab1fa9ae4b
  • Loading branch information
shr-project committed Dec 3, 2024
1 parent 0b30b01 commit 31039f2
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (c) 2017-2024 LG Electronics, Inc.

meta-webos/lib/__pycache__/
meta-webos/lib/webos/__pycache__/
MCF-PATCHES*
5 changes: 2 additions & 3 deletions meta-webos/classes/webos_image.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,8 @@ python verify_acg () {
def herror(c, m):
oe.qa.handle_error(c, m, d)

import verify_ls2_acg
verify_ls2_acg.handle_error = herror
if not verify_ls2_acg.Verify("${IMAGE_ROOTFS}"):
webos.verify_ls2_acg.handle_error = herror
if not webos.verify_ls2_acg.Verify("${IMAGE_ROOTFS}"):
bb.note("LS2 hub config not found, ACG verification skipped")
}

Expand Down
2 changes: 2 additions & 0 deletions meta-webos/conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ META_OE_LAYER ??= "${@'${BBFILE_PATTERN_openembedded-layer}'[1:-1]}"
# Prepend scripts to WEBOS_EXTRA_PATH
WEBOS_EXTRA_PATH .= "${@'${BBFILE_PATTERN_meta-webos}'[1:] + 'scripts:'}"

addpylib ${LAYERDIR}/lib webos

# Set path to qemu image tests included in this layer
QEMUIMAGETESTS := "${COREBASE}/scripts/qemuimage-tests"

Expand Down
1 change: 1 addition & 0 deletions meta-webos/lib/webos/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BBIMPORTS = ["verify_ls2_acg"]
File renamed without changes.

0 comments on commit 31039f2

Please sign in to comment.