From 5d8a05811101f7d69994f4028ec620c4480f6da4 Mon Sep 17 00:00:00 2001
From: Darren Hart <dvhart@linux.intel.com>
Date: Tue, 9 Oct 2012 15:07:14 -0700
Subject: Fix use of PRINC in meta-intel BSPs

Replaces all uses of PRINC with the form:

PRINC := "${@int(PRINC) + N}"

Where N is the previously assigned value plus one to ensure a
monotonically increasing PRINC value.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: Tom Zanussi <tom.zanussi@intel.com>
CC: Saul Wold <sgw@linux.intel.com>
CC: Nitin Kamble <nitin.a.kamble@intel.com>
---
 meta-cedartrail/recipes-bsp/formfactor/formfactor_0.0.bbappend    | 2 +-
 meta-chiefriver/recipes-bsp/formfactor/formfactor_0.0.bbappend    | 2 +-
 meta-crownbay/recipes-bsp/formfactor/formfactor_0.0.bbappend      | 2 +-
 meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend | 2 +-
 meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend       | 2 +-
 meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend     | 4 ++--
 meta-fri2/recipes-bsp/formfactor/formfactor_0.0.bbappend          | 2 +-
 meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend  | 2 +-
 meta-n450/recipes-bsp/formfactor/formfactor_0.0.bbappend          | 2 +-
 meta-romley/recipes-bsp/formfactor/formfactor_0.0.bbappend        | 2 +-
 meta-sugarbay/recipes-bsp/formfactor/formfactor_0.0.bbappend      | 2 +-
 meta-sys940x/recipes-bsp/formfactor/formfactor_0.0.bbappend       | 2 +-
 meta-tlk/recipes-core/psplash/psplash_git.bbappend                | 2 +-
 meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc                 | 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/meta-cedartrail/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-cedartrail/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 54da0ffd..2a3ee7a2 100644
--- a/meta-cedartrail/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-cedartrail/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
diff --git a/meta-chiefriver/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-chiefriver/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 54da0ffd..2a3ee7a2 100644
--- a/meta-chiefriver/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-chiefriver/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
diff --git a/meta-crownbay/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-crownbay/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 54da0ffd..2a3ee7a2 100644
--- a/meta-crownbay/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-crownbay/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
diff --git a/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 54da0ffd..2a3ee7a2 100644
--- a/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
diff --git a/meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 54da0ffd..2a3ee7a2 100644
--- a/meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
diff --git a/meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 54da0ffd..6644a842 100644
--- a/meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
- 
-PRINC = "1"
+
+PRINC := "${@int(PRINC) + 2}"
diff --git a/meta-fri2/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-fri2/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 54da0ffd..2a3ee7a2 100644
--- a/meta-fri2/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-fri2/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
diff --git a/meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 54da0ffd..2a3ee7a2 100644
--- a/meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
diff --git a/meta-n450/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-n450/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 54da0ffd..2a3ee7a2 100644
--- a/meta-n450/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-n450/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
diff --git a/meta-romley/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-romley/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 54da0ffd..2a3ee7a2 100644
--- a/meta-romley/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-romley/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
diff --git a/meta-sugarbay/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-sugarbay/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 54da0ffd..2a3ee7a2 100644
--- a/meta-sugarbay/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-sugarbay/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
diff --git a/meta-sys940x/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-sys940x/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 54da0ffd..2a3ee7a2 100644
--- a/meta-sys940x/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-sys940x/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
diff --git a/meta-tlk/recipes-core/psplash/psplash_git.bbappend b/meta-tlk/recipes-core/psplash/psplash_git.bbappend
index 6b5258ef..c0bf3dce 100644
--- a/meta-tlk/recipes-core/psplash/psplash_git.bbappend
+++ b/meta-tlk/recipes-core/psplash/psplash_git.bbappend
@@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 DEPENDS += "gdk-pixbuf-native"
 
-PRINC = "6"
+PRINC := "${@int(PRINC) + 7}"
 
 # NB: this is only for the main logo image; if you add multiple images here,
 # poky will build multiple psplash packages with 'outsuffix' in name for
diff --git a/meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc b/meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc
index b1cf8834..47d6ffd1 100644
--- a/meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc
+++ b/meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI_append = " file://time-limited-kernel.cfg"
-PR .= ".2"
+PRINC := "${@int(PRINC) + 1}"
-- 
cgit v1.2.3-54-g00ecf