diff options
author | Andrei Gherzan <andrei@gherzan.ro> | 2014-02-24 11:22:03 +0000 |
---|---|---|
committer | Gherzan Code Review <gerrit2@gherzan.ro> | 2014-02-24 11:22:03 +0000 |
commit | 9d626df7b8e143f66e8ce9971605d60eae10a2b2 (patch) | |
tree | 4907c08f3cb3471268c40c8eb39e052d02f794df | |
parent | fcf5cb333e2aefb840f4658269473ff36dd2475c (diff) | |
parent | 9d8e47274bbd3df7c1542bd35551e6f0686bd116 (diff) | |
download | meta-raspberrypi-9d626df7b8e143f66e8ce9971605d60eae10a2b2.tar.gz |
Merge changes I1eecd332,I635b2f2b,Iad457c26,Iace03974,I4358434c,Ib15942c4,I724511ad
* changes:
omxplayer: Update to current remote HEAD
userland: Update to current remote HEAD
firmware: Update to current remote HEAD
linux-raspberrypi: Add v3.13.3
linux-raspberrypi: Update v3.12.7 to v3.12.11
linux-raspberrypi: Update v3.10.26 to v3.10.30
linux-raspberrypi: Update v3.11.10 to current remote HEAD
-rw-r--r-- | recipes-bcm/common/firmware.inc | 6 | ||||
-rw-r--r-- | recipes-graphics/userland/userland_git.bb | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-raspberrypi_3.10.30.bb (renamed from recipes-kernel/linux/linux-raspberrypi_3.10.26.bb) | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-raspberrypi_3.11.10.bb | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-raspberrypi_3.12.11.bb (renamed from recipes-kernel/linux/linux-raspberrypi_3.12.7.bb) | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-raspberrypi_3.13.3.bb | 6 | ||||
-rw-r--r-- | recipes-multimedia/omxplayer/omxplayer_git.bb | 5 |
7 files changed, 15 insertions, 10 deletions
diff --git a/recipes-bcm/common/firmware.inc b/recipes-bcm/common/firmware.inc index 0b1aa05..390f6b3 100644 --- a/recipes-bcm/common/firmware.inc +++ b/recipes-bcm/common/firmware.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | # 17/01/2014 firmware; this can be overridden from distro config | 1 | # 21/02/2014 firmware; this can be overridden from distro config |
2 | RPIFW_SRCREV ?= "9babf5f124b85293f81d78b031a15da0d51d46bd" | 2 | RPIFW_SRCREV ?= "cf20d522e926f30e91fa890d42d010ca98913286" |
3 | RPIFW_DATE ?= "20140117" | 3 | RPIFW_DATE ?= "20140221" |
4 | RPIFW_SRC_URI ?= "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master" | 4 | RPIFW_SRC_URI ?= "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master" |
5 | RPIFW_S ?= "${WORKDIR}/git" | 5 | RPIFW_S ?= "${WORKDIR}/git" |
6 | 6 | ||
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb index cba1709..07c8381 100644 --- a/recipes-graphics/userland/userland_git.bb +++ b/recipes-graphics/userland/userland_git.bb | |||
@@ -11,7 +11,7 @@ PROVIDES = "virtual/libgles2 \ | |||
11 | virtual/egl" | 11 | virtual/egl" |
12 | COMPATIBLE_MACHINE = "raspberrypi" | 12 | COMPATIBLE_MACHINE = "raspberrypi" |
13 | 13 | ||
14 | SRCREV = "6da40ffd91f2b3c2aa8471195813322ae5d0cb0d" | 14 | SRCREV = "8181677fc08814cd5fcd1475ab73046f89f8dc80" |
15 | SRC_URI = "git://github.com/raspberrypi/userland.git;protocol=git;branch=master \ | 15 | SRC_URI = "git://github.com/raspberrypi/userland.git;protocol=git;branch=master \ |
16 | " | 16 | " |
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.10.26.bb b/recipes-kernel/linux/linux-raspberrypi_3.10.30.bb index 03f0bd0..e1f2a1a 100644 --- a/recipes-kernel/linux/linux-raspberrypi_3.10.26.bb +++ b/recipes-kernel/linux/linux-raspberrypi_3.10.30.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | SRCREV = "8c92f4407b5fa8b2a1c843e6c8c0ccb5c5a0b762" | 1 | SRCREV = "26d1de2993c81c01f91ebc93a1fad8957c9ece17" |
2 | SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.10.y \ | 2 | SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.10.y \ |
3 | file://sl030raspberrypii2ckernel.patch \ | 3 | file://sl030raspberrypii2ckernel.patch \ |
4 | " | 4 | " |
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.11.10.bb b/recipes-kernel/linux/linux-raspberrypi_3.11.10.bb index 3962b40..6df11fe 100644 --- a/recipes-kernel/linux/linux-raspberrypi_3.11.10.bb +++ b/recipes-kernel/linux/linux-raspberrypi_3.11.10.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | SRCREV = "71397e18fb1038619f3066827b83d6fcd5d8bd62" | 1 | SRCREV = "8f768c5f2a3314e4eacce8d667c787f8dadfda74" |
2 | SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y \ | 2 | SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y \ |
3 | file://sl030raspberrypii2ckernel.patch \ | 3 | file://sl030raspberrypii2ckernel.patch \ |
4 | " | 4 | " |
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.12.7.bb b/recipes-kernel/linux/linux-raspberrypi_3.12.11.bb index b71363c..ff8ed2a 100644 --- a/recipes-kernel/linux/linux-raspberrypi_3.12.7.bb +++ b/recipes-kernel/linux/linux-raspberrypi_3.12.11.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | SRCREV = "7b3d6227aa8285f7cbd5b8ec767a840b6ac42477" | 1 | SRCREV = "e297b214d77ce06a321e5ff98d74ae511ce18696" |
2 | SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.12.y \ | 2 | SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.12.y \ |
3 | file://sl030raspberrypii2ckernel.patch \ | 3 | file://sl030raspberrypii2ckernel.patch \ |
4 | " | 4 | " |
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.13.3.bb b/recipes-kernel/linux/linux-raspberrypi_3.13.3.bb new file mode 100644 index 0000000..078c031 --- /dev/null +++ b/recipes-kernel/linux/linux-raspberrypi_3.13.3.bb | |||
@@ -0,0 +1,6 @@ | |||
1 | SRCREV = "660b0008f5d318d8a29187b64c8717e75ad14c1c" | ||
2 | SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.13.y \ | ||
3 | file://sl030raspberrypii2ckernel.patch \ | ||
4 | " | ||
5 | |||
6 | require linux-raspberrypi.inc | ||
diff --git a/recipes-multimedia/omxplayer/omxplayer_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb index 33202dc..526dc86 100644 --- a/recipes-multimedia/omxplayer/omxplayer_git.bb +++ b/recipes-multimedia/omxplayer/omxplayer_git.bb | |||
@@ -10,12 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
10 | DEPENDS = "libpcre libav virtual/egl boost freetype dbus" | 10 | DEPENDS = "libpcre libav virtual/egl boost freetype dbus" |
11 | PR = "r3" | 11 | PR = "r3" |
12 | 12 | ||
13 | SRCREV = "f666a5dfbec36e2af7cd965558ac8643c86277a6" | 13 | SRCREV = "7af21f596378e5efeceebedff9c4a298e2d06d98" |
14 | SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \ | 14 | SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \ |
15 | file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \ | 15 | file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \ |
16 | file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \ | 16 | file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \ |
17 | file://0003-Remove-strip-step-in-Makefile.patch \ | 17 | file://0003-Remove-strip-step-in-Makefile.patch \ |
18 | file://mktemp-compatible-with-busybox.patch \ | ||
19 | file://fix-tar-command-with-DIST.patch \ | 18 | file://fix-tar-command-with-DIST.patch \ |
20 | " | 19 | " |
21 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
@@ -68,4 +67,4 @@ FILES_${PN} = "${bindir}/omxplayer* \ | |||
68 | 67 | ||
69 | FILES_${PN}-dev += "${libdir}/omxplayer/*.so" | 68 | FILES_${PN}-dev += "${libdir}/omxplayer/*.so" |
70 | 69 | ||
71 | RDEPENDS_${PN} += "bash" | 70 | RDEPENDS_${PN} += "bash procps" |