Skip to content

Commit

Permalink
Fix SRCREV for all components
Browse files Browse the repository at this point in the history
- SRCREV is fixed for all components
- XT_KERNEL_BRANCH/XT_KERNEL_REV are removed because
  they should be used in the product's overrides
- SRCREV and PV are defined for the optee-test

Signed-off-by: Ruslan Shymkevych <[email protected]>
Acked-by: Volodymyr Babchuk <[email protected]>
  • Loading branch information
rshym authored and lorc committed Apr 24, 2024
1 parent 6861d0b commit f941326
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"

RENESAS_BSP_URL = "git://github.com/xen-troops/linux.git"
BRANCH = "${XT_KERNEL_BRANCH}"
SRCREV = "${XT_KERNEL_REV}"
BRANCH = "v5.10.41/rcar-5.1.7.rc11.2-xt"
SRCREV = "769ab722739878c3c1aaa1571f6ca996b135f8f6"

SRC_URI:append = "\
file://defconfig \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"

SRC_URI = "git://github.com/OP-TEE/optee_test.git"

# SRCREV is not defined intentionaly, and should be defined in product's bbappend
SRCREV = "21b347a3d75fd52fd49130e75c962c5b56123d2f"

# PV should be defined in product's bbappend, eg.: "3.13.0+git${SRCPV}"
PV = "3.13.0+git${SRCPV}"

S = "${WORKDIR}/git"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
RENESAS_BSP_URL = "git://github.com/xen-troops/linux.git"

BRANCH = "v5.10.41/rcar-5.1.4.1-xt0.1"
SRCREV = "${AUTOREV}"
SRCREV = "d7c1b717e3f11b6aa0713dcefa8cf1ed4c1222af"
LINUX_VERSION = "5.10.41"
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
RENESAS_BSP_URL = "git://github.com/xen-troops/linux.git"

BRANCH = "v5.10.41/rcar-5.1.4.1-xt0.1"
SRCREV = "${AUTOREV}"
SRCREV = "d7c1b717e3f11b6aa0713dcefa8cf1ed4c1222af"
LINUX_VERSION = "5.10.41"

KBUILD_DEFCONFIG_rcar = ""
Expand Down
2 changes: 1 addition & 1 deletion meta-xt-rcar-domx/recipes-security/optee/optee-os_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ S = "${WORKDIR}/git"

SRC_URI = "git://github.com/xen-troops/optee_os.git;branch=3.9-xt-linux"
PV = "git${SRCPV}"
SRCREV = "${AUTOREV}"
SRCREV = "192b616c9715604a2d2b16bc61758d160550806e"

COMPATIBLE_MACHINE ?= "(salvator-x|h3ulcb|m3ulcb|m3nulcb)"
OPTEEMACHINE = "rcar"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
RENESAS_BSP_URL = "git://github.com/xen-troops/linux.git"

BRANCH = "v5.10.41/rcar-5.1.4.1-xt0.1"
SRCREV = "${AUTOREV}"
SRCREV = "d7c1b717e3f11b6aa0713dcefa8cf1ed4c1222af"
LINUX_VERSION = "5.10.41"

SRC_URI:append = " \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

PVRUM_URL ?= "git://[email protected]/epmd-aepr/pvr_um_vgpu_img.git"
PVRUM_BRANCH = "1.11/5516664_5.1.0"
SRCREV = "${AUTOREV}"
SRCREV = "4ed61e604d925bfce8ab16645f48425a581496c7"

SRC_URI = " \
${PVRUM_URL};protocol=ssh;branch=${PVRUM_BRANCH} \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PV = "1.11"

PVRUM_URL ?= "git://[email protected]/epmd-aepr/pvr_um_vgpu_img.git"
PVRUM_BRANCH = "1.11/5516664_5.1.0"
SRCREV = "${AUTOREV}"
SRCREV = "4ed61e604d925bfce8ab16645f48425a581496c7"

COMPATIBLE_MACHINE = "(r8a7795|r8a7796)"
PACKAGE_ARCH = "${MACHINE_ARCH}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ S = "${WORKDIR}/git"

PVRKM_URL ??= "git://[email protected]/epmd-aepr/pvr_km_vgpu_img.git"
PVRKM_BRANCH ??= "1.11/5516664_5.1.0"
PVRKM_SRCREV ??= "${AUTOREV}"
PVRKM_SRCREV ??= "6994a4be87075975665fcef1fd95c087b0a007c8"
SRCREV = "${PVRKM_SRCREV}"

SRC_URI = "${PVRKM_URL};protocol=ssh;branch=${PVRKM_BRANCH}"
Expand Down

0 comments on commit f941326

Please sign in to comment.