summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-24 13:47:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-24 14:58:35 +0100
commitde6657ec4699d470124520fa3a4777f7f63d4f8b (patch)
tree95577278007f69f7356b4dd7350432096996f8b9 /meta
parentedcbb79583e1577cb64d368e3902915dea50a96e (diff)
downloadpoky-de6657ec4699d470124520fa3a4777f7f63d4f8b.tar.gz
Sync with PRINC removal from meta-intel
PRINC usage is removed from meta-intel, bump core PR values to ensure no version regressions. (From OE-Core rev: c6108ebe116eafaf0a22b5f22a3eec87c86859f4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/formfactor/formfactor_0.0.bb2
-rw-r--r--meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb2
-rw-r--r--meta/recipes-core/psplash/psplash_git.bb2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb2
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb1
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.8.bb2
7 files changed, 7 insertions, 6 deletions
diff --git a/meta/recipes-bsp/formfactor/formfactor_0.0.bb b/meta/recipes-bsp/formfactor/formfactor_0.0.bb
index 69c58f22e9..c9b53a1a9f 100644
--- a/meta/recipes-bsp/formfactor/formfactor_0.0.bb
+++ b/meta/recipes-bsp/formfactor/formfactor_0.0.bb
@@ -3,7 +3,7 @@ SECTION = "base"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
5 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 5 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
6PR = "r21" 6PR = "r41"
7 7
8SRC_URI = "file://config file://machconfig" 8SRC_URI = "file://config file://machconfig"
9S = "${WORKDIR}" 9S = "${WORKDIR}"
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
index 7bc7058a0a..9d3af34717 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://packages.debian.org/ifupdown"
4SECTION = "base" 4SECTION = "base"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://${WORKDIR}/copyright;md5=3dd6192d306f582dee7687da3d8748ab" 6LIC_FILES_CHKSUM = "file://${WORKDIR}/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
7PR = "r0" 7PR = "r3"
8 8
9inherit update-rc.d 9inherit update-rc.d
10 10
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb
index e0c867a996..2228963e92 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85b
7 7
8SRCREV = "afd4e228c606a9998feae44a3fed4474803240b7" 8SRCREV = "afd4e228c606a9998feae44a3fed4474803240b7"
9PV = "0.1+git${SRCPV}" 9PV = "0.1+git${SRCPV}"
10PR = "r8" 10PR = "r15"
11 11
12SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ 12SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
13 file://psplash-init \ 13 file://psplash-init \
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
index 90d6f56746..b8cd27e67d 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.x.org"
3SECTION = "x11/base" 3SECTION = "x11/base"
4LICENSE = "MIT-X" 4LICENSE = "MIT-X"
5LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 5LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
6PR = "r11" 6PR = "r12"
7 7
8SRC_URI = "file://xorg.conf" 8SRC_URI = "file://xorg.conf"
9 9
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 8b27f14bac..780cca8da6 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.radeon;md5=e56b405656593a0c97e478513051ea0e \
26SRCREV = "c530a75c1e6a472b0eb9558310b518f0dfcd8860" 26SRCREV = "c530a75c1e6a472b0eb9558310b518f0dfcd8860"
27PE = "1" 27PE = "1"
28PV = "0.0+git${SRCPV}" 28PV = "0.0+git${SRCPV}"
29PR = "r1"
29 30
30SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=git" 31SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=git"
31 32
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 818367a2cb..9d6d8c7976 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone
15 15
16LINUX_VERSION ?= "3.4.46" 16LINUX_VERSION ?= "3.4.46"
17 17
18PR = "${INC_PR}.4" 18PR = "${INC_PR}.5"
19PV = "${LINUX_VERSION}+git${SRCPV}" 19PV = "${LINUX_VERSION}+git${SRCPV}"
20 20
21KMETA = "meta" 21KMETA = "meta"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.8.bb b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
index 0c21f7b25f..cf5b96df71 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone
15 15
16LINUX_VERSION ?= "3.8.13" 16LINUX_VERSION ?= "3.8.13"
17 17
18PR = "${INC_PR}.1" 18PR = "${INC_PR}.2"
19PV = "${LINUX_VERSION}+git${SRCPV}" 19PV = "${LINUX_VERSION}+git${SRCPV}"
20 20
21KMETA = "meta" 21KMETA = "meta"