1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-07-27 14:28:05 +00:00

recipes: move SRCPV from PR to PV, so PRServ can package AUTOINC after patching

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
This commit is contained in:
Denys Dmytriyenko
2015-05-21 07:56:22 +00:00
parent e7601086a4
commit fef30ea1bf
23 changed files with 40 additions and 34 deletions
+2 -2
View File
@@ -6,8 +6,8 @@ COMPATIBLE_MACHINE = "keystone"
SRC_URI = "git://git.ti.com/keystone-linux/boot-monitor.git;protocol=git;branch=${BRANCH}" SRC_URI = "git://git.ti.com/keystone-linux/boot-monitor.git;protocol=git;branch=${BRANCH}"
PV = "2.0" PV = "2.0+git${SRCPV}"
PR = "r2+gitr${SRCPV}" PR = "r2"
BRANCH = "master" BRANCH = "master"
+1 -1
View File
@@ -3,7 +3,7 @@ DESCRIPTION = "Kernel module for contiguous memory allocation from userspace"
include cmem.inc include cmem.inc
# This package builds a kernel module, use kernel PR as base and append a local # This package builds a kernel module, use kernel PR as base and append a local
MACHINE_KERNEL_PR_append = "b+gitr${SRCPV}" MACHINE_KERNEL_PR_append = "b"
PR = "${MACHINE_KERNEL_PR}" PR = "${MACHINE_KERNEL_PR}"
inherit module inherit module
+2
View File
@@ -7,6 +7,8 @@ BRANCH ?= "master"
# This corresponds to version 4.10.00.01 # This corresponds to version 4.10.00.01
SRCREV = "0d2fac7187ca1f6af62a98dee5b3621908cf5831" SRCREV = "0d2fac7187ca1f6af62a98dee5b3621908cf5831"
PV = "4.10.00.01+git${SRCPV}"
SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}" SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
+1 -1
View File
@@ -4,7 +4,7 @@ include cmem.inc
RDEPENDS_${PN} = "cmem-mod" RDEPENDS_${PN} = "cmem-mod"
PR = "r1+gitr${SRCPV}" PR = "r1"
PACKAGES =+ "${PN}-test" PACKAGES =+ "${PN}-test"
+1 -1
View File
@@ -7,7 +7,7 @@ DEPENDS = "hplib"
include hplib.inc include hplib.inc
# This package builds a kernel module, use kernel PR as base and append a local # This package builds a kernel module, use kernel PR as base and append a local
MACHINE_KERNEL_PR_append = "a+gitr${SRCPV}" MACHINE_KERNEL_PR_append = "a"
PR = "${MACHINE_KERNEL_PR}" PR = "${MACHINE_KERNEL_PR}"
S ="${WORKDIR}/git/ti/runtime/hplib/module" S ="${WORKDIR}/git/ti/runtime/hplib/module"
+1 -1
View File
@@ -7,4 +7,4 @@ SRC_URI = "git://git.ti.com/keystone-rtos/hplib.git;protocol=git;branch=${BRANCH
# Below Commit ID corresponds to "DEV.HPLIB.01.01.00.05" # Below Commit ID corresponds to "DEV.HPLIB.01.01.00.05"
SRCREV = "97c2ce177c78c0f7a861c8dc9ac10657d85eae36" SRCREV = "97c2ce177c78c0f7a861c8dc9ac10657d85eae36"
PV = "01.01.00.05" PV = "01.01.00.05+git${SRCPV}"
@@ -7,8 +7,9 @@ COMPATIBLE_MACHINE = "omapl138"
INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_STRIP = "1"
MACHINE_KERNEL_PR_append = "b+svnr${SRCPV}" MACHINE_KERNEL_PR_append = "b"
PR = "${MACHINE_KERNEL_PR}" PR = "${MACHINE_KERNEL_PR}"
PV_append = "+svn${SRCPV}"
SRC_URI = "svn://gforge.ti.com/svn/pru_sw/;module=trunk;protocol=https;user=anonymous;pswd=''" SRC_URI = "svn://gforge.ti.com/svn/pru_sw/;module=trunk;protocol=https;user=anonymous;pswd=''"
@@ -19,8 +19,9 @@ S = "${WORKDIR}/trunk"
inherit module inherit module
MACHINE_KERNEL_PR_append = "b+svnr${SRCPV}" MACHINE_KERNEL_PR_append = "b"
PR = "${MACHINE_KERNEL_PR}" PR = "${MACHINE_KERNEL_PR}"
PV_append = "+svn${SRCPV}"
EXTRA_OEMAKE += "KERNEL_DIR=${STAGING_KERNEL_DIR}" EXTRA_OEMAKE += "KERNEL_DIR=${STAGING_KERNEL_DIR}"
@@ -6,7 +6,8 @@ COMPATIBLE_MACHINE = "ti33x"
DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE = "-1"
PR = "r6+gitr${SRCPV}" PR = "r6"
PV_append = "+git${SRCPV}"
SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}" SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
@@ -2,7 +2,8 @@ require u-boot-ti.inc
DESCRIPTION = "u-boot bootloader for TI devices supported by the GLSDK product" DESCRIPTION = "u-boot bootloader for TI devices supported by the GLSDK product"
PR = "r1+gitr${SRCPV}" PR = "r1"
PV_append = "+git${SRCPV}"
DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE = "-1"
@@ -4,7 +4,8 @@ DESCRIPTION = "u-boot bootloader for Multi-Core BU devices"
COMPATIBLE_MACHINE = "keystone" COMPATIBLE_MACHINE = "keystone"
PR = "r5+gitr${SRCPV}" PR = "r5"
PV_append = "+git${SRCPV}"
# Tag "K2_UBOOT_2013_01_14.09" # Tag "K2_UBOOT_2013_01_14.09"
SRCREV = "f9bc365551ff8c685bf6134d795576713fec0917" SRCREV = "f9bc365551ff8c685bf6134d795576713fec0917"
@@ -2,7 +2,8 @@ require u-boot-ti.inc
DESCRIPTION = "u-boot bootloader for TI devices" DESCRIPTION = "u-boot bootloader for TI devices"
PR = "r5+gitr${SRCPV}" PR = "r5"
PV_append = "+git${SRCPV}"
SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}" SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
@@ -4,8 +4,8 @@ DESCRIPTION = "u-boot bootloader for TI devices"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb" LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
PV = "2013.10" PR = "r8"
PR = "r8+gitr${SRCPV}" PV_append = "+git${SRCPV}"
SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}" SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
@@ -7,8 +7,8 @@ DESCRIPTION = "u-boot bootloader for TI devices"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb" LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
PV = "2014.07" PR = "r12"
PR = "r12+gitr${SRCPV}" PV_append = "+git${SRCPV}"
SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}" SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
-2
View File
@@ -11,8 +11,6 @@ DEFAULT_PREFERENCE = "-1"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb" LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
PV = "2014.07"
SRC_URI = "git://git.denx.de/u-boot.git;protocol=git;branch=${BRANCH}" SRC_URI = "git://git.denx.de/u-boot.git;protocol=git;branch=${BRANCH}"
BRANCH ?= "master" BRANCH ?= "master"
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2b7c96eb2aed7b0f6f922214dbde9016"
BRANCH ?= "master" BRANCH ?= "master"
# This corresponds to version 01.00.02.01 # This corresponds to version 01.00.02.01
SRCREV = "c1988446e3364af4df7cd877e6536f0c6647d7bb" SRCREV = "c1988446e3364af4df7cd877e6536f0c6647d7bb"
PV = "1.0.2.1" PV = "1.0.2.1+git${SRCPV}"
SRC_URI = "git://git.ti.com/keystone-linux/uio-module-drv.git;protocol=git;branch=${BRANCH}" SRC_URI = "git://git.ti.com/keystone-linux/uio-module-drv.git;protocol=git;branch=${BRANCH}"
# This package builds a kernel module, use kernel PR as base and append a local # This package builds a kernel module, use kernel PR as base and append a local
MACHINE_KERNEL_PR_append = "b+gitr${SRCPV}" MACHINE_KERNEL_PR_append = "b"
PR = "${MACHINE_KERNEL_PR}" PR = "${MACHINE_KERNEL_PR}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
@@ -10,7 +10,7 @@ inherit kernel
require recipes-kernel/linux/linux-dtb.inc require recipes-kernel/linux/linux-dtb.inc
require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/setup-defconfig.inc
MACHINE_KERNEL_PR_append = "d+gitr${SRCPV}" MACHINE_KERNEL_PR_append = "d"
PR = "${MACHINE_KERNEL_PR}" PR = "${MACHINE_KERNEL_PR}"
KERNEL_DEVICETREE_k2hk-evm = "k2hk-evm.dtb" KERNEL_DEVICETREE_k2hk-evm = "k2hk-evm.dtb"
@@ -21,7 +21,7 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
#This commit corresponds to "K2_RT_LINUX_03.10.61_15.02" #This commit corresponds to "K2_RT_LINUX_03.10.61_15.02"
SRCREV = "e2e31a1d996d2ed8dd06dab1221e159033432b72" SRCREV = "e2e31a1d996d2ed8dd06dab1221e159033432b72"
PV = "3.10.61" PV = "3.10.61+git${SRCPV}"
BRANCH = "v3.10.61/master-rt" BRANCH = "v3.10.61/master-rt"
SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}\ SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}\
+2 -2
View File
@@ -10,7 +10,7 @@ inherit kernel
require recipes-kernel/linux/linux-dtb.inc require recipes-kernel/linux/linux-dtb.inc
require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/setup-defconfig.inc
MACHINE_KERNEL_PR_append = "d+gitr${SRCPV}" MACHINE_KERNEL_PR_append = "d"
PR = "${MACHINE_KERNEL_PR}" PR = "${MACHINE_KERNEL_PR}"
KERNEL_DEVICETREE_k2hk-evm = "k2hk-evm.dtb" KERNEL_DEVICETREE_k2hk-evm = "k2hk-evm.dtb"
@@ -21,7 +21,7 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
#This commit corresponds to "K2_LINUX_03.10.61_15.02" #This commit corresponds to "K2_LINUX_03.10.61_15.02"
SRCREV = "a17b4c3fd6c93f908daf032786f90c0321296957" SRCREV = "a17b4c3fd6c93f908daf032786f90c0321296957"
PV = "3.10.61" PV = "3.10.61+git${SRCPV}"
BRANCH = "v3.10.61/master" BRANCH = "v3.10.61/master"
SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}\ SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}\
+2 -2
View File
@@ -13,7 +13,7 @@ require recipes-kernel/linux/setup-defconfig.inc
# Look in the generic major.minor directory for files # Look in the generic major.minor directory for files
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-3.13:" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-3.13:"
MACHINE_KERNEL_PR_append = "a+gitr${SRCPV}" MACHINE_KERNEL_PR_append = "a"
PR = "${MACHINE_KERNEL_PR}" PR = "${MACHINE_KERNEL_PR}"
# Only k2hk DTB is available in this version # Only k2hk DTB is available in this version
@@ -22,7 +22,7 @@ KERNEL_DEVICETREE_k2hk-evm = "k2hk-evm.dtb"
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
SRCREV = "11a8eaee39b68e6047f07382c251786b40bef165" SRCREV = "11a8eaee39b68e6047f07382c251786b40bef165"
PV = "3.13.0" PV = "3.13.0+git${SRCPV}"
BRANCH = "v3.13/master" BRANCH = "v3.13/master"
SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}\ SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}\
+2 -2
View File
@@ -21,10 +21,10 @@ S = "${WORKDIR}/git"
BRANCH ?= "p-ti-glsdk-3.8.y" BRANCH ?= "p-ti-glsdk-3.8.y"
SRCREV ?= "cc16f99176bf083829c028f9af5b8eb560debcc1" SRCREV ?= "cc16f99176bf083829c028f9af5b8eb560debcc1"
PV = "3.8.13" PV = "3.8.13+git${SRCPV}"
# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
MACHINE_KERNEL_PR_append = "d+gitr${SRCPV}" MACHINE_KERNEL_PR_append = "d"
PR = "${MACHINE_KERNEL_PR}" PR = "${MACHINE_KERNEL_PR}"
SRC_URI = "git://git.omapzoom.org/kernel/omap.git;protocol=git;branch=${BRANCH} \ SRC_URI = "git://git.omapzoom.org/kernel/omap.git;protocol=git;branch=${BRANCH} \
@@ -40,10 +40,10 @@ S = "${WORKDIR}/git"
BRANCH = "ti-linux-3.12.y" BRANCH = "ti-linux-3.12.y"
SRCREV = "68f449afccf6d1fb6b38bddfc3a40d9e97b53bdf" SRCREV = "68f449afccf6d1fb6b38bddfc3a40d9e97b53bdf"
PV = "3.12.30" PV = "3.12.30+git${SRCPV}"
# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
MACHINE_KERNEL_PR_append = "a+gitr${SRCPV}" MACHINE_KERNEL_PR_append = "a"
PR = "${MACHINE_KERNEL_PR}" PR = "${MACHINE_KERNEL_PR}"
KERNEL_CONFIG_FRAGMENTS = "${WORKDIR}/baseport.cfg ${WORKDIR}/connectivity.cfg \ KERNEL_CONFIG_FRAGMENTS = "${WORKDIR}/baseport.cfg ${WORKDIR}/connectivity.cfg \
@@ -47,10 +47,10 @@ S = "${WORKDIR}/git"
BRANCH = "ti-linux-3.14.y" BRANCH = "ti-linux-3.14.y"
SRCREV = "d0f5c460aac292d2942b23dd6199fe23021212ad" SRCREV = "d0f5c460aac292d2942b23dd6199fe23021212ad"
PV = "3.14.43" PV = "3.14.43+git${SRCPV}"
# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
MACHINE_KERNEL_PR_append = "b+gitr${SRCPV}" MACHINE_KERNEL_PR_append = "b"
PR = "${MACHINE_KERNEL_PR}" PR = "${MACHINE_KERNEL_PR}"
KERNEL_CONFIG_DIR = "${S}/ti_config_fragments" KERNEL_CONFIG_DIR = "${S}/ti_config_fragments"
@@ -36,10 +36,10 @@ S = "${WORKDIR}/git"
BRANCH = "sitara-ti-linux-3.14.y" BRANCH = "sitara-ti-linux-3.14.y"
SRCREV = "2489c022b2932432606f897741a71b712e6dbe77" SRCREV = "2489c022b2932432606f897741a71b712e6dbe77"
PV = "3.14.26" PV = "3.14.26+git${SRCPV}"
# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
MACHINE_KERNEL_PR_append = "h+gitr${SRCPV}" MACHINE_KERNEL_PR_append = "h"
PR = "${MACHINE_KERNEL_PR}" PR = "${MACHINE_KERNEL_PR}"
MULTI_CONFIG_BASE_SUFFIX = "" MULTI_CONFIG_BASE_SUFFIX = ""