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
This commit is contained in:
Andrei Gherzan 2014-02-24 11:22:03 +00:00 committed by Gherzan Code Review
commit 9d626df7b8
7 changed files with 15 additions and 10 deletions

View File

@ -1,6 +1,6 @@
# 17/01/2014 firmware; this can be overridden from distro config # 21/02/2014 firmware; this can be overridden from distro config
RPIFW_SRCREV ?= "9babf5f124b85293f81d78b031a15da0d51d46bd" RPIFW_SRCREV ?= "cf20d522e926f30e91fa890d42d010ca98913286"
RPIFW_DATE ?= "20140117" RPIFW_DATE ?= "20140221"
RPIFW_SRC_URI ?= "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master" RPIFW_SRC_URI ?= "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master"
RPIFW_S ?= "${WORKDIR}/git" RPIFW_S ?= "${WORKDIR}/git"

View File

@ -11,7 +11,7 @@ PROVIDES = "virtual/libgles2 \
virtual/egl" virtual/egl"
COMPATIBLE_MACHINE = "raspberrypi" COMPATIBLE_MACHINE = "raspberrypi"
SRCREV = "6da40ffd91f2b3c2aa8471195813322ae5d0cb0d" SRCREV = "8181677fc08814cd5fcd1475ab73046f89f8dc80"
SRC_URI = "git://github.com/raspberrypi/userland.git;protocol=git;branch=master \ SRC_URI = "git://github.com/raspberrypi/userland.git;protocol=git;branch=master \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

View File

@ -1,4 +1,4 @@
SRCREV = "8c92f4407b5fa8b2a1c843e6c8c0ccb5c5a0b762" SRCREV = "26d1de2993c81c01f91ebc93a1fad8957c9ece17"
SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.10.y \ SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.10.y \
file://sl030raspberrypii2ckernel.patch \ file://sl030raspberrypii2ckernel.patch \
" "

View File

@ -1,4 +1,4 @@
SRCREV = "71397e18fb1038619f3066827b83d6fcd5d8bd62" SRCREV = "8f768c5f2a3314e4eacce8d667c787f8dadfda74"
SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y \ SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y \
file://sl030raspberrypii2ckernel.patch \ file://sl030raspberrypii2ckernel.patch \
" "

View File

@ -1,4 +1,4 @@
SRCREV = "7b3d6227aa8285f7cbd5b8ec767a840b6ac42477" SRCREV = "e297b214d77ce06a321e5ff98d74ae511ce18696"
SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.12.y \ SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.12.y \
file://sl030raspberrypii2ckernel.patch \ file://sl030raspberrypii2ckernel.patch \
" "

View File

@ -0,0 +1,6 @@
SRCREV = "660b0008f5d318d8a29187b64c8717e75ad14c1c"
SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.13.y \
file://sl030raspberrypii2ckernel.patch \
"
require linux-raspberrypi.inc

View File

@ -10,12 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "libpcre libav virtual/egl boost freetype dbus" DEPENDS = "libpcre libav virtual/egl boost freetype dbus"
PR = "r3" PR = "r3"
SRCREV = "f666a5dfbec36e2af7cd965558ac8643c86277a6" SRCREV = "7af21f596378e5efeceebedff9c4a298e2d06d98"
SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \
file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \ file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \
file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \ file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \
file://0003-Remove-strip-step-in-Makefile.patch \ file://0003-Remove-strip-step-in-Makefile.patch \
file://mktemp-compatible-with-busybox.patch \
file://fix-tar-command-with-DIST.patch \ file://fix-tar-command-with-DIST.patch \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
@ -68,4 +67,4 @@ FILES_${PN} = "${bindir}/omxplayer* \
FILES_${PN}-dev += "${libdir}/omxplayer/*.so" FILES_${PN}-dev += "${libdir}/omxplayer/*.so"
RDEPENDS_${PN} += "bash" RDEPENDS_${PN} += "bash procps"