linux-raspberrypi: Refactor kernel recipes
Subsystems (2)
PATCH v2 1/5 linux-raspberrypi: Refactor kernel recipes
We use this to simplify the update process. Updating a kernel version will not require renaming the recipe but only tweaking LINUX_VERSION.
Update kernel version:
- bump SRCREV
- bump LINUX_VERSION if needed
[Support #26]
--- recipes-kernel/linux/linux-raspberrypi.inc | 2 +- recipes-kernel/linux/linux-raspberrypi_3.10.38.bb | 6 ------ recipes-kernel/linux/linux-raspberrypi_3.10.bb | 8 ++++++++ recipes-kernel/linux/linux-raspberrypi_3.12.36.bb | 6 ------ recipes-kernel/linux/linux-raspberrypi_3.12.bb | 8 ++++++++ recipes-kernel/linux/linux-raspberrypi_3.16.5.bb | 6 ------ recipes-kernel/linux/linux-raspberrypi_3.16.bb | 8 ++++++++ recipes-kernel/linux/linux-raspberrypi_3.18.5.bb | 5 ----- recipes-kernel/linux/linux-raspberrypi_3.18.bb | 8 ++++++++ recipes-kernel/linux/linux-raspberrypi_3.6.11.bb | 6 ------ recipes-kernel/linux/linux-raspberrypi_3.6.bb | 8 ++++++++ recipes-kernel/linux/linux-raspberrypi_3.8.13.bb | 6 ------ recipes-kernel/linux/linux-raspberrypi_3.8.bb | 8 ++++++++ 13 files changed, 49 insertions(+), 36 deletions(-) delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.10.38.bb create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.10.bb delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.12.36.bb create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.12.bb delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.16.5.bb create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.16.bb delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.18.5.bb create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.18.bb delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.6.11.bb create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.6.bb delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.8.13.bb create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.8.bb
recipes-kernel/linux/linux-raspberrypi.inc +1 -1
@@ -11,7 +11,7 @@ SRC_URI += " \ COMPATIBLE_MACHINE = "raspberrypi" -PV_append = "+git${SRCREV}" +PV = "${LINUX_VERSION}+git${SRCREV}" # NOTE: For now we pull in the default config from the RPi kernel GIT tree. KERNEL_DEFCONFIG = "bcmrpi_defconfig"
recipes-kernel/linux/linux-raspberrypi_3.10.38.bb deleted +0 -6
@@ -1,6 +0,0 @@ -SRCREV = "1b49b450222df26e4abf7abb6d9302f72b2ed386" -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.10.y \ - file://sl030raspberrypii2ckernel.patch \ - " - -require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.10.bb new file +8 -0
@@ -0,0 +1,8 @@ +LINUX_VERSION ?= "3.10.38" + +SRCREV = "1b49b450222df26e4abf7abb6d9302f72b2ed386" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.10.y \ + file://sl030raspberrypii2ckernel.patch \ + " + +require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.12.36.bb deleted +0 -6
@@ -1,6 +0,0 @@ -SRCREV = "90fa5df724d147564149c7b79cb1ffc571a345ec" -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.12.y \ - file://sl030raspberrypii2ckernel.patch \ - " - -require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.12.bb new file +8 -0
@@ -0,0 +1,8 @@ +LINUX_VERSION ?= "3.12.36" + +SRCREV = "90fa5df724d147564149c7b79cb1ffc571a345ec" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.12.y \ + file://sl030raspberrypii2ckernel.patch \ + " + +require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.16.5.bb deleted +0 -6
@@ -1,6 +0,0 @@ -SRCREV = "377c82aa1d31b37f1096096b0e4c65beb0bc5c49" -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.16.y \ - file://sl030raspberrypii2ckernel.patch \ - " - -require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.16.bb new file +8 -0
@@ -0,0 +1,8 @@ +LINUX_VERSION ?= "3.16.5" + +SRCREV = "377c82aa1d31b37f1096096b0e4c65beb0bc5c49" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.16.y \ + file://sl030raspberrypii2ckernel.patch \ + " + +require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.18.5.bb deleted +0 -5
@@ -1,5 +0,0 @@ -SRCREV = "a6cf3c99bc89e2c010c2f78fbf9e3ed478ccfd46" -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y \ - file://sl030raspberrypii2ckernel.patch \ - " -require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.18.bb new file +8 -0
@@ -0,0 +1,8 @@ +LINUX_VERSION ?= "3.18.5" + +SRCREV = "a6cf3c99bc89e2c010c2f78fbf9e3ed478ccfd46" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y \ + file://sl030raspberrypii2ckernel.patch \ + " + +require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.6.11.bb deleted +0 -6
@@ -1,6 +0,0 @@ -SRCREV = "2a8d45ec0883e3cbdce920855b3461ac77308a5f" -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y \ - file://sl030raspberrypii2ckernel.patch \ - " - -require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.6.bb new file +8 -0
@@ -0,0 +1,8 @@ +LINUX_VERSION ?= "3.6.11" + +SRCREV = "2a8d45ec0883e3cbdce920855b3461ac77308a5f" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y \ + file://sl030raspberrypii2ckernel.patch \ + " + +require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.8.13.bb deleted +0 -6
@@ -1,6 +0,0 @@ -SRCREV = "d996a1b91b2bf3dc06f4f4f822a56f4496457aa1" -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.8.y \ - file://sl030raspberrypii2ckernel.patch \ - " - -require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.8.bb new file +8 -0
@@ -0,0 +1,8 @@ +LINUX_VERSION ?= "3.8.13" + +SRCREV = "d996a1b91b2bf3dc06f4f4f822a56f4496457aa1" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.8.y \ + file://sl030raspberrypii2ckernel.patch \ + " + +require linux-raspberrypi.inc
Signature · 1 line
2.1.0
PATCH v2 2/5 omxplayer: Bump SRCREV
Add a patch to fix the pkg-config mechanism in ffmpeg.
--- .../omxplayer/omxplayer/use-native-pkg-config.patch | 19 +++++++++++++++++++ recipes-multimedia/omxplayer/omxplayer_git.bb | 7 ++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch
recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch new file +19 -0
@@ -0,0 +1,19 @@ +Force the pkg-config native tool. Strangely ffmpeg prepends cross_prefix +to the default value which obviously is wrong. + +Signed-off-by: Andrei Gherzan <[email protected]> + +Index: git/Makefile.ffmpeg +=================================================================== +--- git.orig/Makefile.ffmpeg ++++ git/Makefile.ffmpeg +@@ -245,7 +245,8 @@ configure: + --disable-decoder=idf \ + --enable-decoder=opus \ + --cross-prefix=$(HOST)- \ +- --disable-stripping ++ --disable-stripping \ ++ --pkg-config=pkg-config + + .PHONY : clean + clean:
recipes-multimedia/omxplayer/omxplayer_git.bb +4 -3
@@ -7,22 +7,23 @@ SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl" +DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl samba libssh" PR = "r3" -SRCREV = "1817503430b8f195bef12bd7a3542bdd251f8389" +SRCREV = "18f051d64d9c837edbf718bc4935204583cfa030" SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \ file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \ file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \ file://0003-Remove-strip-step-in-Makefile.patch \ file://0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch \ file://fix-tar-command-with-DIST.patch \ + file://use-native-pkg-config.patch \ " S = "${WORKDIR}/git" COMPATIBLE_MACHINE = "raspberrypi" -inherit autotools-brokensep +inherit autotools-brokensep pkgconfig # Needed in ffmpeg configure export TEMPDIR = "${S}/tmp"
Signature · 1 line
2.1.0
PATCH v2 3/5 rpi-gpio: Update to v0.5.9
In reply to Andrei Gherzan--- recipes-devtools/python/rpi-gpio_0.5.6.bb | 19 ------------------- recipes-devtools/python/rpi-gpio_0.5.9.bb | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 recipes-devtools/python/rpi-gpio_0.5.6.bb create mode 100644 recipes-devtools/python/rpi-gpio_0.5.9.bb
recipes-devtools/python/rpi-gpio_0.5.6.bb deleted +0 -19
@@ -1,19 +0,0 @@ -DESCRIPTION = "A module to control Raspberry Pi GPIO channels" -HOMEPAGE = "http://code.google.com/p/raspberry-gpio-python/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=35af90ff2a10e8bdc967653b9dfcb22a" - -SRCNAME = "RPi.GPIO" - -SRC_URI = "\ - http://pypi.python.org/packages/source/R/RPi.GPIO/${SRCNAME}-${PV}.tar.gz \ - " -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - -COMPATIBLE_MACHINE = "raspberrypi" - -SRC_URI[md5sum] = "cbdff15871230ceef29bb407d31da485" -SRC_URI[sha256sum] = "36b64a9485d6a0dc8f24cfca6af45759ee367ce412b952ebcf0409364e05813a"
recipes-devtools/python/rpi-gpio_0.5.9.bb new file +19 -0
@@ -0,0 +1,19 @@ +DESCRIPTION = "A module to control Raspberry Pi GPIO channels" +HOMEPAGE = "http://code.google.com/p/raspberry-gpio-python/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=9b95630a648966b142f1a0dcea001cb7" + +SRCNAME = "RPi.GPIO" + +SRC_URI = "\ + http://pypi.python.org/packages/source/R/RPi.GPIO/${SRCNAME}-${PV}.tar.gz \ + " +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils + +COMPATIBLE_MACHINE = "raspberrypi" + +SRC_URI[md5sum] = "54ea6ef33502d43e3a89713593315e5a" +SRC_URI[sha256sum] = "167fab1861093677af69db135ce815729dd4fbfb8f8e2eb830eab6324bc89152"
Signature · 1 line
2.1.0
PATCH v2 4/5 bcm2835: Update to v1.38
In reply to Andrei Gherzan--- recipes-bcm/bcm2835/bcm2835_1.36.bb | 40 ------------------------------------- recipes-bcm/bcm2835/bcm2835_1.38.bb | 40 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 recipes-bcm/bcm2835/bcm2835_1.36.bb create mode 100644 recipes-bcm/bcm2835/bcm2835_1.38.bb
recipes-bcm/bcm2835/bcm2835_1.36.bb deleted +0 -40
@@ -1,40 +0,0 @@ -DESCRIPTION = "Package that provides access to GPIO and other IO\ -functions on the Broadcom BCM 2835 chip, allowing access to the\ -GPIO pins on the 26 pin IDE plug on the RPi board" -SECTION = "base" -HOMEPAGE = "http://www.open.com.au/mikem/bcm2835" -AUTHOR = "Mike McCauley ([email protected])" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -COMPATIBLE_MACHINE = "raspberrypi" - -SRC_URI = "http://www.open.com.au/mikem/bcm2835/bcm2835-${PV}.tar.gz" - -SRC_URI[md5sum] = "3299ddaef60f80b7f85de3318f08dee7" -SRC_URI[sha256sum] = "b4dfcdb453d44ba9ff55634ce7e0ddca21b96355ab61e40b4c3afb9406d4b8d2" - -inherit autotools - -do_compile_append() { - # Now compiling the examples provided by the package - mkdir -p ${B}/examples - for file in `ls ${S}/examples`; do - ${CC} ${S}/examples/${file}/${file}.c -o ${B}/examples/${file} -Bstatic -L${B}/src -lbcm2835 -I${S}/src - done -} - -do_install_append() { - install -d ${D}/${libdir}/${BPN} - for file in ${B}/examples/* - do - install -m 0755 ${file} ${D}/${libdir}/${BPN} - done -} - -PACKAGES += "${PN}-tests" - -FILES_${PN} = "" -FILES_${PN}-tests = "${libdir}/${BPN}" -FILES_${PN}-dbg += "${libdir}/${BPN}/.debug"
recipes-bcm/bcm2835/bcm2835_1.38.bb new file +40 -0
@@ -0,0 +1,40 @@ +DESCRIPTION = "Package that provides access to GPIO and other IO\ +functions on the Broadcom BCM 2835 chip, allowing access to the\ +GPIO pins on the 26 pin IDE plug on the RPi board" +SECTION = "base" +HOMEPAGE = "http://www.open.com.au/mikem/bcm2835" +AUTHOR = "Mike McCauley ([email protected])" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +COMPATIBLE_MACHINE = "raspberrypi" + +SRC_URI = "http://www.open.com.au/mikem/bcm2835/bcm2835-${PV}.tar.gz" + +SRC_URI[md5sum] = "22d431f7402b9c7f93baef348a459cb1" +SRC_URI[sha256sum] = "90c993559ea273ae2e0587f6b815f7c80f19f47ee7f8aa7799b883f975196dbe" + +inherit autotools + +do_compile_append() { + # Now compiling the examples provided by the package + mkdir -p ${B}/examples + for file in `ls ${S}/examples`; do + ${CC} ${S}/examples/${file}/${file}.c -o ${B}/examples/${file} -Bstatic -L${B}/src -lbcm2835 -I${S}/src + done +} + +do_install_append() { + install -d ${D}/${libdir}/${BPN} + for file in ${B}/examples/* + do + install -m 0755 ${file} ${D}/${libdir}/${BPN} + done +} + +PACKAGES += "${PN}-tests" + +FILES_${PN} = "" +FILES_${PN}-tests = "${libdir}/${BPN}" +FILES_${PN}-dbg += "${libdir}/${BPN}/.debug"
Signature · 1 line
2.1.0
PATCH v2 5/5 userland: Bump SRCREV
In reply to Andrei Gherzan--- recipes-graphics/userland/userland_git.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
recipes-graphics/userland/userland_git.bb +5 -2
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE = "raspberrypi" SRCBRANCH = "master" SRCFORK = "raspberrypi" -SRCREV = "85441185e653347e6b3c2bbc7494f5e29a6ca4a2" +SRCREV = "3b81b91c18ff19f97033e146a9f3262ca631f0e9" SRC_URI = "git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \ "
@@ -32,10 +32,13 @@ do_install_append() { rm -rf ${D}/opt } -FILES_${PN} += "${libdir}/*${SOLIBS}" +FILES_${PN} += " \ + ${libdir}/*${SOLIBS} \ + ${libdir}/plugins" FILES_${PN}-dev = "${includedir} \ ${prefix}/src" FILES_${PN}-doc += "${datadir}/install" +FILES_${PN}-dbg += "${libdir}/plugins/.debug" PACKAGE_ARCH = "${MACHINE_ARCH}"
Signature · 1 line
2.1.0
Quoted 208 lines · Andrei Gherzan
We use this to simplify the update process. Updating a kernel version will not require renaming the recipe but only tweaking
LINUX_VERSION.Update kernel version:
- bump SRCREV
- bumpLINUX_VERSIONif needed[Support #26]
Change-Id I7565ddd1f03cc34c34aa5da92664a0057b415c9aSigned-off-by Andrei Gherzan <[email protected]>--- recipes-kernel/linux/linux-raspberrypi.inc | 2 +- recipes-kernel/linux/linux-raspberrypi_3.10.38.bb | 6 ------ recipes-kernel/linux/linux-raspberrypi_3.10.bb | 8 ++++++++ recipes-kernel/linux/linux-raspberrypi_3.12.36.bb | 6 ------ recipes-kernel/linux/linux-raspberrypi_3.12.bb | 8 ++++++++ recipes-kernel/linux/linux-raspberrypi_3.16.5.bb | 6 ------ recipes-kernel/linux/linux-raspberrypi_3.16.bb | 8 ++++++++ recipes-kernel/linux/linux-raspberrypi_3.18.5.bb | 5 ----- recipes-kernel/linux/linux-raspberrypi_3.18.bb | 8 ++++++++ recipes-kernel/linux/linux-raspberrypi_3.6.11.bb | 6 ------ recipes-kernel/linux/linux-raspberrypi_3.6.bb | 8 ++++++++ recipes-kernel/linux/linux-raspberrypi_3.8.13.bb | 6 ------ recipes-kernel/linux/linux-raspberrypi_3.8.bb | 8 ++++++++ 13 files changed, 49 insertions(+), 36 deletions(-) delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.10.38.bb create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.10.bb delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.12.36.bb create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.12.bb delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.16.5.bb create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.16.bb delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.18.5.bb create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.18.bb delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.6.11.bb create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.6.bb delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.8.13.bb create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.8.bbrecipes-kernel/linux/linux-raspberrypi.inc +1
-1@@ -11,7 +11,7 @@ SRC_URI += " \ COMPATIBLE_MACHINE = "raspberrypi" -PV_append = "+git${SRCREV}" +PV = "${LINUX_VERSION}+git${SRCREV}" # NOTE: For now we pull in the default config from the RPi kernel GIT tree. KERNEL_DEFCONFIG = "bcmrpi_defconfig"recipes-kernel/linux/linux-raspberrypi_3.10.38.bb deleted +0
-6@@ -1,6 +0,0 @@ -SRCREV = "1b49b450222df26e4abf7abb6d9302f72b2ed386" -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.10.y \ - file://sl030raspberrypii2ckernel.patch \ - " - -require linux-raspberrypi.increcipes-kernel/linux/linux-raspberrypi_3.10.bb new file +8
-0@@ -0,0 +1,8 @@ +LINUX_VERSION ?= "3.10.38" + +SRCREV = "1b49b450222df26e4abf7abb6d9302f72b2ed386" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.10.y \ + file://sl030raspberrypii2ckernel.patch \ + " + +require linux-raspberrypi.increcipes-kernel/linux/linux-raspberrypi_3.12.36.bb deleted +0
-6@@ -1,6 +0,0 @@ -SRCREV = "90fa5df724d147564149c7b79cb1ffc571a345ec" -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.12.y \ - file://sl030raspberrypii2ckernel.patch \ - " - -require linux-raspberrypi.increcipes-kernel/linux/linux-raspberrypi_3.12.bb new file +8
-0@@ -0,0 +1,8 @@ +LINUX_VERSION ?= "3.12.36" + +SRCREV = "90fa5df724d147564149c7b79cb1ffc571a345ec" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.12.y \ + file://sl030raspberrypii2ckernel.patch \ + " + +require linux-raspberrypi.increcipes-kernel/linux/linux-raspberrypi_3.16.5.bb deleted +0
-6@@ -1,6 +0,0 @@ -SRCREV = "377c82aa1d31b37f1096096b0e4c65beb0bc5c49" -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.16.y \ - file://sl030raspberrypii2ckernel.patch \ - " - -require linux-raspberrypi.increcipes-kernel/linux/linux-raspberrypi_3.16.bb new file +8
-0@@ -0,0 +1,8 @@ +LINUX_VERSION ?= "3.16.5" + +SRCREV = "377c82aa1d31b37f1096096b0e4c65beb0bc5c49" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.16.y \ + file://sl030raspberrypii2ckernel.patch \ + " + +require linux-raspberrypi.increcipes-kernel/linux/linux-raspberrypi_3.18.5.bb deleted +0
-5@@ -1,5 +0,0 @@ -SRCREV = "a6cf3c99bc89e2c010c2f78fbf9e3ed478ccfd46" -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y \ - file://sl030raspberrypii2ckernel.patch \ - " -require linux-raspberrypi.increcipes-kernel/linux/linux-raspberrypi_3.18.bb new file +8
-0@@ -0,0 +1,8 @@ +LINUX_VERSION ?= "3.18.5" + +SRCREV = "a6cf3c99bc89e2c010c2f78fbf9e3ed478ccfd46" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y \ + file://sl030raspberrypii2ckernel.patch \ + " + +require linux-raspberrypi.increcipes-kernel/linux/linux-raspberrypi_3.6.11.bb deleted +0
-6@@ -1,6 +0,0 @@ -SRCREV = "2a8d45ec0883e3cbdce920855b3461ac77308a5f" -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y \ - file://sl030raspberrypii2ckernel.patch \ - " - -require linux-raspberrypi.increcipes-kernel/linux/linux-raspberrypi_3.6.bb new file +8
-0@@ -0,0 +1,8 @@ +LINUX_VERSION ?= "3.6.11" + +SRCREV = "2a8d45ec0883e3cbdce920855b3461ac77308a5f" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y \ + file://sl030raspberrypii2ckernel.patch \ + " + +require linux-raspberrypi.increcipes-kernel/linux/linux-raspberrypi_3.8.13.bb deleted +0
-6@@ -1,6 +0,0 @@ -SRCREV = "d996a1b91b2bf3dc06f4f4f822a56f4496457aa1" -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.8.y \ - file://sl030raspberrypii2ckernel.patch \ - " - -require linux-raspberrypi.increcipes-kernel/linux/linux-raspberrypi_3.8.bb new file +8
-1@@ -0,0 +1,8 @@ +LINUX_VERSION ?= "3.8.13" + +SRCREV = "d996a1b91b2bf3dc06f4f4f822a56f4496457aa1" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.8.y \ + file://sl030raspberrypii2ckernel.patch \ + " + +require linux-raspberrypi.inc --
Quoted 2 lines
2.1.0
Merged along with the entire series.
--
Andrei Gherzan