From 538a6f55e7860c8cd4ce883a15ea589d631ad703 Mon Sep 17 00:00:00 2001 From: Khang Nguyen Date: Thu, 18 Jul 2019 13:31:22 +0700 Subject: rcar-gen3: optee-os: Fix git configuration issue in do_configure Since v3.15.0, the optee-os recipe does a cherry-pick in do_configure, if the git is not configured, the do_configure will fail and breaks the build. This adds '-n' flag to cherry-pick command to avoid the above issue. Signed-off-by: Khang Nguyen Signed-off-by: Takamitsu Honda Change-Id: I6448b57b4a9609599497f3a35ada5c777015a7f0 --- meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-rcar-gen3') diff --git a/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb b/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb index 5f69c7d..553174b 100644 --- a/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb +++ b/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb @@ -45,7 +45,7 @@ EXTRA_OEMAKE = "-e MAKEFLAGS=" do_configure() { git -C ${WORKDIR}/git_official checkout -B official 3.1.0 - git -C ${WORKDIR}/git_official cherry-pick ${SRCREV_officialgit} + git -C ${WORKDIR}/git_official cherry-pick -n ${SRCREV_officialgit} cp -rn ${WORKDIR}/git_official/core/lib/libtomcrypt ${B}/core/lib/. } -- cgit 1.2.3-korg