10 files changed, 187 insertions, 172 deletions

diff --git a/README b/README
index fe77b7d..6102279 100644
--- a/README
+++ b/README
@@ -117,6 +117,8 @@ How to use it:
         IMAGE_FSTYPES = "tar.bz2 ext3.xz rpi-sdimg.xz
 2. Overwrite SDIMG_ROOTFS_TYPE in local.conf
         SDIMG_ROOTFS_TYPE = "ext3.xz"
+3. Overwrite SDIMG_COMPRESSION in local.conf
+        SDIMG_COMPRESSION = "xz"
 *Accommodate the values above to your own needs (ex: ext3 / ext4).
 
 2.B. Optional - GPU memory:
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index a2fcd52..3ee4e94 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -50,6 +50,13 @@ IMAGE_DEPENDS_rpi-sdimg = " \
 # SD card image name
 SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg"
 
+# Compression method to apply to SDIMG after it has been created. Supported
+# compression formats are "gzip", "bzip2" or "xz". The original .rpi-sdimg file
+# is kept and a new compressed file is created if one of these compression
+# formats is chosen. If SDIMG_COMPRESSION is set to any other value it is
+# silently ignored.
+#SDIMG_COMPRESSION ?= ""
+
 # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS.
 FATPAYLOAD ?= ""
 
@@ -107,6 +114,19 @@ IMAGE_CMD_rpi-sdimg () {
         else
                 dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
         fi
+
+        # Optionally apply compression
+        case "${SDIMG_COMPRESSION}" in
+        "gzip")
+                gzip -k9 "${SDIMG}"
+                ;;
+        "bzip2")
+                bzip2 -k9 "${SDIMG}"
+                ;;
+        "xz")
+                xz -k "${SDIMG}"
+                ;;
+        esac
 }
 
 ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; "
diff --git a/conf/machine/include/rpi-default-providers.inc b/conf/machine/include/rpi-default-providers.inc
index 665c6e0..1a647c9 100644
--- a/conf/machine/include/rpi-default-providers.inc
+++ b/conf/machine/include/rpi-default-providers.inc
@@ -1,6 +1,9 @@
 # RaspberryPi BSP default providers
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-raspberrypi"
+# The default kernel version is the same as used by Raspbian
+PREFERRED_VERSION_linux-raspberrypi ?= "3.6.%"
+
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/egl ?= "userland"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "userland"
diff --git a/recipes-graphics/mesa/mesa_9.2.2.bbappend b/recipes-graphics/mesa/mesa_9.2.2.bbappend
index 88e5eab..34da98f 100644
--- a/recipes-graphics/mesa/mesa_9.2.2.bbappend
+++ b/recipes-graphics/mesa/mesa_9.2.2.bbappend
@@ -1,34 +1,36 @@
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 
 #
 # FIXME
-# We may a way to disable EGL and GL ES2, these are provided by userland package
+# We need a way to disable EGL and GL ES2, these are provided by userland package
 #
 python __anonymous () {
     import re
 
-    # Remove egl and gles2 configure options
-    extra_oeconf = d.getVar('EXTRA_OECONF', True).split()
-    take_out = ['--enable-egl', '--enable-gles2', '--enable-gles1']
-    put_in = ['--disable-egl', '--disable-gles2', '--disable-gles1']
-    pattern = re.compile("--with-egl-platforms")
-    new_extra_oeconf = []
-    for i in extra_oeconf:
-        if i not in take_out and not pattern.match(i):
+    machine = d.getVar('MACHINE', True)
+    if machine == 'raspberrypi':
+        # Remove egl and gles2 configure options
+        extra_oeconf = d.getVar('EXTRA_OECONF', True).split()
+        take_out = ['--enable-egl', '--enable-gles2', '--enable-gles1']
+        put_in = ['--disable-egl', '--disable-gles2', '--disable-gles1']
+        pattern = re.compile("--with-egl-platforms")
+        new_extra_oeconf = []
+        for i in extra_oeconf:
+            if i not in take_out and not pattern.match(i):
+                new_extra_oeconf.append(i)
+        for i in put_in:
             new_extra_oeconf.append(i)
-    for i in put_in:
-        new_extra_oeconf.append(i)
-    d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf))
+        d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf))
 
-    # Remove egl and gles2 from provides
-    provides = d.getVar('PROVIDES', True).split()
-    take_out = ['virtual/libgles2', 'virtual/egl', 'virtual/libgles1']
-    new_provides = []
-    for i in provides:
-        if i not in take_out:
-            new_provides.append(i)
-    d.setVar('PROVIDES', ' '.join(new_provides))
+        # Remove egl and gles2 from provides
+        provides = d.getVar('PROVIDES', True).split()
+        take_out = ['virtual/libgles2', 'virtual/egl', 'virtual/libgles1']
+        new_provides = []
+        for i in provides:
+            if i not in take_out:
+                new_provides.append(i)
+        d.setVar('PROVIDES', ' '.join(new_provides))
 
-    # We are now machine specific
-    d.setVar('PACKAGE_ARCH', d.getVar('MACHINE_ARCH'))
+        # We are now machine specific
+        d.setVar('PACKAGE_ARCH', d.getVar('MACHINE_ARCH'))
 }
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
new file mode 100644
index 0000000..e756b57
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -0,0 +1,34 @@
+require linux.inc
+
+DESCRIPTION = "Linux Kernel for Raspberry Pi"
+SECTION = "kernel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+COMPATIBLE_MACHINE = "raspberrypi"
+
+PV_append = "+git${SRCREV}"
+
+S = "${WORKDIR}/git"
+
+# NOTE: For now we pull in the default config from the RPi kernel GIT tree.
+KERNEL_DEFCONFIG = "bcmrpi_defconfig"
+
+# CMDLINE for raspberrypi
+CMDLINE_raspberrypi = "dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
+
+UDEV_GE_141 ?= "1"
+
+do_configure_prepend() {
+    install -m 0644 ${S}/arch/${ARCH}/configs/${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig || die "No default configuration for ${MACHINE} / ${KERNEL_DEFCONFIG} available."
+}
+
+do_install_prepend() {
+    install -d ${D}/lib/firmware
+}
+
+do_deploy_append() {
+    # Deploy cmdline.txt
+    install -d ${DEPLOYDIR}/bcm2835-bootfiles
+    echo "${CMDLINE}" > ${DEPLOYDIR}/bcm2835-bootfiles/cmdline.txt
+}
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.11.0.bb b/recipes-kernel/linux/linux-raspberrypi_3.11.0.bb
new file mode 100644
index 0000000..1ae39b2
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi_3.11.0.bb
@@ -0,0 +1,6 @@
+SRCREV = "d7474694bdc9836af17f4b4d839509f9aad7ffa7"
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y \
+           file://sl030raspberrypii2ckernel.patch \
+          "
+
+require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.2.27.bb b/recipes-kernel/linux/linux-raspberrypi_3.2.27.bb
index 263e0ce..cc4ee38 100644
--- a/recipes-kernel/linux/linux-raspberrypi_3.2.27.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_3.2.27.bb
@@ -1,35 +1,6 @@
-require linux.inc
-
-DESCRIPTION = "Linux kernel for the RaspberryPi board"
-COMPATIBLE_MACHINE = "raspberrypi"
-
-PR = "r7"
-PV_append = "+git${SRCREV}"
-
 SRCREV = "ada8b4415ff44d535d63e4291a0eca733bc2ad0f"
 SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.2.27 \
-           file://sl030raspberrypii2ckernel.patch \
+           file://sl030raspberrypii2ckernel.patch \
           "
-S = "${WORKDIR}/git"
-
-# NOTE: For now we pull in the default config from the RPi kernel GIT tree.
-KERNEL_DEFCONFIG = "bcmrpi_defconfig"
-
-# CMDLINE for raspberrypi
-CMDLINE_raspberrypi = "dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-
-UDEV_GE_141 ?= "1"
-
-do_configure_prepend() {
-        install -m 0644 ${S}/arch/${ARCH}/configs/${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig || die "No default configuration for ${MACHINE} / ${KERNEL_DEFCONFIG} available."
-}
-
-do_install_prepend() {
-        install -d ${D}/lib/firmware
-}
 
-do_deploy_append() {
-        # Deploy cmdline.txt
-        install -d ${DEPLOYDIR}/bcm2835-bootfiles
-        echo "${CMDLINE}" > ${DEPLOYDIR}/bcm2835-bootfiles/cmdline.txt
-}
+require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb b/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb
index 48c99fd..5314f5d 100644
--- a/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb
@@ -1,35 +1,6 @@
-require linux.inc
-
-DESCRIPTION = "Linux kernel for the RaspberryPi board"
-COMPATIBLE_MACHINE = "raspberrypi"
-
-PR = "r7"
-PV_append = "+git${SRCREV}"
-
-SRCREV = "63b69a8806ce1890711ff55280c90673ea415933"
+SRCREV = "cbd6672e7e1b2dc5026f5dc7929a13a9a68f2a62"
 SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y \
            file://sl030raspberrypii2ckernel.patch \
           "
-S = "${WORKDIR}/git"
-
-# NOTE: For now we pull in the default config from the RPi kernel GIT tree.
-KERNEL_DEFCONFIG = "bcmrpi_defconfig"
-
-# CMDLINE for raspberrypi
-CMDLINE_raspberrypi = "dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-
-UDEV_GE_141 ?= "1"
-
-do_configure_prepend() {
-        install -m 0644 ${S}/arch/${ARCH}/configs/${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig || die "No default configuration for ${MACHINE} / ${KERNEL_DEFCONFIG} available."
-}
-
-do_install_prepend() {
-        install -d ${D}/lib/firmware
-}
 
-do_deploy_append() {
-        # Deploy cmdline.txt
-        install -d ${DEPLOYDIR}/bcm2835-bootfiles
-        echo "${CMDLINE}" > ${DEPLOYDIR}/bcm2835-bootfiles/cmdline.txt
-}
+require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.8.13.bb b/recipes-kernel/linux/linux-raspberrypi_3.8.13.bb
new file mode 100644
index 0000000..dc8cf0a
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi_3.8.13.bb
@@ -0,0 +1,6 @@
+SRCREV = "d996a1b91b2bf3dc06f4f4f822a56f4496457aa1"
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.8.y \
+           file://sl030raspberrypii2ckernel.patch \
+          "
+
+require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index 493616c..7a8f984 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -21,96 +21,96 @@ CMDLINE_append = " ${CMDLINE_DEBUG}"
 # $1 - Configure variable to be set
 # $2 - value [n/y/value]
 kernel_configure_variable() {
-        # Remove the config
-        CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;"
-        if test "$2" = "n"
-        then
-                echo "# CONFIG_$1 is not set" >> ${S}/.config
-        else
-                echo "CONFIG_$1=$2" >> ${S}/.config
-        fi
+    # Remove the config
+    CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;"
+    if test "$2" = "n"
+    then
+        echo "# CONFIG_$1 is not set" >> ${S}/.config
+    else
+        echo "CONFIG_$1=$2" >> ${S}/.config
+    fi
 }
 
 do_configure_prepend() {
-        # Clean .config
-        echo "" > ${S}/.config
-        CONF_SED_SCRIPT=""
-
-        # oabi / eabi support
-        if [ "${TARGET_OS}" = "linux-gnueabi" -o  "${TARGET_OS}" = "linux-uclibceabi" ]; then
-                kernel_configure_variable AEABI y
-                if [ "${ARM_KEEP_OABI}" = "1" ] ; then
-                        kernel_configure_variable OABI_COMPAT y
-                else
-                        kernel_configure_variable OABI_COMPAT n
-                fi
-        else
-                kernel_configure_variable AEABI n
-                kernel_configure_variable OABI_COMPAT n
-        fi
-
-        # Set cmdline
-        kernel_configure_variable CMDLINE "\"${CMDLINE}\""
-
-        # Localversion
-        kernel_configure_variable LOCALVERSION "\"\""
-        kernel_configure_variable LOCALVERSION_AUTO n
-
-        # Udev quirks
-        # Newer versions of udev mandate that sysfs doesn't have deprecated entries
-        if [ "${UDEV_GE_141}" = "1" ] ; then
-                kernel_configure_variable SYSFS_DEPRECATED n
-                kernel_configure_variable SYSFS_DEPRECATED_V2 n
-                kernel_configure_variable HOTPLUG y
-                kernel_configure_variable UEVENT_HELPER_PATH "\"\""
-                kernel_configure_variable UNIX y
-                kernel_configure_variable SYSFS y
-                kernel_configure_variable PROC_FS y
-                kernel_configure_variable TMPFS y
-                kernel_configure_variable INOTIFY_USER y
-                kernel_configure_variable SIGNALFD y
-                kernel_configure_variable TMPFS_POSIX_ACL y
-                kernel_configure_variable BLK_DEV_BSG y
-                kernel_configure_variable DEVTMPFS y
-                kernel_configure_variable DEVTMPFS_MOUNT y
-        fi
-
-        # Newer inits like systemd need cgroup support
-        if [ "${KERNEL_ENABLE_CGROUPS}" = "1" ] ; then
-                kernel_configure_variable CGROUP_SCHED y
-                kernel_configure_variable CGROUPS y
-                kernel_configure_variable CGROUP_NS y
-                kernel_configure_variable CGROUP_FREEZER y
-                kernel_configure_variable CGROUP_DEVICE y
-                kernel_configure_variable CPUSETS y
-                kernel_configure_variable PROC_PID_CPUSET y
-                kernel_configure_variable CGROUP_CPUACCT y
-                kernel_configure_variable RESOURCE_COUNTERS y
-        fi
-
-        # root-over-nfs-over-usb-eth support. Limited, but should cover some cases
-        # Enable this by setting a proper CMDLINE_NFSROOT_USB.
-        if [ ! -z "${CMDLINE_NFSROOT_USB}" ]; then
-                oenote "Configuring the kernel for root-over-nfs-over-usb-eth with CMDLINE ${CMDLINE_NFSROOT_USB}"
-                kernel_configure_variable INET y
-                kernel_configure_variable IP_PNP y
-                kernel_configure_variable USB_GADGET y
-                kernel_configure_variable USB_GADGET_SELECTED y
-                kernel_configure_variable USB_ETH y
-                kernel_configure_variable NFS_FS y
-                kernel_configure_variable ROOT_NFS y
-                kernel_configure_variable ROOT_NFS y
-                kernel_configure_variable CMDLINE "\"${CMDLINE_NFSROOT_USB}\""
-        fi
-
-        # Activate CONFIG_LEGACY_PTYS
-        kernel_configure_variable LEGACY_PTYS y
-
-        # Keep this the last line
-        # Remove all modified configs and add the rest to .config
-        sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${S}/.config'
-
-        yes '' | oe_runmake oldconfig
+    # Clean .config
+    echo "" > ${S}/.config
+    CONF_SED_SCRIPT=""
+
+    # oabi / eabi support
+    if [ "${TARGET_OS}" = "linux-gnueabi" -o  "${TARGET_OS}" = "linux-uclibceabi" ]; then
+        kernel_configure_variable AEABI y
+        if [ "${ARM_KEEP_OABI}" = "1" ] ; then
+            kernel_configure_variable OABI_COMPAT y
+        else
+            kernel_configure_variable OABI_COMPAT n
+        fi
+    else
+        kernel_configure_variable AEABI n
+        kernel_configure_variable OABI_COMPAT n
+    fi
+
+    # Set cmdline
+    kernel_configure_variable CMDLINE "\"${CMDLINE}\""
+
+    # Localversion
+    kernel_configure_variable LOCALVERSION "\"\""
+    kernel_configure_variable LOCALVERSION_AUTO n
+
+    # Udev quirks
+    # Newer versions of udev mandate that sysfs doesn't have deprecated entries
+    if [ "${UDEV_GE_141}" = "1" ] ; then
+        kernel_configure_variable SYSFS_DEPRECATED n
+        kernel_configure_variable SYSFS_DEPRECATED_V2 n
+        kernel_configure_variable HOTPLUG y
+        kernel_configure_variable UEVENT_HELPER_PATH "\"\""
+        kernel_configure_variable UNIX y
+        kernel_configure_variable SYSFS y
+        kernel_configure_variable PROC_FS y
+        kernel_configure_variable TMPFS y
+        kernel_configure_variable INOTIFY_USER y
+        kernel_configure_variable SIGNALFD y
+        kernel_configure_variable TMPFS_POSIX_ACL y
+        kernel_configure_variable BLK_DEV_BSG y
+        kernel_configure_variable DEVTMPFS y
+        kernel_configure_variable DEVTMPFS_MOUNT y
+    fi
+
+    # Newer inits like systemd need cgroup support
+    if [ "${KERNEL_ENABLE_CGROUPS}" = "1" ] ; then
+        kernel_configure_variable CGROUP_SCHED y
+        kernel_configure_variable CGROUPS y
+        kernel_configure_variable CGROUP_NS y
+        kernel_configure_variable CGROUP_FREEZER y
+        kernel_configure_variable CGROUP_DEVICE y
+        kernel_configure_variable CPUSETS y
+        kernel_configure_variable PROC_PID_CPUSET y
+        kernel_configure_variable CGROUP_CPUACCT y
+        kernel_configure_variable RESOURCE_COUNTERS y
+    fi
+
+    # root-over-nfs-over-usb-eth support. Limited, but should cover some cases
+    # Enable this by setting a proper CMDLINE_NFSROOT_USB.
+    if [ ! -z "${CMDLINE_NFSROOT_USB}" ]; then
+        oenote "Configuring the kernel for root-over-nfs-over-usb-eth with CMDLINE ${CMDLINE_NFSROOT_USB}"
+        kernel_configure_variable INET y
+        kernel_configure_variable IP_PNP y
+        kernel_configure_variable USB_GADGET y
+        kernel_configure_variable USB_GADGET_SELECTED y
+        kernel_configure_variable USB_ETH y
+        kernel_configure_variable NFS_FS y
+        kernel_configure_variable ROOT_NFS y
+        kernel_configure_variable ROOT_NFS y
+        kernel_configure_variable CMDLINE "\"${CMDLINE_NFSROOT_USB}\""
+    fi
+
+    # Activate CONFIG_LEGACY_PTYS
+    kernel_configure_variable LEGACY_PTYS y
+
+    # Keep this the last line
+    # Remove all modified configs and add the rest to .config
+    sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${S}/.config'
+
+    yes '' | oe_runmake oldconfig
 }
 
 # Automatically depend on lzop-native if CONFIG_KERNEL_LZO is enabled