diff options
author | Denys Dmytriyenko <denys@ti.com> | 2015-05-21 07:56:22 +0000 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2015-05-21 11:11:06 -0400 |
commit | fef30ea1bf5c55bf46d5c6a0caa87d19191c5ebf (patch) | |
tree | ad28bde634f7f8380b5f76fc21af569139d29e18 /recipes-kernel | |
parent | e7601086a4db4dbbb93b50251642794314b8e46f (diff) | |
download | meta-ti-fef30ea1bf5c55bf46d5c6a0caa87d19191c5ebf.tar.gz |
recipes: move SRCPV from PR to PV, so PRServ can package AUTOINC after patching
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-keystone-rt_3.10.bb | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-keystone_3.10.bb | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-keystone_3.13.bb | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-ti-glsdk_3.8.bb | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-ti-staging_3.12.bb | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-ti-staging_3.14.bb | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/sitara-linux-ti-staging_3.14.bb | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/recipes-kernel/linux/linux-keystone-rt_3.10.bb b/recipes-kernel/linux/linux-keystone-rt_3.10.bb index 5560ad21..7ce45b55 100644 --- a/recipes-kernel/linux/linux-keystone-rt_3.10.bb +++ b/recipes-kernel/linux/linux-keystone-rt_3.10.bb | |||
@@ -10,7 +10,7 @@ inherit kernel | |||
10 | require recipes-kernel/linux/linux-dtb.inc | 10 | require recipes-kernel/linux/linux-dtb.inc |
11 | require recipes-kernel/linux/setup-defconfig.inc | 11 | require recipes-kernel/linux/setup-defconfig.inc |
12 | 12 | ||
13 | MACHINE_KERNEL_PR_append = "d+gitr${SRCPV}" | 13 | MACHINE_KERNEL_PR_append = "d" |
14 | PR = "${MACHINE_KERNEL_PR}" | 14 | PR = "${MACHINE_KERNEL_PR}" |
15 | 15 | ||
16 | KERNEL_DEVICETREE_k2hk-evm = "k2hk-evm.dtb" | 16 | KERNEL_DEVICETREE_k2hk-evm = "k2hk-evm.dtb" |
@@ -21,7 +21,7 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" | |||
21 | 21 | ||
22 | #This commit corresponds to "K2_RT_LINUX_03.10.61_15.02" | 22 | #This commit corresponds to "K2_RT_LINUX_03.10.61_15.02" |
23 | SRCREV = "e2e31a1d996d2ed8dd06dab1221e159033432b72" | 23 | SRCREV = "e2e31a1d996d2ed8dd06dab1221e159033432b72" |
24 | PV = "3.10.61" | 24 | PV = "3.10.61+git${SRCPV}" |
25 | 25 | ||
26 | BRANCH = "v3.10.61/master-rt" | 26 | BRANCH = "v3.10.61/master-rt" |
27 | SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}\ | 27 | SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}\ |
diff --git a/recipes-kernel/linux/linux-keystone_3.10.bb b/recipes-kernel/linux/linux-keystone_3.10.bb index 005aff41..78d5a0e5 100644 --- a/recipes-kernel/linux/linux-keystone_3.10.bb +++ b/recipes-kernel/linux/linux-keystone_3.10.bb | |||
@@ -10,7 +10,7 @@ inherit kernel | |||
10 | require recipes-kernel/linux/linux-dtb.inc | 10 | require recipes-kernel/linux/linux-dtb.inc |
11 | require recipes-kernel/linux/setup-defconfig.inc | 11 | require recipes-kernel/linux/setup-defconfig.inc |
12 | 12 | ||
13 | MACHINE_KERNEL_PR_append = "d+gitr${SRCPV}" | 13 | MACHINE_KERNEL_PR_append = "d" |
14 | PR = "${MACHINE_KERNEL_PR}" | 14 | PR = "${MACHINE_KERNEL_PR}" |
15 | 15 | ||
16 | KERNEL_DEVICETREE_k2hk-evm = "k2hk-evm.dtb" | 16 | KERNEL_DEVICETREE_k2hk-evm = "k2hk-evm.dtb" |
@@ -21,7 +21,7 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" | |||
21 | 21 | ||
22 | #This commit corresponds to "K2_LINUX_03.10.61_15.02" | 22 | #This commit corresponds to "K2_LINUX_03.10.61_15.02" |
23 | SRCREV = "a17b4c3fd6c93f908daf032786f90c0321296957" | 23 | SRCREV = "a17b4c3fd6c93f908daf032786f90c0321296957" |
24 | PV = "3.10.61" | 24 | PV = "3.10.61+git${SRCPV}" |
25 | 25 | ||
26 | BRANCH = "v3.10.61/master" | 26 | BRANCH = "v3.10.61/master" |
27 | SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}\ | 27 | SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}\ |
diff --git a/recipes-kernel/linux/linux-keystone_3.13.bb b/recipes-kernel/linux/linux-keystone_3.13.bb index 13ce73e8..dc53e42b 100644 --- a/recipes-kernel/linux/linux-keystone_3.13.bb +++ b/recipes-kernel/linux/linux-keystone_3.13.bb | |||
@@ -13,7 +13,7 @@ require recipes-kernel/linux/setup-defconfig.inc | |||
13 | # Look in the generic major.minor directory for files | 13 | # Look in the generic major.minor directory for files |
14 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-3.13:" | 14 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-3.13:" |
15 | 15 | ||
16 | MACHINE_KERNEL_PR_append = "a+gitr${SRCPV}" | 16 | MACHINE_KERNEL_PR_append = "a" |
17 | PR = "${MACHINE_KERNEL_PR}" | 17 | PR = "${MACHINE_KERNEL_PR}" |
18 | 18 | ||
19 | # Only k2hk DTB is available in this version | 19 | # Only k2hk DTB is available in this version |
@@ -22,7 +22,7 @@ KERNEL_DEVICETREE_k2hk-evm = "k2hk-evm.dtb" | |||
22 | KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" | 22 | KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" |
23 | 23 | ||
24 | SRCREV = "11a8eaee39b68e6047f07382c251786b40bef165" | 24 | SRCREV = "11a8eaee39b68e6047f07382c251786b40bef165" |
25 | PV = "3.13.0" | 25 | PV = "3.13.0+git${SRCPV}" |
26 | 26 | ||
27 | BRANCH = "v3.13/master" | 27 | BRANCH = "v3.13/master" |
28 | SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}\ | 28 | SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}\ |
diff --git a/recipes-kernel/linux/linux-ti-glsdk_3.8.bb b/recipes-kernel/linux/linux-ti-glsdk_3.8.bb index 17bee023..906da49c 100644 --- a/recipes-kernel/linux/linux-ti-glsdk_3.8.bb +++ b/recipes-kernel/linux/linux-ti-glsdk_3.8.bb | |||
@@ -21,10 +21,10 @@ S = "${WORKDIR}/git" | |||
21 | BRANCH ?= "p-ti-glsdk-3.8.y" | 21 | BRANCH ?= "p-ti-glsdk-3.8.y" |
22 | 22 | ||
23 | SRCREV ?= "cc16f99176bf083829c028f9af5b8eb560debcc1" | 23 | SRCREV ?= "cc16f99176bf083829c028f9af5b8eb560debcc1" |
24 | PV = "3.8.13" | 24 | PV = "3.8.13+git${SRCPV}" |
25 | 25 | ||
26 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild | 26 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild |
27 | MACHINE_KERNEL_PR_append = "d+gitr${SRCPV}" | 27 | MACHINE_KERNEL_PR_append = "d" |
28 | PR = "${MACHINE_KERNEL_PR}" | 28 | PR = "${MACHINE_KERNEL_PR}" |
29 | 29 | ||
30 | SRC_URI = "git://git.omapzoom.org/kernel/omap.git;protocol=git;branch=${BRANCH} \ | 30 | SRC_URI = "git://git.omapzoom.org/kernel/omap.git;protocol=git;branch=${BRANCH} \ |
diff --git a/recipes-kernel/linux/linux-ti-staging_3.12.bb b/recipes-kernel/linux/linux-ti-staging_3.12.bb index 358bd1be..dd68b8e6 100644 --- a/recipes-kernel/linux/linux-ti-staging_3.12.bb +++ b/recipes-kernel/linux/linux-ti-staging_3.12.bb | |||
@@ -40,10 +40,10 @@ S = "${WORKDIR}/git" | |||
40 | BRANCH = "ti-linux-3.12.y" | 40 | BRANCH = "ti-linux-3.12.y" |
41 | 41 | ||
42 | SRCREV = "68f449afccf6d1fb6b38bddfc3a40d9e97b53bdf" | 42 | SRCREV = "68f449afccf6d1fb6b38bddfc3a40d9e97b53bdf" |
43 | PV = "3.12.30" | 43 | PV = "3.12.30+git${SRCPV}" |
44 | 44 | ||
45 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild | 45 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild |
46 | MACHINE_KERNEL_PR_append = "a+gitr${SRCPV}" | 46 | MACHINE_KERNEL_PR_append = "a" |
47 | PR = "${MACHINE_KERNEL_PR}" | 47 | PR = "${MACHINE_KERNEL_PR}" |
48 | 48 | ||
49 | KERNEL_CONFIG_FRAGMENTS = "${WORKDIR}/baseport.cfg ${WORKDIR}/connectivity.cfg \ | 49 | KERNEL_CONFIG_FRAGMENTS = "${WORKDIR}/baseport.cfg ${WORKDIR}/connectivity.cfg \ |
diff --git a/recipes-kernel/linux/linux-ti-staging_3.14.bb b/recipes-kernel/linux/linux-ti-staging_3.14.bb index 3a319dcd..084c8e36 100644 --- a/recipes-kernel/linux/linux-ti-staging_3.14.bb +++ b/recipes-kernel/linux/linux-ti-staging_3.14.bb | |||
@@ -47,10 +47,10 @@ S = "${WORKDIR}/git" | |||
47 | BRANCH = "ti-linux-3.14.y" | 47 | BRANCH = "ti-linux-3.14.y" |
48 | 48 | ||
49 | SRCREV = "d0f5c460aac292d2942b23dd6199fe23021212ad" | 49 | SRCREV = "d0f5c460aac292d2942b23dd6199fe23021212ad" |
50 | PV = "3.14.43" | 50 | PV = "3.14.43+git${SRCPV}" |
51 | 51 | ||
52 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild | 52 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild |
53 | MACHINE_KERNEL_PR_append = "b+gitr${SRCPV}" | 53 | MACHINE_KERNEL_PR_append = "b" |
54 | PR = "${MACHINE_KERNEL_PR}" | 54 | PR = "${MACHINE_KERNEL_PR}" |
55 | 55 | ||
56 | KERNEL_CONFIG_DIR = "${S}/ti_config_fragments" | 56 | KERNEL_CONFIG_DIR = "${S}/ti_config_fragments" |
diff --git a/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bb b/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bb index 31c12239..cc364463 100644 --- a/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bb +++ b/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bb | |||
@@ -36,10 +36,10 @@ S = "${WORKDIR}/git" | |||
36 | BRANCH = "sitara-ti-linux-3.14.y" | 36 | BRANCH = "sitara-ti-linux-3.14.y" |
37 | 37 | ||
38 | SRCREV = "2489c022b2932432606f897741a71b712e6dbe77" | 38 | SRCREV = "2489c022b2932432606f897741a71b712e6dbe77" |
39 | PV = "3.14.26" | 39 | PV = "3.14.26+git${SRCPV}" |
40 | 40 | ||
41 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild | 41 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild |
42 | MACHINE_KERNEL_PR_append = "h+gitr${SRCPV}" | 42 | MACHINE_KERNEL_PR_append = "h" |
43 | PR = "${MACHINE_KERNEL_PR}" | 43 | PR = "${MACHINE_KERNEL_PR}" |
44 | 44 | ||
45 | MULTI_CONFIG_BASE_SUFFIX = "" | 45 | MULTI_CONFIG_BASE_SUFFIX = "" |