From 5afad2df8e72c1075c2fedd49fd95a904ec27fd4 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 16 Nov 2017 18:15:00 +0100 Subject: recipes: follow version variable change We changed the version variables in meta-toradex-bsp-common/conf/tdx_version.conf Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- classes/tegra-u-boot-localversion.bbclass | 2 +- recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb | 2 +- recipes-bsp/u-boot/u-boot-toradex_git.bb | 2 +- recipes-kernel/linux/linux-toradex-mainline_4.14.bb | 2 +- recipes-kernel/linux/linux-toradex-mainline_4.9.bb | 2 +- recipes-kernel/linux/linux-toradex_3.10.40.bb | 2 +- recipes-kernel/linux/linux-toradex_git.bb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/classes/tegra-u-boot-localversion.bbclass b/classes/tegra-u-boot-localversion.bbclass index fba638c..c7de249 100644 --- a/classes/tegra-u-boot-localversion.bbclass +++ b/classes/tegra-u-boot-localversion.bbclass @@ -12,7 +12,7 @@ # Copyright 2017 (C) Toradex Inc. SCMVERSION ??= "y" -LOCALVERSION ??= "-${TDX_VER_INT}" +LOCALVERSION ??= "-${TDX_VER_ITEM}" UBOOT_LOCALVERSION = "${LOCALVERSION}" diff --git a/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb index 6112436..3130073 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb +++ b/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb @@ -31,7 +31,7 @@ SRC_URI = " \ " PV = "2016.11+git${SRCPV}" -PR = "${TDX_VER_INT}" +PR = "${TDX_VER_ITEM}" S = "${WORKDIR}/git" diff --git a/recipes-bsp/u-boot/u-boot-toradex_git.bb b/recipes-bsp/u-boot/u-boot-toradex_git.bb index affc458..917176c 100644 --- a/recipes-bsp/u-boot/u-boot-toradex_git.bb +++ b/recipes-bsp/u-boot/u-boot-toradex_git.bb @@ -35,7 +35,7 @@ SRC_URI_append_apalis-tk1-mainline = " \ " PV = "2016.11+git${SRCPV}" -PR = "${TDX_VER_INT}" +PR = "${TDX_VER_ITEM}" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb index 2382e8c..99773d5 100644 --- a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb +++ b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb @@ -12,7 +12,7 @@ include conf/tdx_version.conf LINUX_VERSION ?= "4.14" LOCALVERSION = "-${PR}" -PR = "${TDX_VER_INT}" +PR = "${TDX_VER_ITEM}" PV = "${LINUX_VERSION}" S = "${WORKDIR}/linux-${PV}" diff --git a/recipes-kernel/linux/linux-toradex-mainline_4.9.bb b/recipes-kernel/linux/linux-toradex-mainline_4.9.bb index 90dff07..ee8f4dc 100644 --- a/recipes-kernel/linux/linux-toradex-mainline_4.9.bb +++ b/recipes-kernel/linux/linux-toradex-mainline_4.9.bb @@ -12,7 +12,7 @@ include conf/tdx_version.conf LINUX_VERSION ?= "4.9.52" LOCALVERSION = "-${PR}" -PR = "${TDX_VER_INT}" +PR = "${TDX_VER_ITEM}" PV = "${LINUX_VERSION}" S = "${WORKDIR}/linux-${PV}" diff --git a/recipes-kernel/linux/linux-toradex_3.10.40.bb b/recipes-kernel/linux/linux-toradex_3.10.40.bb index c3d8ac4..67fee7e 100644 --- a/recipes-kernel/linux/linux-toradex_3.10.40.bb +++ b/recipes-kernel/linux/linux-toradex_3.10.40.bb @@ -10,7 +10,7 @@ include conf/tdx_version.conf LINUX_VERSION ?= "3.10.40" LOCALVERSION = "-${PR}" -PR = "${TDX_VER_INT}" +PR = "${TDX_VER_ITEM}" SRCREV = "22e0897658b3250d50dd7f37b80ff3e35c9518a2" SRCREV_use-head-next = "${AUTOREV}" diff --git a/recipes-kernel/linux/linux-toradex_git.bb b/recipes-kernel/linux/linux-toradex_git.bb index 7c488c9..e191f3b 100644 --- a/recipes-kernel/linux/linux-toradex_git.bb +++ b/recipes-kernel/linux/linux-toradex_git.bb @@ -5,7 +5,7 @@ include conf/tdx_version.conf LINUX_VERSION ?= "3.1.10" LOCALVERSION = "-${PR}" -PR = "${TDX_VER_INT}" +PR = "${TDX_VER_ITEM}" SRCREV = "7753763827bb50f4645622e83c47e192e0ba0194" SRCREV_use-head-next = "${AUTOREV}" -- cgit v1.2.3