Skip to content

Commit

Permalink
luneos.inc: drop 2nd param from get_metadata_git_* calls
Browse files Browse the repository at this point in the history
* Follow oe-core change:
  https://git.openembedded.org/openembedded-core/commit/?id=9e03ce0426576ebef3739dc1dfec4f7cd73ae094

* fixes:
Parsing recipes...WARNING: /OE/build/luneos-scarthgap/meta-webos-ports/meta-luneos/recipes-webos/chromium/webruntime_94.bb: Exception during build_dependencies for do_exportbuildscript
WARNING: /OE/build/luneos-scarthgap/meta-webos-ports/meta-luneos/recipes-webos/chromium/webruntime_94.bb: Error during finalise of /OE/build/luneos-scarthgap/meta-webos-ports/meta-luneos/recipes-webos/chromium/webruntime_94.bb
ERROR: ExpansionError during parsing /OE/build/luneos-scarthgap/meta-webos-ports/meta-luneos/recipes-webos/chromium/webruntime_94.bb
Traceback (most recent call last):
  File "Var <WEBOS_DISTRO_TOPDIR_REVISION>", line 1, in <module>
bb.data_smart.ExpansionError: Failure expanding variable WEBOS_DISTRO_TOPDIR_REVISION, expression was ${@oe.buildcfg.get_metadata_git_revision('/OE/build/luneos-scarthgap', None).strip()} which triggered exception TypeError: get_metadata_git_revision() takes 1 positional argument but 2 were given
The variable dependency chain for the failure is: WEBOS_DISTRO_TOPDIR_REVISION -> do_exportbuildscript

ERROR: Parsing halted due to errors, see error messages above

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
  • Loading branch information
shr-project committed Nov 10, 2023
1 parent 194c3c2 commit ff421f5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions meta-luneos/conf/distro/include/luneos.inc
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ WEBOS_PORTS_CODENAME = "ports"
# WEBOS_DISTRO_PLATFORM_CODENAME ?= "${DISTRO}-${WEBOS_PORTS_CODENAME}"
WEBOS_DISTRO_PLATFORM_CODENAME ?= "luneos"
WEBOS_DISTRO_VERSION_CODENAME ?= "Eiskaffee"
# WEBOS_DISTRO_VERSION_CODENAME ?= "${@oe.buildcfg.get_metadata_git_branch('.', None).strip().translate(None, '()/')}"
# WEBOS_DISTRO_VERSION_CODENAME ?= "${@oe.buildcfg.get_metadata_git_branch('.').strip().translate(None, '()/')}"
WEBOS_DISTRO_RELEASE_CODENAME ?= "${WEBOS_DISTRO_PLATFORM_CODENAME}${@oe.utils.conditional( 'WEBOS_DISTRO_VERSION_CODENAME', '', '', '-${WEBOS_DISTRO_VERSION_CODENAME}', d) }"

# This is the codename for the series of builds that are made from a branch.
# It appears in the image filenames. It is expected that other distros will
# override this based on their codename schemes.
WEBOS_DISTRO_BUILD_CODENAME ?= ""
# WEBOS_DISTRO_BUILD_CODENAME ?= "${@oe.buildcfg.get_metadata_git_branch('.', None).strip().translate(None, '()/')}"
# WEBOS_DISTRO_BUILD_CODENAME ?= "${@oe.buildcfg.get_metadata_git_branch('.').strip().translate(None, '()/')}"

WEBOS_DISTRO_PRERELEASE ?= "devel"

Expand All @@ -63,8 +63,8 @@ BUILDCFG_VARS += "WEBOS_DISTRO_RELEASE_CODENAME WEBOS_DISTRO_BUILD_ID"

# Branch, revision and description of TOPDIR (webos-ports-setup repository)
SETUP_COMMON_DIR = "${TOPDIR}/../common/"
WEBOS_DISTRO_TOPDIR_BRANCH ?= "${@oe.buildcfg.get_metadata_git_branch('${SETUP_COMMON_DIR}', None).strip()}"
WEBOS_DISTRO_TOPDIR_REVISION ?= "${@oe.buildcfg.get_metadata_git_revision('${SETUP_COMMON_DIR}', None).strip()}"
WEBOS_DISTRO_TOPDIR_BRANCH ?= "${@oe.buildcfg.get_metadata_git_branch('${SETUP_COMMON_DIR}').strip()}"
WEBOS_DISTRO_TOPDIR_REVISION ?= "${@oe.buildcfg.get_metadata_git_revision('${SETUP_COMMON_DIR}').strip()}"
# Don't add WEBOS_DISTRO_TOPDIR_BRANCH, because in many cases it can be "(nobranch)"
BUILDCFG_VARS += "WEBOS_DISTRO_TOPDIR_REVISION"

Expand Down

0 comments on commit ff421f5

Please sign in to comment.