diff options
| author |   duythaidang <duy.dang.yw@renesas.com> | 2019-03-18 11:22:44 +0700 |
|---|---|---|
| committer |   Thuy Tran <thuy.tran.xh@renesas.com> | 2019-05-23 16:11:59 +0700 |
| commit | 55c33ce0a852710bf68e515f992f954b2b8c171b (patch) | |
| tree | c201587ea27e191fa8180a49f87d723386a3e70b /meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb | |
| parent | 4461b4a5a778f6472ebd65ecf034fe45b301cc07 (diff) | |
rcar-gen3: optee-os: Apply a patch instead of cherry-picking
This commit modifies to apply a patch instead of cherry-picking.
This avoids the error of git config if git is not configured for the
current user.
Signed-off-by: Duy Dang <duy.dang.yw@renesas.com>
Signed-off-by: Thuy Tran <thuy.tran.xh@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
(cherry picked from commit 0fd211f94a24125dc554055877ff910085e07fe2)
Diffstat (limited to 'meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb')
| -rw-r--r-- | meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb | 5 |
1 files changed, 2 insertions, 3 deletions
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 81ba4c4..8c1b18d 100644 --- a/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb +++ b/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb @@ -14,12 +14,13 @@ PV = "3.1.0+renesas+git${SRCPV}" BRANCH = "rcar_gen3" SRCREV_renesas = "c3f73c1e8667a829e085c6d2c4d8a6ff1ec3d213" -SRCREV_officialgit = "e77020396508fc086d7a4d6137388b116e4a662f" +SRCREV_officialgit = "0ab9388c0d553a6bb5ae04e41b38ba40cf0474bf" SRCREV_FORMAT = "renesas_officialgit" SRC_URI = " \ git://github.com/renesas-rcar/optee_os.git;branch=${BRANCH};name=renesas \ git://github.com/OP-TEE/optee_os.git;branch=master;name=officialgit;destsuffix=git_official \ + file://0001-core-crypto-arm64-ce-update-AES-CBC-routines.patch;patchdir=../git_official \ " COMPATIBLE_MACHINE = "(salvator-x|h3ulcb|m3ulcb|m3nulcb|ebisu)" @@ -40,8 +41,6 @@ S = "${WORKDIR}/git" 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} cp -rn ${WORKDIR}/git_official/core/lib/libtomcrypt ${B}/core/lib/. } |