From d6db625d234fd7a73f5d5bcbb8aa09683535b877 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 16 Nov 2017 18:09:09 +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 --- recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb | 2 +- recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend | 2 +- recipes-kernel/linux/linux-toradex-rt_4.1-2.0.x.bb | 2 +- recipes-kernel/linux/linux-toradex-rt_4.4.bb | 2 +- recipes-kernel/linux/linux-toradex_4.1-2.0.x.bbappend | 2 +- recipes-kernel/linux/linux-toradex_4.4.bbappend | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb index df75475..83d5685 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb +++ b/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb @@ -29,7 +29,7 @@ SRC_URI = " \ " PV = "2016.11+git${SRCPV}" -LOCALVERSION ?= "-${TDX_VER_INT}" +LOCALVERSION ?= "-${TDX_VER_ITEM}" S = "${WORKDIR}/git" diff --git a/recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend index 5950bb0..c8d0cd1 100644 --- a/recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend +++ b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend @@ -1,6 +1,6 @@ include conf/tdx_version.conf -LOCALVERSION = "-${TDX_VER_INT}" +LOCALVERSION = "-${TDX_VER_ITEM}" SRCREV = "52259cf22a165c0721bb26c723c0dc5e2659eaa7" SRCBRANCH = "2016.11-toradex" diff --git a/recipes-kernel/linux/linux-toradex-rt_4.1-2.0.x.bb b/recipes-kernel/linux/linux-toradex-rt_4.1-2.0.x.bb index 745c4e7..74445bf 100644 --- a/recipes-kernel/linux/linux-toradex-rt_4.1-2.0.x.bb +++ b/recipes-kernel/linux/linux-toradex-rt_4.1-2.0.x.bb @@ -21,7 +21,7 @@ SRC_URI[rt-patch.sha256sum] = "3960999107c3a06eb9cc92c5b649a725b9d8f354a430cdf4f KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}" LOCALVERSION = "-${PR}" -PR = "${TDX_VER_INT}-rt" +PR = "${TDX_VER_ITEM}-rt" SRCBRANCH = "toradex_4.1-2.0.x-imx" SRCREV = "82f0f4f012a646a735d6b44de77b7c9d0712c714" diff --git a/recipes-kernel/linux/linux-toradex-rt_4.4.bb b/recipes-kernel/linux/linux-toradex-rt_4.4.bb index 2dffc66..8c61647 100644 --- a/recipes-kernel/linux/linux-toradex-rt_4.4.bb +++ b/recipes-kernel/linux/linux-toradex-rt_4.4.bb @@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "cbe77f8db27bae1d018b786bead3996c753f0e45fdec6dab088fbe2cff KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}" LOCALVERSION = "-${PR}" -PR = "${TDX_VER_INT}" +PR = "${TDX_VER_ITEM}" SRCREV = "c1d5fe2d54551b95b812143d94d8168da2220dd8" SRCBRANCH = "toradex_vf_4.4" diff --git a/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bbappend b/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bbappend index fde2d5d..c84e7ef 100644 --- a/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bbappend +++ b/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bbappend @@ -1,7 +1,7 @@ include conf/tdx_version.conf FILESEXTRAPATHS_prepend := "${THISDIR}/linux-toradex-4.1-2.0.x:" -LOCALVERSION = "-${TDX_VER_INT}" +LOCALVERSION = "-${TDX_VER_ITEM}" SRCREV = "18717e2b1ca9b0fbf8bafa2717719e1f2c8f1114" SRCBRANCH = "toradex_4.1-2.0.x-imx" diff --git a/recipes-kernel/linux/linux-toradex_4.4.bbappend b/recipes-kernel/linux/linux-toradex_4.4.bbappend index 8613cd8..2687ed1 100644 --- a/recipes-kernel/linux/linux-toradex_4.4.bbappend +++ b/recipes-kernel/linux/linux-toradex_4.4.bbappend @@ -2,7 +2,7 @@ include conf/tdx_version.conf FILESEXTRAPATHS_prepend := "${THISDIR}/linux-toradex-4.4:" -LOCALVERSION = "-${TDX_VER_INT}" +LOCALVERSION = "-${TDX_VER_ITEM}" SRCREV = "e0f2806138a4eeb3c31abe0e0e767d0f6d9a13a3" SRCBRANCH = "toradex_vf_4.4" -- cgit v1.2.3