Skip to contentSkip to conversation

Fix use of PRINC in meta-intel BSPs

PATCH New Darren Hart 3 participants 5 messages Oct 9, 2012 – Oct 10, 2012

lore
Share & tools
lore

Darren Hart

author
#0 lore raw

cover Fix use of PRINC in meta-intel BSPs

This patch has been tested on cedartrail formfactor and linux-yocto builds with the meta-tlk layer incorporated. All the other affected machines are currently running builds, but no machine specific impact is expected.

author
#1 lore raw

PATCH 1/1 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 <[email protected]>
CC Saul Wold <[email protected]>
CC Tom Zanussi <[email protected]>
CC Nitin Kamble <[email protected]>
---
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    4 ++--
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../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(-)
meta-cedartrail/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-chiefriver/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-crownbay/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend +2 -2
index 54da0ff..6644a84 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
- 
-PRINC = "1"
+
+PRINC := "${@int(PRINC) + 2}"
meta-fri2/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-n450/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-romley/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-sugarbay/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-sys940x/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-tlk/recipes-core/psplash/psplash_git.bbappend +1 -1
index 6b5258e..c0bf3dc 100644
@@ -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
meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc +1 -1
index b1cf883..47d6ffd 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI_append = " file://time-limited-kernel.cfg"
-PR .= ".2"
+PRINC := "${@int(PRINC) + 1}"
Signature · 1 line
1.7.5.4
Acked-by on v1 1/1
#2 lore raw
Quoted 11 lines · Darren Hart

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 <[email protected]>
CC Saul Wold <[email protected]>
CC Tom Zanussi <[email protected]>
CC Nitin Kamble <[email protected]>
Acked-by Tom Zanussi <[email protected]>
Quoted 148 lines
---
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    4 ++--
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../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(-)
meta-cedartrail/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-chiefriver/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-crownbay/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend +2 -2
index 54da0ff..6644a84 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
- 
-PRINC = "1"
+
+PRINC := "${@int(PRINC) + 2}"
meta-fri2/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-n450/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-romley/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-sugarbay/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-sys940x/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-tlk/recipes-core/psplash/psplash_git.bbappend +1 -1
index 6b5258e..c0bf3dc 100644
@@ -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
meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc +1 -1
index b1cf883..47d6ffd 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI_append = " file://time-limited-kernel.cfg"
-PR .= ".2"
+PRINC := "${@int(PRINC) + 1}"
#3 lore raw
In reply to Darren Hart

Tested this for sugarbay BSP, and did not see any issues with it.

Nitin

Quoted 189 lines

-----Original Message-----
From: Darren Hart [mailto:[email protected]]
Sent: Tuesday, October 09, 2012 3:53 PM
To: Yocto Project
Cc: Darren Hart; Saul Wold; Zanussi, Tom; Kamble, Nitin A
Subject: [PATCH] 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 <[email protected]>
CC Saul Wold <[email protected]>
CC Tom Zanussi <[email protected]>
CC Nitin Kamble <[email protected]>
---
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    4 ++--
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 .../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(-)
(quoted diff) +0 -0

bsp/formfactor/formfactor_0.0.bbappend b/meta-cedartrail/recipes- bsp/formfactor/formfactor_0.0.bbappend
index 54da0ff..2a3ee7a 100644

meta-cedartrail/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
(quoted diff) +0 -0

bsp/formfactor/formfactor_0.0.bbappend b/meta-chiefriver/recipes- bsp/formfactor/formfactor_0.0.bbappend
index 54da0ff..2a3ee7a 100644

meta-chiefriver/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
(quoted diff) +0 -0

bsp/formfactor/formfactor_0.0.bbappend b/meta-crownbay/recipes- bsp/formfactor/formfactor_0.0.bbappend
index 54da0ff..2a3ee7a 100644

meta-crownbay/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
(quoted diff) +0 -0

bsp/formfactor/formfactor_0.0.bbappend b/meta-crystalforest/recipes- bsp/formfactor/formfactor_0.0.bbappend
index 54da0ff..2a3ee7a 100644

meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
(quoted diff) +0 -0

bsp/formfactor/formfactor_0.0.bbappend b/meta-emenlow/recipes- bsp/formfactor/formfactor_0.0.bbappend
index 54da0ff..2a3ee7a 100644

meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend +2 -2
index 54da0ff..6644a84 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC = "1"
+
+PRINC := "${@int(PRINC) + 2}"
meta-fri2/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
(quoted diff) +0 -0

bsp/formfactor/formfactor_0.0.bbappend b/meta-jasperforest/recipes- bsp/formfactor/formfactor_0.0.bbappend
index 54da0ff..2a3ee7a 100644

meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-n450/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-romley/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
(quoted diff) +0 -0

bsp/formfactor/formfactor_0.0.bbappend b/meta-sugarbay/recipes- bsp/formfactor/formfactor_0.0.bbappend
index 54da0ff..2a3ee7a 100644

meta-sugarbay/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta-sys940x/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 54da0ff..2a3ee7a 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 2}"
meta- renamed from meta-tlk/recipes-core/psplash/psplash_git.bbappend +0 -0

tlk/recipes-core/psplash/psplash_git.bbappend index 6b5258e..c0bf3dc 100644

meta-tlk/recipes-core/psplash/psplash_git.bbappend +1 -1
@@ -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 b1cf883..47d6ffd 100644

meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc +1 -2
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI_append = " file://time-limited-kernel.cfg"
-PR .= ".2"
+PRINC := "${@int(PRINC) + 1}"
--

1.7.5.4

author
#4 lore raw
Quoted 1 line · Nitin A

Tested this for sugarbay BSP, and did not see any issues with it.

Thanks for the additional testing Nitin, much appreciated.

Signature · 3 lines
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel