README: Modify dependencies for danny branch

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
2012-10-29 20:18:20 +02:00
61 changed files with 1360 additions and 1221 deletions
--- a/236
+++ b/236
@ -24,106 +24,110 @@
                           ....


-
-Contents:
-=========
-1. Description
-2. Yocto BSP Layer - RaspberryPi
-    2.A. Compressed deployed files
-    2.B. GPU memory
-    2.C. Add purchased license codecs
-    2.D. Disable overscan
-    2.E. Set overclocking options
-    2.F. Optional - Video camera support with V4L2 drivers
-    2.G. Images
-    2.H. Boot to U-Boot
-    2.I. Image with Initramfs
-3. Extra apps
-    3.A. omxplayer
-4. Source code and mirrors
-5. Contribution
-    5.A. Mailing List
-    5.B. Gerrit Review Server
-    5.C. Trello Board
-6. Maintainers
-
-
-1. Description
-==============
+ OpenEmbedded BSP Layer - RaspberryPi
+--------------------------------------

 This is the general hardware specific BSP overlay for the RaspberryPi device.
+It should be used with openembedded-core (not old-style org.openembedded.dev).

 More information can be found at:
-                   http://www.raspberrypi.org/ (Official Site)

-The core BSP part of meta-raspberrypi should work with different
-OpenEmbedded/Yocto distributions and layer stacks, such as:
+                   http://www.raspberrypi.org/ (Official Site)
+                   http://www.distant-earth.com/ (My Site)
+
+Build scripts patched to support making a firmware image for the RaspberryPi with Angstrom can be found at:
+
+                   http://github.com/Angstrom-distribution/setup-scripts
+
+When not depending on meta-openembedded and not using systemd, you may need to
+mask few recipes requiring systemd or other recipes not included in your distribution of choice.
+
+You can achieve this by adding something like the following to local.conf:
+
+BBMASK = "meta-raspberrypi/recipes-multimedia/libav|meta-raspberrypi/recipes-core/systemd"
+
+You can adjust the BBMASK for any .bbappends that your distribution does not contain recipes for.
+
+The core BSP part of meta-raspberrypi should work with different OpenEmbedded/Yocto
+distributions and layer stacks, such as:
+
 * Distro-less (only with OE-Core).
 * Angstrom (main focus of testing).
 * Yocto/Poky.

-2. Yocto BSP Layer - RaspberryPi
-================================
+This layer in its entirety depends on:
+
+URI: git://git.openembedded.org/openembedded-core
+branch: master
+revision: HEAD
+
+URI: git://git.openembedded.org/meta-openembedded
+branch: master
+revision: HEAD
+
+It is preferred that people raise pull requests using GIThub by forking the appropriate tree:
+
+                   https://github.com/djwillis/
+                   (More info on achieving this can be found at http://help.github.com/send-pull-requests/)
+
+ Yocto BSP Layer - RaspberryPi
+-------------------------------

 This layer depends on:

 URI: git://git.yoctoproject.org/poky
-branch: master
+branch: danny
 revision: HEAD

-URI: git://github.com/openembedded/meta-oe.git
-layers: meta-multimedia
+URI: git://git.openembedded.org/meta-openembedded
 branch: master
-revision: HEAD
+revision: 1571c2c566c51799eceea2aabe13d1c3116f36b3

 How to use it:

 1. source poky/oe-init-build-env rpi-build
-2. Add needed layer to bblayers.conf:
+2. Add needed layers to bblayers.conf:
    - meta-raspberrypi
+    - meta-openembedded/meta-oe
 3  Set MACHINE to raspberrypi in local.conf
 4. bitbake rpi-hwup-image
 5. dd to a SD card the generated sdimg file (use xzcat if rpi-sdimg.xz is used)
 6. Boot your RPI.

-2.A. Optional - compressed deployed files:
-==========================================
+Optional - compressed deployed files:
+=====================================
 1. Overwrite IMAGE_FSTYPES in local.conf
-	IMAGE_FSTYPES = "tar.bz2 ext3.xz"
+	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:
-===========================
-Variable    : Details
-GPU_MEM     : GPU memory in megabyte. Sets the memory split between the ARM and
-              GPU. ARM gets the remaining memory. Min 16. Default 64.
-GPU_MEM_256 : GPU memory in megabyte for the 256MB Raspberry Pi. Ignored by the
-              512MB RP. Overrides gpu_mem. Max 192. Default not set.
-GPU_MEM_512 : GPU memory in megabyte for the 512MB Raspberry Pi. Ignored by the
-              256MB RP. Overrides gpu_mem. Max 448. Default not set.
+Optional - GPU firmware:
+========================
+By default the GPU firmware shipped is arm192. You can overwrite this using the
+variable RPI_GPU_FIRMWARE with one of the values below.
+# arm128 : 128M ARM, 128M GPU split
+# arm192 : 192M ARM, 64M GPU split
+# arm224 : 224M ARM, 32M GPU split
+# arm240 : 240M ARM, 16M GPU split

-2.C.Optional - Add purchased license codecs:
-============================================
-To add you own licenses use variables KEY_DECODE_MPG2 and KEY_DECODE_WVC1 in
-local.conf. Example:
+Optional - Add purchased license codecs:
+========================================
+To add you own licenses use variables KEY_DECODE_MPG2 and KEY_DECODE_WVC1 in local.conf. Example:
 KEY_DECODE_MPG2 = "12345678"
 KEY_DECODE_WVC1 = "12345678"
 You can supply more licenses separated by comma. Example:
 KEY_DECODE_WVC1 = "0x12345678,0xabcdabcd,0x87654321"

-2.D. Optional - Disable overscan:
-=================================
-By default the GPU adds a black border around the video output to compensate for
-TVs which cut off part of the image. To disable this set this variable in
+Optional - Disable overscan:
+============================
+By default the GPU adds a black border around the video output to compensate for TVs
+which cut off part of the image. To disable this set this variable in
 local.conf:
 DISALE_OVERSCAN = "0"

-2.E. Optional - Set overclocking options:
-=========================================
+Optional - Set overclocking options:
+====================================
 The Raspberry PI can be overclocked. As of now overclocking up to the "Turbo
 Mode" is officially supported by the raspbery and does not void warranty.
 Check the config.txt for a detailed description of options and modes. Example:
@ -133,114 +137,6 @@ CORE_FREQ = "500"
 SDRAM_FREQ = "500"
 OVER_VOLTAGE = "6"

-2.F. Optional - Video camera support with V4L2 drivers
-======================================================
-Set this variable to enable support for the video camera (Linux 3.12.4+ required)
-VIDEO_CAMERA = "1"

-2.G. Images
-===========
-* rpi-hwup-image
-    Hardware up image
-* rpi-basic-image
-    Based on rpi-hwup-image with some added features (ex: splash)
-* rpi-test-image
-    Image based on rpi-basic-image which includes most of the packages in this
-    layer and some media samples.
-
-2.H. Boot to U-Boot
-===================
-To have u-boot load kernel image, set in your local.conf
-KERNEL_IMAGETYPE = "uImage"
-
-This will make kernel.img be u-boot image which will load uImage.
-By default, kernel.img is the actual kernel image (ex. Image).
-
-2.I. Image with Initramfs
-=========================
-To build an initramfs image :
-    * Set this 3 kernel variables (in linux-raspberrypi.inc for example)
-        - kernel_configure_variable BLK_DEV_INITRD y
-        - kernel_configure_variable INITRAMFS_SOURCE ""
-        - kernel_configure_variable RD_GZIP y
-    * Set the yocto variables (in linux-raspberrypi.inc for example)
-        - INITRAMFS_IMAGE = "<a name for your initramfs image>"
-        - INITRAMFS_IMAGE_BUNDLE = "1"
-    * Set the meta-rasberrypi variable (in raspberrypi.conf for example)
-        - KERNEL_INITRAMFS = "-initramfs"
-
-3. Extra apps
-=============
-
-3.A. omxplayer
-==============
-omxplayer depends on libav which has a commercial license. So in order to be
-able to compile omxplayer you will need to whiteflag the commercial license
-adding to you local.conf:
-LICENSE_FLAGS_WHITELIST = "commercial"
-
-
-4. Source code and mirrors
-==========================
-
-Main repo:
-    git://git.yoctoproject.org/meta-raspberrypi
-    http://git.yoctoproject.org/git/meta-raspberrypi
-
-Github mirror:
-    https://github.com/djwillis/meta-raspberrypi
-
-Gerrit review repo:
-    https://review.gherzan.ro:8443/meta-raspberrypi
-
-
-5. Contributing
-===============
-
-5.A. Mailing list
-=================
-To contribute to this layer you should send the patches for review to the
-mailing list.
-
-The patches should be compliant with the openembedded patch guidelines:
-http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
-
-Mailing list:
-    https://lists.yoctoproject.org/listinfo/yocto
-
-To send changes to mailing list use something like:
-    git send-email --to yocto@yoctoproject.org \
-    --subject-prefix='meta-raspberrypi][PATCH'
-
-OPTIONALLY push changes to gerrit (help maintainers merge and review patches
-easier in this way).
-    git push ssh://<username>@review.gherzan.ro:29418/meta-raspberrypi
-    <local-branch>:refs/for/master
-    See 5.B. Gerrit Review Server.
-
-5.B. Gerrit Review Server
-=========================
-We have a gerrit server configured at review.gherzan.ro. Changes made in gerrit
-are merged in git.yoctoproject.org/meta-raspberrypi.
-
-You can setup a gerrit account in less than 2 minutes:
-A) Login / Register on https://review.gherzan.ro:8443.
-B) Add your PUBLIC key in Settings/SSH Public Keys.
-C) Add remote in your local repo:
-    git remote add gherzan ssh://<username>@review.gherzan.ro:29418/meta-raspberrypi
-D) Push changes to gerrit using:
-    git push gherzan <local-branch>:refs/for/master
-
-Please check your spam folder for gerrit messages. Sometimes they end up there.
-
-5.C. Trello Board
-=================
-A public Trello board is set to manage tasks and bugs. Join us there:
-    https://trello.com/b/QsYeVjVe/meta-raspberrypi
-
-
-6. Maintainers
-==============
-
-    John Willis <John.Willis at distant-earth.com>
-    Andrei Gherzan <andrei at gherzan.ro>
+Layer maintainer: John Willis <John.Willis at distant-earth.com>
+                  Andrei Gherzan <andrei at gherzan.ro>
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@ -13,28 +13,23 @@ inherit image_types
 #                                                     Default Free space = 1.3x
 #                                                     Use IMAGE_OVERHEAD_FACTOR to add more space
 #                                                     <--------->
-#            4MiB              20MiB           SDIMG_ROOTFS
+#            4KiB              20MiB           SDIMG_ROOTFS
 # <-----------------------> <----------> <---------------------->
-#  ------------------------ ------------ ------------------------
-# | IMAGE_ROOTFS_ALIGNMENT | BOOT_SPACE | ROOTFS_SIZE            |
-#  ------------------------ ------------ ------------------------
-# ^                        ^            ^                        ^
-# |                        |            |                        |
-# 0                      4MiB     4MiB + 20MiB       4MiB + 20Mib + SDIMG_ROOTFS
+#  ------------------------ ------------ ------------------------ -------------------------------
+# | IMAGE_ROOTFS_ALIGNMENT | BOOT_SPACE | ROOTFS_SIZE            |     IMAGE_ROOTFS_ALIGNMENT    |
+#  ------------------------ ------------ ------------------------ -------------------------------
+# ^                        ^            ^                        ^                               ^
+# |                        |            |                        |                               |
+# 0                      4096     4KiB + 20MiB       4KiB + 20Mib + SDIMG_ROOTFS   4KiB + 20MiB + SDIMG_ROOTFS + 4KiB

-# This image depends on the rootfs image
-IMAGE_TYPEDEP_rpi-sdimg = "${SDIMG_ROOTFS_TYPE}"

 # Set kernel and boot loader
 IMAGE_BOOTLOADER ?= "bcm2835-bootfiles"

-# Set initramfs extension
-KERNEL_INITRAMFS ?= ""
-
 # Boot partition volume id
 BOOTDD_VOLUME_ID ?= "${MACHINE}"

-# Boot partition size [in KiB] (will be rounded up to IMAGE_ROOTFS_ALIGNMENT)
+# Boot partition size [in KiB]
 BOOT_SPACE ?= "20480"

 # Set alignment to 4MB [in KiB]
@ -42,7 +37,9 @@ IMAGE_ROOTFS_ALIGNMENT = "4096"

 # Use an uncompressed ext3 by default as rootfs
 SDIMG_ROOTFS_TYPE ?= "ext3"
-SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
+SDIMG_ROOTFS = "${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
+
+RPI_GPU_FIRMWARE ?= "arm192"

 IMAGE_DEPENDS_rpi-sdimg = " \
 			parted-native \
@ -50,19 +47,11 @@ IMAGE_DEPENDS_rpi-sdimg = " \
 			dosfstools-native \
 			virtual/kernel \
 			${IMAGE_BOOTLOADER} \
-			${@base_contains("KERNEL_IMAGETYPE", "uImage", "u-boot", "",d)} \
 			"

 # 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 ?= ""

@ -73,40 +62,39 @@ IMAGE_CMD_rpi-sdimg () {
 	# Align partitions
 	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
 	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
-	ROOTFS_SIZE=`du -bks ${SDIMG_ROOTFS} | awk '{print $1}'`
-        # Round up RootFS size to the alignment size as well
-	ROOTFS_SIZE_ALIGNED=$(expr ${ROOTFS_SIZE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
-	ROOTFS_SIZE_ALIGNED=$(expr ${ROOTFS_SIZE_ALIGNED} - ${ROOTFS_SIZE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
-	SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + ${ROOTFS_SIZE_ALIGNED})
-
-	echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS ${ROOTFS_SIZE_ALIGNED} KiB"
+	SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $ROOTFS_SIZE + ${IMAGE_ROOTFS_ALIGNMENT})

 	# Initialize sdcard image file
-	dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE}
+	dd if=/dev/zero of=${SDIMG} bs=1 count=0 seek=$(expr 1024 \* ${SDIMG_SIZE})

 	# Create partition table
 	parted -s ${SDIMG} mklabel msdos
 	# Create boot partition and mark it as bootable
 	parted -s ${SDIMG} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT})
 	parted -s ${SDIMG} set 1 boot on
-	# Create rootfs partition to the end of disk
-	parted -s ${SDIMG} -- unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) -1s
+	# Create rootfs partition
+	parted -s ${SDIMG} unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT} \+ ${ROOTFS_SIZE})
 	parted ${SDIMG} print

 	# Create a vfat image with boot files
 	BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
 	mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
-	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/
-	case "${KERNEL_IMAGETYPE}" in
-	"uImage")
-	    mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.img ::kernel.img
-	    mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::uImage
-	    ;;
-	*)
-	    mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::kernel.img
-	    ;;
+	case "${RPI_GPU_FIRMWARE}" in
+		"arm128" | "arm192" | "arm224" | "arm240")
+			mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/${RPI_GPU_FIRMWARE}_start.elf ::start.elf
+			;;
+		*)
+			bberror "RPI_GPU_FIRMWARE is undefined or value not recognised. Possible values: arm128, arm192, arm224 or arm240."
+			exit 1
+			;;
 	esac

+	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt ::
+	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/cmdline.txt ::
+	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/bootcode.bin ::
+	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/loader.bin ::
+	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::kernel.img
+
 	if [ -n ${FATPAYLOAD} ] ; then
 		echo "Copying payload into VFAT"
 		for entry in ${FATPAYLOAD} ; do
@ -122,25 +110,12 @@ IMAGE_CMD_rpi-sdimg () {
 	# Burn Partitions
 	dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
 	# If SDIMG_ROOTFS_TYPE is a .xz file use xzcat
-	if echo "${SDIMG_ROOTFS_TYPE}" | egrep -q "*\.xz"
+	if [[ "$SDIMG_ROOTFS_TYPE" == *.xz ]]
 	then
 		xzcat ${SDIMG_ROOTFS} | dd of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
 	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 ; "
--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -2,13 +2,9 @@
 BBPATH .= ":${LAYERDIR}"

 # We have a recipes directory containing .bb and .bbappend files, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+BBFILES := "${BBFILES} ${LAYERDIR}/recipes*/*/*.bb \ 
            ${LAYERDIR}/recipes*/*/*.bbappend"

 BBFILE_COLLECTIONS += "raspberrypi"
 BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/"
 BBFILE_PRIORITY_raspberrypi = "6"
-
-# Additional license directories.
-LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
-
--- a/conf/machine/include/rpi-default-providers.inc
+++ b/conf/machine/include/rpi-default-providers.inc
@ -1,10 +1,7 @@
 # RaspberryPi BSP default providers

 PREFERRED_PROVIDER_virtual/kernel = "linux-raspberrypi"
-PREFERRED_PROVIDER_u-boot = "u-boot-rpi"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/egl ?= "userland"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "userland"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-gl"
-PREFERRED_PROVIDER_virtual/mesa ?= "mesa-gl"
-PREFERRED_PROVIDER_jpeg = "jpeg"
+PREFERRED_PROVIDER_virtual/egl ?= "vc-graphics-hardfp"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "vc-graphics-hardfp"
+PREFERRED_PROVIDER_virtual/libgl ?= "vc-graphics-hardfp"
--- a/conf/machine/include/rpi-default-versions.inc
+++ b/conf/machine/include/rpi-default-versions.inc
@ -1,3 +1,3 @@
 # RaspberryPi BSP default versions

-PREFERRED_VERSION_linux-raspberrypi ?= "3.12.%"
+PREFERRED_VERSION_udev = "164"
--- a/conf/machine/include/tune-arm1176jzf-s.inc
+++ b/conf/machine/include/tune-arm1176jzf-s.inc
@ -1,18 +1,10 @@
-DEFAULTTUNE ?= "armv6"
+DEFAULTTUNE ?= "arm1176jzfs"

 require conf/machine/include/arm/arch-armv6.inc

 TUNEVALID[arm1176jzfs] = "Enable arm1176jzfs specific processor optimizations"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm1176jzfs", "-mtune=arm1176jzf-s", "", d)}"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "vfp", "-mfpu=vfp", "", d)}"

 AVAILTUNES += "arm1176jzfs"
 TUNE_FEATURES_tune-arm1176jzfs = "${TUNE_FEATURES_tune-armv6} arm1176jzfs"
-ARMPKGARCH_tune-arm1176jzfs = "arm1176jzfs"
 PACKAGE_EXTRA_ARCHS_tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6}"
-
-AVAILTUNES += "arm1176jzfshf"
-TUNE_FEATURES_tune-arm1176jzfshf = "${TUNE_FEATURES_tune-arm1176jzfs} callconvention-hard"
-ARMPKGARCH_tune-arm1176jzfshf = "arm1176jzfs"
-PACKAGE_EXTRA_ARCHS_tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf-vfp} arm1176jzfshf-vfp"
-
--- a/conf/machine/raspberrypi.conf
+++ b/conf/machine/raspberrypi.conf
@ -12,7 +12,7 @@ IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg"

 SERIAL_CONSOLE = "115200 ttyAMA0"

-MACHINE_KERNEL_PR = "r5"
+MACHINE_KERNEL_PR = "r4"

 XSERVER = " \
 	xserver-xorg \
@ -22,9 +22,9 @@ XSERVER = " \
 	xf86-video-fbdev \
 "

-KERNEL_IMAGETYPE ?= "Image"
+KERNEL_IMAGETYPE = "Image"

-MACHINE_FEATURES = "kernel26 apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"

 #RaspberryPi has no hardware clock
 MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
@ -33,5 +33,5 @@ MACHINE_EXTRA_RRECOMMENDS += " \
 	kernel-modules \
 "

-# Set raspberrypi splash image
-SPLASH = "psplash-raspberrypi"
+# Set default GPU firmware image to be shipped
+RPI_GPU_FIRMWARE ?= "arm192"
--- a/files/custom-licenses/Broadcom
+++ b/files/custom-licenses/Broadcom
@ -1,25 +0,0 @@
-Copyright (c) 2012, Broadcom Europe Ltd
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the copyright holder nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--- a/recipes-bcm/bcm2835/bcm2835_1.36.bb
+++ b/recipes-bcm/bcm2835/bcm2835_1.36.bb
@ -5,36 +5,38 @@ SECTION = "base"
 HOMEPAGE = "http://www.open.com.au/mikem/bcm2835"
 AUTHOR = "Mike McCauley (mikem@open.com.au)"

-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"

+PR = "r0"
+
 COMPATIBLE_MACHINE = "raspberrypi"

-SRC_URI = "http://www.open.com.au/mikem/bcm2835/bcm2835-${PV}.tar.gz"
+SRC_URI = "http://www.open.com.au/mikem/bcm2835/bcm2835-1.8.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
-}
+SRC_URI[md5sum] = "cca8500049d4ebf9087de4bd1601d185"
+SRC_URI[sha256sum] = "64be77b10aaf48ecb2a9022e13057f3b564093916875c0fc56373b4142dd5cae"

 PACKAGES += "${PN}-tests"

 FILES_${PN} = ""
 FILES_${PN}-tests = "${libdir}/${BPN}"
 FILES_${PN}-dbg += "${libdir}/${BPN}/.debug"
+
+inherit autotools
+
+do_compile_append() {
+    #Now compiling the examples provided by the package
+    for file in examples/*
+    do
+        ${CC} ${file}/${file##*/}.c -o ${file}/${file##*/} -Bstatic -L${S}/src -lbcm2835 -I${S}/src
+    done
+}
+
+do_install_append() {
+    install -d ${D}/${libdir}/${BPN}
+    for file in examples/*
+    do
+        install -m 0755 ${file}/${file##*/} ${D}/${libdir}/${BPN}
+    done
+}
--- a/recipes-bcm/bootfiles/bcm2835-bootfiles.bb
+++ b/recipes-bcm/bootfiles/bcm2835-bootfiles.bb
@ -3,37 +3,32 @@ LICENSE = "Proprietary"

 LIC_FILES_CHKSUM = "file://LICENCE.broadcom;md5=e86e693d19572ee64cc8b17fb062faa9"

-inherit deploy
-
 include ../common/firmware.inc

 RDEPENDS_${PN} = "rpi-config"

 COMPATIBLE_MACHINE = "raspberrypi"

-S = "${RPIFW_S}/boot"
+SRC_URI = " \
+        git://github.com/raspberrypi/firmware.git;protocol=git;branch=master  \
+"

-PR = "r3"
+S = "${WORKDIR}/git/boot"

-do_deploy() {
-    install -d ${DEPLOYDIR}/${PN}
-
-    for i in ${S}/*.elf ; do
-        cp $i ${DEPLOYDIR}/${PN}
-    done
-    for i in ${S}/*.dat ; do
-        cp $i ${DEPLOYDIR}/${PN}
-    done
-    for i in ${S}/*.bin ; do
-        cp $i ${DEPLOYDIR}/${PN}
-    done
-
-    # Add stamp in deploy directory
-    touch ${DEPLOYDIR}/${PN}/${PN}-${PV}.stamp
-}
+PR = "r2"

 addtask deploy before do_package after do_install
-do_deploy[dirs] += "${DEPLOYDIR}/${PN}"
+
+do_deploy() {
+	install -d ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
+	for i in *.elf ; do
+		cp $i ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
+	done
+	for i in *.bin ; do
+		cp $i ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
+	done
+	# Add stamp in deploy directory
+	touch ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/${PN}-${PV}.stamp
+}

 PACKAGE_ARCH = "${MACHINE_ARCH}"
-
--- a/recipes-bcm/bootfiles/rpi-config_0.1.bb
+++ b/recipes-bcm/bootfiles/rpi-config_0.1.bb
@ -0,0 +1,46 @@
+DESCRIPTION = "Commented config.txt file for the Raspberry Pi. \
+               The Raspberry Pi config.txt file is read by the GPU before \
+               the ARM core is initialised. It can be used to set various \
+               system configuration parameters."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+COMPATIBLE_MACHINE = "raspberrypi"
+
+SRCREV = "afeaed02ba5f01298dec3ac4e1bd98f27bcd876e"
+SRC_URI = "git://github.com/Evilpaul/RPi-config.git;protocol=git;branch=master \
+          "
+
+S = "${WORKDIR}/git"
+
+PR = "r1"
+
+addtask deploy before do_package after do_install
+
+do_deploy() {
+	install -d ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
+	cp config.txt ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/
+	if [ -n "${KEY_DECODE_MPG2}" ]; then
+		sed -i '/#decode_MPG2/ c\decode_MPG2=${KEY_DECODE_MPG2}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+	fi
+	if [ -n "${KEY_DECODE_WVC1}" ]; then
+		sed -i '/#decode_WVC1/ c\decode_MVC1=${KEY_DECODE_WVC1}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+	fi
+	if [ -n "${DISABLE_OVERSCAN}" ]; then
+		sed -i '/#disable_overscan/ c\disable_overscan=${DISABLE_OVERSCAN}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+	fi
+	if [ -n "${ARM_FREQ}" ]; then
+		sed -i '/#arm_freq/ c\arm_freq=${ARM_FREQ}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+	fi
+	if [ -n "${CORE_FREQ}" ]; then
+		sed -i '/#core_freq/ c\core_freq=${CORE_FREQ}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+	fi
+	if [ -n "${SDRAM_FREQ}" ]; then
+		sed -i '/#sdram_freq/ c\sdram_freq=${SDRAM_FREQ}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+	fi
+	if [ -n "${OVER_VOLTAGE}" ]; then
+		sed -i '/#over_voltage/ c\over_voltage=${OVER_VOLTAGE}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+	fi
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
--- a/recipes-bcm/bootfiles/rpi-config_git.bb
+++ b/recipes-bcm/bootfiles/rpi-config_git.bb
@ -1,68 +0,0 @@
-DESCRIPTION = "Commented config.txt file for the Raspberry Pi. \
-               The Raspberry Pi config.txt file is read by the GPU before \
-               the ARM core is initialised. It can be used to set various \
-               system configuration parameters."
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-COMPATIBLE_MACHINE = "raspberrypi"
-
-SRCREV = "5d2ca5f9bcb1b239c051e20c05a233fd79cf09d5"
-SRC_URI = "git://github.com/Evilpaul/RPi-config.git;protocol=git;branch=master \
-          "
-
-S = "${WORKDIR}/git"
-
-PR = "r4"
-
-inherit deploy
-
-do_deploy() {
-    install -d ${DEPLOYDIR}/bcm2835-bootfiles
-
-    cp ${S}/config.txt ${DEPLOYDIR}/bcm2835-bootfiles/
-
-    if [ -n "${KEY_DECODE_MPG2}" ]; then
-        sed -i '/#decode_MPG2/ c\decode_MPG2=${KEY_DECODE_MPG2}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    fi
-    if [ -n "${KEY_DECODE_WVC1}" ]; then
-        sed -i '/#decode_WVC1/ c\decode_MVC1=${KEY_DECODE_WVC1}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    fi
-    if [ -n "${DISABLE_OVERSCAN}" ]; then
-        sed -i '/#disable_overscan/ c\disable_overscan=${DISABLE_OVERSCAN}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    fi
-    if [ -n "${ARM_FREQ}" ]; then
-        sed -i '/#arm_freq/ c\arm_freq=${ARM_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    fi
-    if [ -n "${CORE_FREQ}" ]; then
-        sed -i '/#core_freq/ c\core_freq=${CORE_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    fi
-    if [ -n "${SDRAM_FREQ}" ]; then
-        sed -i '/#sdram_freq/ c\sdram_freq=${SDRAM_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    fi
-    if [ -n "${OVER_VOLTAGE}" ]; then
-        sed -i '/#over_voltage/ c\over_voltage=${OVER_VOLTAGE}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    fi
-
-    # GPU memory
-    if [ -n "${GPU_MEM}" ]; then
-        sed -i '/#gpu_mem=/ c\gpu_mem=${GPU_MEM}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    fi
-    if [ -n "${GPU_MEM_256}" ]; then
-        sed -i '/#gpu_mem_256/ c\gpu_mem_256=${GPU_MEM_256}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    fi
-    if [ -n "${GPU_MEM_512}" ]; then
-        sed -i '/#gpu_mem_512/ c\gpu_mem_512=${GPU_MEM_512}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    fi
-
-    # Video camera support
-    if [ -n "${VIDEO_CAMERA}" ]; then
-        echo "# Enable video camera" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-        echo "start_x=1" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    fi
-}
-
-addtask deploy before do_package after do_install
-do_deploy[dirs] += "${DEPLOYDIR}/bcm2835-bootfiles"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
--- a/recipes-bcm/common/firmware.inc
+++ b/recipes-bcm/common/firmware.inc
@ -1,8 +1,6 @@
-RPIFW_SRCREV ?= "c8881991d9181779aee9637d6f4b215f108021a3"
-RPIFW_DATE ?= "20140508"
-RPIFW_SRC_URI ?= "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master"
-RPIFW_S ?= "${WORKDIR}/git"
+# 13/09/2012 firmware; this can be overridden from distro config
+RPIFW_SRCREV ?= "b616053edb93713efa25299cb4ea7efa439dcb61"
+RPIFW_DATE ?= "20120913"

-SRC_URI = "${RPIFW_SRC_URI}"
 SRCREV = "${RPIFW_SRCREV}"
 PV = "${RPIFW_DATE}"
--- a/recipes-bcm/vc-graphics/vc-graphics-hardfp.bb
+++ b/recipes-bcm/vc-graphics/vc-graphics-hardfp.bb
@ -1,6 +1,8 @@
+
 CONFLICTS = "vc-graphics"

 VCDIR = "hardfp/opt/vc"
 require vc-graphics.inc

 PR = "${INCPR}.0"
+
--- a/recipes-bcm/vc-graphics/vc-graphics.bb
+++ b/recipes-bcm/vc-graphics/vc-graphics.bb
@ -1,6 +1,8 @@
+
 CONFLICTS = "vc-graphics-hardfp"

 VCDIR = "opt/vc"
 require vc-graphics.inc

 PR = "${INCPR}.0"
+
--- a/recipes-bcm/vc-graphics/vc-graphics.inc
+++ b/recipes-bcm/vc-graphics/vc-graphics.inc
@ -3,19 +3,18 @@ LICENSE = "Proprietary"

 LIC_FILES_CHKSUM = "file://LICENCE;md5=86e53f5f5909ee66900418028de11780"

-PROVIDES = "virtual/libgles2 virtual/egl"
+PROVIDES = "virtual/libgl virtual/libgles2 virtual/egl"
 COMPATIBLE_MACHINE = "raspberrypi"

 include ../common/firmware.inc

-SRC_URI += " \
-    file://egl.pc \
-    file://vchiq.sh \
-"
+SRC_URI = "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master\
+           file://egl.pc \
+           file://vchiq.sh"

-S = "${RPIFW_S}/${VCDIR}"
+S = "${WORKDIR}/git/${VCDIR}"

-INCPR = "r1"
+INCPR = "r0"

 inherit pkgconfig update-rc.d

--- a/recipes-bsp/rpi-mkimage/rpi-mkimage/License
+++ b/recipes-bsp/rpi-mkimage/rpi-mkimage/License
@ -1,25 +0,0 @@
-Copyright (c) 2012, Broadcom Europe Ltd
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the copyright holder nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--- a/recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch
+++ b/recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch
@ -1,17 +0,0 @@
-When using open, use path relative to imagetool-uncompressed.py
-
-Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-
-Index: git/mkimage/imagetool-uncompressed.py
-===================================================================
--- a/mkimage/imagetool-uncompressed.py
-+++ b/mkimage/imagetool-uncompressed.py
-@@ -18,7 +18,7 @@ re_line = re.compile(r"0x(?P<value>[0-9a
- mem = [0 for i in range(32768)]
- 
- def load_to_mem(name, addr):
-   f = open(name)
-+   f = open(os.path.dirname(__file__) + '/' + name)
- 
-    for l in f.readlines():
-       m = re_line.match(l)
--- a/recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb
+++ b/recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb
@ -1,22 +0,0 @@
-SUMMARY = "RaspberryPi tool to produce kernel.img"
-LICENSE = "Broadcom"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/License;md5=957f6640d5e2d2acfce73a36a56cb32f"
-SECTION = "bootloader"
-
-DEPENDS = "python"
-
-SRCREV = "330c72c2412f75a32932c4d9b51c9c678bce4180"
-SRC_URI = " \
-    git://github.com/raspberrypi/tools.git;branch=master;protocol=git \
-    file://License \
-    file://open-files-relative-to-script.patch \
-"
-
-S = "${WORKDIR}/git"
-
-do_install () {
-    install -d ${D}${libexecdir}
-    cp ./mkimage/* ${D}${libexecdir}
-}
-
-BBCLASSEXTEND = "native"
--- a/recipes-bsp/u-boot/u-boot-rpi_git.bb
+++ b/recipes-bsp/u-boot/u-boot-rpi_git.bb
@ -1,29 +0,0 @@
-DESCRIPTION = "U-Boot port for RaspberryPi"
-
-require recipes-bsp/u-boot/u-boot.inc
-
-DEPENDS += "rpi-mkimage-native"
-
-PROVIDES += "u-boot"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
-
-SRCREV = "6709570cdc947c2a546f96d571551acf4474778c"
-SRC_URI = "git://github.com/gonzoua/u-boot-pi.git;branch=rpi"
-
-S = "${WORKDIR}/git"
-
-UBOOT_MACHINE = "rpi_b"
-UBOOT_MAKE_TARGET = "u-boot.bin"
-UBOOT_SUFFIX = "img"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-COMPATIBLE_MACHINE = "raspberrypi"
-
-do_compile_append() {
-    # Create kernel.img from uboot.bin and name it u-boot.img
-    ${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/imagetool-uncompressed.py u-boot.bin
-    mv kernel.img u-boot.img
-}
--- a/recipes-core/base-files/base-files/raspberrypi/fstab
+++ b/recipes-core/base-files/base-files/raspberrypi/fstab
@ -0,0 +1,9 @@
+# stock fstab for the RaspberryPi - you may want to tweak this to suit.
+
+rootfs               /                    auto       defaults,noatime      1  1
+proc                 /proc                proc       defaults              0  0
+devpts               /dev/pts             devpts     mode=0620,gid=5       0  0
+usbfs                /proc/bus/usb        usbfs      defaults              0  0
+tmpfs                /var/volatile        tmpfs      defaults              0  0
+tmpfs                /dev/shm             tmpfs      mode=0777             0  0
+tmpfs                /media/ram           tmpfs      defaults              0  0
--- a/recipes-core/base-files/base-files/raspberrypi/profile
+++ b/recipes-core/base-files/base-files/raspberrypi/profile
@ -0,0 +1,33 @@
+# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
+# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
+
+PATH="/usr/local/bin:/usr/bin:/bin"
+EDITOR="/bin/vi"			# needed for packages like cron
+test -z "$TERM" && TERM="vt100"	# Basic terminal capab. For screen etc.
+
+if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then
+	TZ="UTC"		# Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 
+				# for an explanation of how to set this to your local timezone.
+	export TZ
+fi
+
+if [ "`id -u`" -eq 0 ]; then
+   PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
+fi
+if [ "$PS1" ]; then
+# works for bash and ash (no other shells known to be in use here)
+   PS1='\u@\h:\w\$ '
+fi
+
+if [ -d /etc/profile.d ]; then
+  for i in /etc/profile.d/*.sh; do
+    if [ -r $i ]; then
+      . $i
+    fi
+  done
+  unset i
+fi
+
+export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
+
+umask 022
--- a/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/recipes-core/base-files/base-files_3.0.14.bbappend
@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+# Don't forget to bump PRINC if you update the extra files.
+PRINC = "1"
--- a/recipes-core/images/rpi-test-image.bb
+++ b/recipes-core/images/rpi-test-image.bb
@ -1,4 +0,0 @@
-# Base this image on rpi-basic-image
-include rpi-basic-image.bb
-
-IMAGE_INSTALL_append = " packagegroup-rpi-test"
--- a/recipes-core/netbase/netbase-5.0/raspberrypi/hosts
+++ b/recipes-core/netbase/netbase-5.0/raspberrypi/hosts
@ -0,0 +1,2 @@
+127.0.0.1	localhost.localdomain		localhost	raspberrypi	rpi
+
--- a/recipes-core/netbase/netbase-5.0/raspberrypi/interfaces
+++ b/recipes-core/netbase/netbase-5.0/raspberrypi/interfaces
@ -0,0 +1,15 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wireless interfaces
+iface wlan0 inet dhcp
+	wireless_mode managed
+	wireless_essid any
+	wpa-driver wext
+	wpa-conf /etc/wpa_supplicant.conf
+
+# Bluetooth networking
+iface bnep0 inet dhcp
--- a/recipes-core/netbase/netbase_5.0.bbappend
+++ b/recipes-core/netbase/netbase_5.0.bbappend
@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+# Don't forget to bump PRINC if you update the extra files.
+PRINC = "1"
--- a/recipes-core/packagegroups/packagegroup-rpi-test.bb
+++ b/recipes-core/packagegroups/packagegroup-rpi-test.bb
@ -1,19 +0,0 @@
-DESCRIPTION = "RaspberryPi Test Packagegroup"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-
-inherit packagegroup
-
-RDEPENDS_${PN} = "\
-    omxplayer \
-    bcm2835-tests \
-    wiringpi \
-    rpio \
-    rpi-gpio \
-"
-
-RRECOMMENDS_${PN} = "\
-    bigbuckbunny-1080p \
-    bigbuckbunny-480p \
-    bigbuckbunny-720p \
-"
--- a/recipes-core/psplash/psplash_git.bbappend
+++ b/recipes-core/psplash/psplash_git.bbappend
@ -1,2 +1,2 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SPLASH_IMAGES += "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi"
+SPLASH_IMAGES = "file://psplash-raspberrypi-img.h;outsuffix=default"
--- a/recipes-devtools/python/RPi-GPIO/don-t-install-setuptools.patch
+++ b/recipes-devtools/python/RPi-GPIO/don-t-install-setuptools.patch
@ -0,0 +1,16 @@
+We already have setuptools python module so we will use that and not the
+one provided in this package.
+
+Upstream-Status: Inappropriate [embedded specific]
+Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+
+Index: RPi.GPIO-0.2.0/setup.py
+===================================================================
+--- RPi.GPIO-0.2.0.orig/setup.py	2012-05-24 13:17:31.000000000 +0300
+++ RPi.GPIO-0.2.0/setup.py	2012-08-22 00:56:59.049001018 +0300
+@@ -1,6 +1,4 @@
+ #!/usr/bin/env python
+-import distribute_setup
+-distribute_setup.use_setuptools()
+ from setuptools import setup, find_packages
+ import platform
--- a/Show More
+++ b/Show More
				`@ -0,0 +1,2 @@`
				`127.0.0.1 localhost.localdomain localhost raspberrypi rpi`