From c5a0c81e49e74fc5ddccb43dd8d3d89312389c44 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 24 Jun 2013 13:45:01 +0000 Subject: meta-intel: Drop PRINC usage With the switch to the PR server we don't need to use PRINC. This patch matches a change to OE-Core to bump the PR values of the appropriate core recipes so PR values don't go backwards. Signed-off-by: Richard Purdie --- common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend | 1 - 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-fri2/recipes-bsp/formfactor/formfactor_0.0.bbappend | 2 -- meta-fri2/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend | 1 - .../recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend | 1 - meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend | 2 -- meta-n450/recipes-bsp/formfactor/formfactor_0.0.bbappend | 2 -- meta-nuc/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-sys940x/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend | 1 - meta-tlk/recipes-core/psplash/psplash_git.bbappend | 2 -- meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc | 1 - 17 files changed, 29 deletions(-) diff --git a/common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend b/common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend index 31f991f1..63353159 100644 --- a/common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend +++ b/common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend @@ -1,5 +1,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 1}" # This exists in Yocto 1.1, but include it here for completeness LIC_FILES_CHKSUM += "file://LICENCE.iwlwifi_firmware;md5=11545778abf78c43d7644d4f171ea1c7" diff --git a/meta-chiefriver/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-chiefriver/recipes-bsp/formfactor/formfactor_0.0.bbappend index 2a3ee7a2..72d991c7 100644 --- a/meta-chiefriver/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/meta-chiefriver/recipes-bsp/formfactor/formfactor_0.0.bbappend @@ -1,3 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -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 2a3ee7a2..72d991c7 100644 --- a/meta-crownbay/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/meta-crownbay/recipes-bsp/formfactor/formfactor_0.0.bbappend @@ -1,3 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -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 2a3ee7a2..72d991c7 100644 --- a/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend @@ -1,3 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -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 2a3ee7a2..72d991c7 100644 --- a/meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend @@ -1,3 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -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 2a3ee7a2..72d991c7 100644 --- a/meta-fri2/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/meta-fri2/recipes-bsp/formfactor/formfactor_0.0.bbappend @@ -1,3 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PRINC := "${@int(PRINC) + 2}" diff --git a/meta-fri2/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-fri2/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend index 5816c33e..81fe7b79 100644 --- a/meta-fri2/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/meta-fri2/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend @@ -1,2 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -PRINC := "${@int(PRINC) + 1}" diff --git a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend index e1daa4b1..72d991c7 100644 --- a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend @@ -1,2 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 1}" diff --git a/meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend index 2a3ee7a2..72d991c7 100644 --- a/meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend @@ -1,3 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -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 2a3ee7a2..72d991c7 100644 --- a/meta-n450/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/meta-n450/recipes-bsp/formfactor/formfactor_0.0.bbappend @@ -1,3 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PRINC := "${@int(PRINC) + 2}" diff --git a/meta-nuc/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-nuc/recipes-bsp/formfactor/formfactor_0.0.bbappend index 6644a842..72d991c7 100644 --- a/meta-nuc/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/meta-nuc/recipes-bsp/formfactor/formfactor_0.0.bbappend @@ -1,3 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -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 2a3ee7a2..72d991c7 100644 --- a/meta-romley/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/meta-romley/recipes-bsp/formfactor/formfactor_0.0.bbappend @@ -1,3 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -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 2a3ee7a2..72d991c7 100644 --- a/meta-sugarbay/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/meta-sugarbay/recipes-bsp/formfactor/formfactor_0.0.bbappend @@ -1,3 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -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 2a3ee7a2..72d991c7 100644 --- a/meta-sys940x/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/meta-sys940x/recipes-bsp/formfactor/formfactor_0.0.bbappend @@ -1,3 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PRINC := "${@int(PRINC) + 2}" diff --git a/meta-sys940x/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-sys940x/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend index a4aa47f3..6863e1c5 100644 --- a/meta-sys940x/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/meta-sys940x/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend @@ -1,4 +1,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" RDEPENDS_${PN}_sys940x_append += "genmac" RDEPENDS_${PN}_sys940x-noemgd_append += "genmac" -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 c0bf3dce..6e8d3fa8 100644 --- a/meta-tlk/recipes-core/psplash/psplash_git.bbappend +++ b/meta-tlk/recipes-core/psplash/psplash_git.bbappend @@ -2,8 +2,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" DEPENDS += "gdk-pixbuf-native" -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 # each of these ... diff --git a/meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc b/meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc index 47d6ffd1..5461007b 100644 --- a/meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc +++ b/meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc @@ -1,3 +1,2 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append = " file://time-limited-kernel.cfg" -PRINC := "${@int(PRINC) + 1}" -- cgit v1.2.3-54-g00ecf