Cover letter for updating meta-cedartrail BSP with PVR Graphics driver

new file mode 100644
index 0000000..b664272
@@ -0,0 +1,41 @@
+#@TYPE: Machine
+#@NAME: Cedartrail-nopvr 
+
+#@DESCRIPTION: Machine configuration for Cedartrail systems
+# i.e. Cedarview (N2600, N2800 and D2700) processor +
+# Tiger Point (Intel® NM10 Express) Chipset
+
+include conf/machine/include/tune-atom.inc
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
+                    acpi serial usbgadget alsa"
+
+KERNEL_IMAGETYPE = "bzImage"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.0%"
+
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
+PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+XSERVER ?= "xserver-xf86-dri-lite \
+           xf86-input-mouse \
+           xf86-input-keyboard \
+           xf86-input-evdev \
+           xf86-input-synaptics \
+           xf86-video-vesa"
+
+SYSLINUX_OPTS = "serial 3 115200"
+SERIAL_CONSOLE = "115200 ttyS3"
+APPEND += "console=ttyS3,115200 console=tty3"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts cedartrail-audio"
+
+IMAGE_FSTYPES ?= "ext3 cpio.gz live"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"

index 23ee0a7..21adb46 100755
@@ -2,17 +2,19 @@
 #@NAME: Cedartrail 
 
 #@DESCRIPTION: Machine configuration for Cedartrail systems
-# i.e. Cedarview processor + Tiger Point Chipset 
+# i.e. Cedarview (N2600, N2800 and D2700) processor +
+# Tiger Point (Intel® NM10 Express) Chipset
 
 include conf/machine/include/tune-atom.inc
 
 MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget"
+                   acpi serial usbgadget alsa"
 
 KERNEL_IMAGETYPE = "bzImage"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "3.0%"
+PREFERRED_VERSION_mesa-dri ?= "7.10.2"
 
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"

@@ -24,11 +26,16 @@ XSERVER ?= "xserver-xf86-dri-lite \
            xf86-input-keyboard \
            xf86-input-evdev \
            xf86-input-synaptics \
-           xf86-video-vesa"
+           mesa-dri \
+           cdv-graphics-drivers " 
 
+PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
+
+SYSLINUX_OPTS = "serial 3 115200"
 SERIAL_CONSOLE = "115200 ttyS3"
+APPEND += "console=ttyS3,115200 console=tty3"
 
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts cedartrail-audio"
 
 IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 

index cb4142d..c506c5b 100755
@@ -3,7 +3,9 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
 
 # We have a recipes directory, add to BBFILES
 BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend"
+	${LAYERDIR}/recipes-*/*/*.bbappend \ 
+        ${LAYERDIR}/../common/recipes-graphics/*/*.bb \
+        ${LAYERDIR}/../common/recipes-graphics/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "cedartrail"
 BBFILE_PATTERN_cedartrail := "^${LAYERDIR}/"

index 67cba6b..f17410c 100755
@@ -2,13 +2,17 @@ This README file contains information on building the meta-cedartrail
 BSP layer, and booting the images contained in the /binary directory.
 Please see the corresponding sections below for details.
 
+The 'Cedar Trail' platform consists of the Cedarview (Intel® Atom™
+N2600, N2800 and D2700) processor, plus the Tiger Point
+(Intel® NM10 Express) Chipset. 
+
 
 Table of Contents
 =================
 
  I. Building the meta-cedartrail BSP layer
 II. Booting the images in /binary
-
+III. Miscellaneous Notes 
 
 I. Building the meta-cedartrail BSP layer
 =========================================

@@ -24,10 +28,28 @@ bblayers.conf e.g.:
 
   yocto/meta-intel/meta-cedartrail \
 
-To enable the cedartrail layer, add the cedartrail MACHINE to local.conf:
+The meta-cedartrail layer contains support for two different machine
+configurations. These configurations are identical except for the fact
+that the one prefixed with 'cedartrail' makes use of Intel' proprietary
+PowerVR Graphics/Media drivers to enable Graphics and Media acceleration
+in the processor, while the one prefixed with 'cedartrail-nonopvr' uses
+non-accelerated graphics driver (VESA).
+
+If you want to enable the layer that supports Power VR graphics add the
+following to the local.conf file:
 
   MACHINE ?= "cedartrail"
 
+Power VR Graphics user-space driver binaries are covered by a
+"Intel Free Distribution Binary License". The build of this driver
+can be enabled by adding the following line to the local.conf file:
+ PVR_LICENSE = "yes"
+
+If you want to enable the layer that does not support Power VR graphics
+add the following to the local.conf file:
+
+ MACHINE ?= "cedartrail-nopvr"
+
 You should then be able to build a cedartrail image as such:
 
   $ source oe-init-build-env

@@ -81,3 +103,27 @@ the syslinux boot: prompt, or the boot: prompt contains strange
 characters), try doing this first:
 
 # dd if=/dev/zero of=/dev/sdf bs=1M count=512
+
+Miscellaneous Notes
+====================
+
+Video and Music Samples
+-----------------------
+This BSP includes recipes to download Ogg format video and
+music files that can be played-back with the Video and music players
+included in the sato images.  The sample files are installed in
+/home/Music and /home/Videos directories.  
+
+
+Adding Glxgears to image
+-------------------------
+Glxgears can be added to the generated image by adding "debug-tweaks"
+option to the extra image features variable in the default local.conf
+before building the BSP.
+
+e.g. to add Glxgears, locate the following line in local.conf
+EXTRA_IMAGE_FEATURES = "debug-tweaks"
+
+and change above line to..
+
+EXTRA_IMAGE_FEATURES = "debug-tweaks tools-testapps"

new file mode 100644
index 0000000..9a43f02
@@ -0,0 +1,30 @@
+SUMMARY = "Provide a basic init script to enable audio"
+DESCRIPTION = "Set the volume and unmute the Front mixer setting during boot."
+SECTION = "base"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+
+PR = "r0"
+
+inherit update-rc.d
+
+RDEPENDS = "alsa-utils-amixer"
+
+SRC_URI = "file://cedartrail-audio"
+
+INITSCRIPT_NAME = "cedartrail-audio"
+INITSCRIPT_PARAMS = "defaults 90"
+
+do_install() {
+	install -d ${D}${sysconfdir} \
+	           ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/cedartrail-audio ${D}${sysconfdir}/init.d
+        cat ${WORKDIR}/${INITSCRIPT_NAME} | \
+            sed -e 's,/etc,${sysconfdir},g' \
+                -e 's,/usr/sbin,${sbindir},g' \
+                -e 's,/var,${localstatedir},g' \
+                -e 's,/usr/bin,${bindir},g' \
+                -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
+        chmod 755 ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
+}
+

42 lines not on this page · raw message

new file mode 100644
index 0000000..da4fc3c
@@ -0,0 +1,26 @@
+Section "Device"
+    Identifier	"Generic VESA"
+    Driver	"vesa"
+EndSection
+
+Section "Monitor"
+    Identifier    "Generic Monitor"
+    Option        "DPMS"
+EndSection
+
+Section "Screen"
+    Identifier    "Default Screen"
+    Device	  "Generic VESA"
+    Monitor       "Generic Monitor"
+    DefaultDepth  24
+EndSection
+
+Section "ServerLayout"
+    Identifier     "Default Layout"
+    Screen         "Default Screen"
+EndSection
+
+Section "ServerFlags"
+    Option        "DontZap"  "0"
+    Option        "AutoAddDevices"  "False"
+EndSection

old mode 100755
new mode 100644
index da4fc3c..1d085a4
@@ -1,23 +1,15 @@
 Section "Device"
-    Identifier	"Generic VESA"
-    Driver	"vesa"
-EndSection
-
-Section "Monitor"
-    Identifier    "Generic Monitor"
-    Option        "DPMS"
-EndSection
-
-Section "Screen"
-    Identifier    "Default Screen"
-    Device	  "Generic VESA"
-    Monitor       "Generic Monitor"
-    DefaultDepth  24
+        Option     "DRIDisableVSync"    "False"
+        Identifier  "Card0"
+        Driver      "pvr"
+        BusID       "PCI:0:2:0"
+        Option      "SoftEXA"           "Off"
+        Option      "FlipChain"         "On"
 EndSection
 
 Section "ServerLayout"
-    Identifier     "Default Layout"
-    Screen         "Default Screen"
+        Identifier "default screen"
+        Option  "AIGLX" "on"
 EndSection
 
 Section "ServerFlags"

new file mode 100644
index 0000000..249246b
@@ -0,0 +1,89 @@
+SUMMARY = "Cedartrail PowerVR Graphics Driver version [Gold] 1.0 binaries"
+DESCRIPTION = "2D, 3D and Media user space driver for Cedartrail platform \
+The binaries are covered by the Intel Free Distribution Binary License. \ 
+The user must make himself/herself aware of the Licensing terms \
+before enabling build of the Cedartrail PowerVR Graphics Driver via \
+this recipe.  Please see the README in meta-cedartrail for instructions \
+for enabling the build of the driver "
+
+ 
+PR = r0
+
+S  = ${WORKDIR}/cdv-graphics-drivers_${PV}
+
+LICENSE = "Intel Free Distribution Binary License"
+LIC_FILES_CHKSUM = " \
+    file://${S}/usr/share/doc/psb-video-cdv-0.12/license.txt;md5=b14d99f8d4ed664e9ce95057f0bb5b65  \
+    file://${S}/usr/share/doc/pvr-bin-cdv-1.7.788837_05/license.txt;md5=b14d99f8d4ed664e9ce95057f0bb5b65"
+
+DEPENDS = "libva"
+
+CDR_TRAIL = "download.meego.com/live/MeeGo:/1.2.0:/CedarTrail:"
+
+SRC_URI = " \
+  http://${CDR_TRAIL}/non-oss/MeeGo_1.2.0_CedarTrail/i586/psb-video-cdv-0.12-1.1.i586.rpm;name=psb  \
+  http://${CDR_TRAIL}/non-oss/MeeGo_1.2.0_CedarTrail/i586/pvr-bin-cdv-1.7.788837_05-1.1.i586.rpm;name=pvr \
+  http://${CDR_TRAIL}/oss/standard/i586/libwsbm-cdv-1.1.0-3.1.i586.rpm;name=libwsbm \
+            "
+SRC_URI[psb.md5sum] = "d4b6b383722264f3b781aeb240c88037"
+SRC_URI[psb.sha256sum] = "e88f95fc73a79adf76ee33d3d9874cec23bb1afe8149d7dc5842d67e58da72f5"
+SRC_URI[pvr.md5sum] = "951fa9edcbc2a3ddb30450079869362e"
+SRC_URI[pvr.sha256sum] = "537dd8a98ac2e3a101063abc62682c3be8c37ac29782a876eafce113ffa5b421"
+SRC_URI[libwsbm.md5sum] = "8d90436b151ddf72f620771f2552b597"
+SRC_URI[libwsbm.sha256sum] = "82f78f47c151f0e7d567574ee372504e5b395fb13796caa765f9c30754b5bf63"
+
+do_configure () {
+
+# Extract  license files from rpms
+rpm2cpio ${WORKDIR}/psb-video-cdv-0.12-1.1.i586.rpm |cpio -ivd ./usr/share/doc/psb-video-cdv-0.12/license.txt
+rpm2cpio ${WORKDIR}/pvr-bin-cdv-1.7.788837_05-1.1.i586.rpm |cpio -ivd ./usr/share/doc/pvr-bin-cdv-1.7.788837_05/license.txt
+
+}
+
+do_install() {
+
+install -m 0644 ${WORKDIR}/psb-video-cdv-0.12-1.1.i586.rpm ${D}
+install -m 0644 ${WORKDIR}/pvr-bin-cdv-1.7.788837_05-1.1.i586.rpm ${D}
+install -m 0644 ${WORKDIR}/libwsbm-cdv-1.1.0-3.1.i586.rpm ${D}
+
+cd ${D}
+
+rpm2cpio psb-video-cdv-0.12-1.1.i586.rpm | cpio -idmv
+rpm2cpio pvr-bin-cdv-1.7.788837_05-1.1.i586.rpm | cpio -idmv
+rpm2cpio libwsbm-cdv-1.1.0-3.1.i586.rpm | cpio -idmv
+
+install -m 0755 ${D}/${libdir}/libpvr2d.so.1.7.788837  ${D}/${libdir}/libpvr2d.so
+install -m 0755 ${D}/${libdir}/libsrv_um.so.1.7.788837 ${D}/${libdir}/libsrv_um.so
+install -m 0755 ${D}/${libdir}/libegl4ogl.so.1.7.788837 ${D}/${libdir}/libegl4ogl.so
+install -m 0755 ${D}/${libdir}/libPVROGL_MESA.so.1.7.788837 ${D}/${libdir}/libPVROGL_MESA.so
+install -m 0755 ${D}/${libdir}/libIMGegl.so.1.7.788837 ${D}/${libdir}/libIMGegl.so
+install -m 0755 ${D}/${libdir}/libusc.so.1.7.788837 ${D}/${libdir}/libusc.so
+install -m 0755 ${D}/${libdir}/libOpenVG.so.1.7.788837 ${D}/${libdir}/libOpenVG.so
+
+install -m 0644 ${S}/usr/share/doc/psb-video-cdv-0.12/license.txt ${WORKDIR}/license-destdir/cdv-graphics-drivers/license.txt  
+
+rm -f *.rpm
+}
+
+FILES_${PN} += "${libdir}/pvr/cdv/lib*.so.*"
+FILES_${PN} += "${base_libdir}/firmware"
+FILES_${PN} += "${libdir}/debug/usr/bin"
+FILES_${PN} += "${libdir}/debug/usr/lib"
+FILES_${PN} += "${libdir}/lib*.so"
+
+FILES_${PN} += "${libdir}/dri/*.so"
+FILES_${PN} += "${libdir}/pvr/cdv/dri/*.so"
+FILES_${PN} += "${libdir}/xorg/modules/drivers/*.so"
+FILES_${PN} += "${libdir}/pvr/cdv/xorg/modules/drivers/*.so"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+
+addtask check_pvr_license before do_fetch
+
+python do_check_pvr_license() {
+    pn = bb.data.getVar('PN', d, 1)
+    pvr_license = bb.data.getVar('PVR_LICENSE', d, 1)
+    if not pvr_license or not pvr_license.lower() == "yes":
+        bb.debug(1, "Skipping %s because it may have a non-free license" % pn)
+        raise bb.parse.SkipPackage("because it requires PVR_LICENSE = \"yes\" in local.conf to ship")
+}

index 3978951..828e6fd 100755
@@ -2,10 +2,21 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_cedartrail = "cedartrail"
 KMACHINE_cedartrail  = "cedartrail"
 
-# The Cedarview processors have hyperthreading and includes dual-core versions
+COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail"
+KMACHINE_cedartrail-nopvr  = "cedartrail"
+KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc"
+
+COMPATIBLE_MACHINE_cedartrail = "cedartrail"
+KMACHINE_cedartrail  = "cedartrail"
 KERNEL_FEATURES_append_cedartrail += " cfg/smp.scc"
+KERNEL_FEATURES_append_cedartrail += " cfg/drm-cdvpvr.scc"
+KERNEL_FEATURES_append_cedartrail += " bsp/cedartrail/cedartrail-pvr-merge.scc"
 
 # Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_cedartrail-nopvr = "yocto/standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_cedartrail-nopvr ?= XXXX
+#SRCREV_meta_pn-linux-yocto-rt_cedartrail-nopvr ?= XXXX
+
 #KBRANCH_cedartrail  = "yocto/standard/preempt-rt/base"
 #SRCREV_machine_pn-linux-yocto-rt_cedartrail ?= XXXX
 #SRCREV_meta_pn-linux-yocto-rt_cedartrail ?= XXXX

index 858db15..14c0b9d 100755
@@ -1,10 +1,17 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail"
+KMACHINE_cedartrail-nopvr  = "yocto/standard/cedartrail"
+KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc"
+
 COMPATIBLE_MACHINE_cedartrail = "cedartrail"
 KMACHINE_cedartrail  = "yocto/standard/cedartrail"
-
-# The Cedarview processors have hyperthreading and includes dual-core versions
 KERNEL_FEATURES_append_cedartrail += " cfg/smp.scc"
+KERNEL_FEATURES_append_cedartrail += " cfg/drm-cdvpvr.scc"
+KERNEL_FEATURES_append_cedartrail += " bsp/cedartrail/cedartrail-pvr-merge.scc"
+
+SRCREV_machine_pn-linux-yocto_cedartrail ?= "5746120ee0afefd1e28400bea4b74f285bd5e59a"
+SRCREV_meta_pn-linux-yocto_cedartrail ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c"
 
-SRCREV_machine_pn-linux-yocto_cedartrail ?= "f389d310965a56091f688b28ea8be6d9cbb7fbbe"
-SRCREV_meta_pn-linux-yocto_cedartrail ?= "04a52a32cbdf0972033b97b83eaa83eb275dfdc9"
+SRCREV_machine_pn-linux-yocto_cedartrail-nopvr ?= "5746120ee0afefd1e28400bea4b74f285bd5e59a"
+SRCREV_meta_pn-linux-yocto_cedartrail-nopvr ?= "d588bdafc0d9b4d2386144b7d76a1d379e2d16c0"

new file mode 100644
index 0000000..2c1c75d
@@ -0,0 +1,59 @@
+SUMMARY = "Video Acceleration (VA) API for Linux"
+DESCRIPTION = "Video Acceleration API (VA API) is a library (libVA) \
+and API specification which enables and provides access to graphics \
+hardware (GPU) acceleration for video processing on Linux and UNIX \
+based operating systems. Accelerated processing includes video \
+decoding, video encoding, subpicture blending and rendering. The \
+specification was originally designed by Intel for its GMA (Graphics \
+Media Accelerator) series of GPU hardware, the API is however not \
+limited to GPUs or Intel specific hardware, as other hardware and \
+manufacturers can also freely use this API for hardware accelerated \
+video decoding."
+
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/vaapi"
+BUGTRACKER = "https://bugs.freedesktop.org"
+
+SECTION = "x11"
+
+INC_PR = "r1"
+
+DEPENDS = "libxext libxfixes libdrm mesa-dri"
+
+inherit autotools pkgconfig
+
+PACKAGES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl"
+PROVIDES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl"
+PACKAGES =+ "${PN}-x11-dev ${PN}-tpi-dev ${PN}-glx-dev ${PN}-egl-dev"
+PACKAGES =+ "${PN}-x11-dbg ${PN}-tpi-dbg ${PN}-glx-dbg ${PN}-egl-dbg"
+RPROVIDES_${PN}-dev =+ "${PN}-x11-dev ${PN}-tpi-dev ${PN}-glx-dev ${PN}-egl-dev"
+
+RDEPENDS_${PN}-tpi =+ "${PN}"
+RDEPENDS_${PN}-x11 =+ "${PN}"
+RDEPENDS_${PN}-glx =+ "${PN}-x11"
+RDEPENDS_${PN}-egl =+ "${PN}-x11"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug"
+FILES_${PN} += "${libdir}/dri"
+
+FILES_${PN}-x11 =+ "${libdir}/libva-x11*${SOLIBS}"
+FILES_${PN}-tpi =+ "${libdir}/libva-tpi*${SOLIBS}"
+FILES_${PN}-glx =+ "${libdir}/libva-glx*${SOLIBS}"
+FILES_${PN}-egl =+ "${libdir}/libva-egl*${SOLIBS}"
+
+FILES_${PN}-x11-dev =+ "${libdir}/libva-x11*${SOLIBSDEV}"
+FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi*${SOLIBSDEV}"
+FILES_${PN}-glx-dev =+ "${libdir}/libva-glx*${SOLIBSDEV}"
+FILES_${PN}-egl-dev =+ "${libdir}/libva-egl*${SOLIBSDEV}"
+FILES_${PN}-x11-dev =+ "${libdir}/libva-x11*.la"
+FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi*.la"
+FILES_${PN}-glx-dev =+ "${libdir}/libva-glx*.la"
+FILES_${PN}-egl-dev =+ "${libdir}/libva-egl*.la"
+FILES_${PN}-x11-dev =+ "${libdir}/pkgconfig/libva-x11*.pc"
+FILES_${PN}-tpi-dev =+ "${libdir}/pkgconfig/libva-tpi*.pc"
+FILES_${PN}-glx-dev =+ "${libdir}/pkgconfig/libva-glx*.pc"
+FILES_${PN}-egl-dev =+ "${libdir}/pkgconfig/libva-egl*.pc"
+
+FILES_${PN}-x11-dbg =+ "${libdir}/.debug/libva-x11.*"
+FILES_${PN}-tpi-dbg =+ "${libdir}/.debug/libva-tpi.*"
+FILES_${PN}-glx-dbg =+ "${libdir}/.debug/libva-glx.*"
+FILES_${PN}-egl-dbg =+ "${libdir}/.debug/libva-egl.*"

new file mode 100644
index 0000000..2800464
@@ -0,0 +1,31 @@
+require libva.inc
+
+LICENSE = "CC-BY-3.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+
+PR = R0 
+
+CDR_TRAIL = "download.meego.com/live/MeeGo:/1.2.0:/CedarTrail:"
+
+SRC_URI = " \
+    http://${CDR_TRAIL}/oss/standard/i586/libva-1.0.15-1.1.i586.rpm;name=binary  \
+    http://${CDR_TRAIL}/oss/standard/i586/libva-devel-1.0.15-1.1.i586.rpm;name=devel  \
+"
+
+SRC_URI[binary.md5sum] = "cb326945cec5ea4d1d369efc7a56e4f4"
+SRC_URI[binary.sha256sum] = "e96f44647d5e9a4e2a7c769ed24d6bc142d928041300ea3e2e76e6af2d154926"
+SRC_URI[devel.md5sum] = "799348cf8b6d239076d1b11844b94299"
+SRC_URI[devel.sha256sum] = "f1ae4028d471790a1e7d601b69106824e4628e6db380e91eaaf08fa493e1a802"
+
+do_install() {
+
+install -m 0644 ${WORKDIR}/libva-1.0.15-1.1.i586.rpm ${D}
+install -m 0644 ${WORKDIR}/libva-devel-1.0.15-1.1.i586.rpm ${D}
+
+cd ${D}
+
+rpm2cpio libva-1.0.15-1.1.i586.rpm | cpio -idmv
+rpm2cpio libva-devel-1.0.15-1.1.i586.rpm | cpio -idmv
+
+rm -f *.rpm
+}

new file mode 100644
index 0000000..5da3e10
@@ -0,0 +1,20 @@
+SUMMARY = "ogg file format music samples"
+DESCRIPTION = "Installs ogg file format music samples in /home/Music dir"
+
+LICENSE = "CC-BY-3.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+
+DEPENDS += " " 
+
+
+PR = r0
+SRC_URI = "http://downloads.yoctoproject.org/releases/media/music/ogg-CC-BY-3.0-music-samples-${PV}.tar.bz2 \
+            "
+
+do_install() {
+
+install -d ${D}${base_prefix}/home/music
+install -m 0644  ${WORKDIR}/ogg-CC-BY-3.0-music-samples-${PV}/*/*.ogg ${D}${base_prefix}/home/music
+}
+
+FILES_${PN} += "${base_prefix}/home/music/*.ogg"

new file mode 100644
index 0000000..2225af4
@@ -0,0 +1,20 @@
+SUMMARY = "Big Buck Bunny video OGG sample "
+DESCRIPTION = "Installs Big Buck Bunny Video OGG file samples in /home/video dir "
+
+LICENSE = "CC-BY-3.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+
+DEPENDS += " " 
+
+
+PR = r0
+SRC_URI = "http://blender-mirror.kino3d.org/peach/bigbuckbunny_movies/big_buck_bunny_720p_stereo.ogg \
+            "
+
+do_install() {
+
+install -d ${D}${base_prefix}/home/Videos
+install -m 0644  ${WORKDIR}/*.ogg ${D}${base_prefix}/home/Videos
+}
+
+FILES_${PN} += "${base_prefix}/home/Videos/*.ogg"

new file mode 100644
index 0000000..ffce012
@@ -0,0 +1,3 @@
+# Assume a USB mouse and keyboard are connected
+HAVE_TOUCHSCREEN=0
+HAVE_KEYBOARD=1

old mode 100755
new mode 100644

new file mode 100644
index 0000000..4022c58
@@ -0,0 +1,3 @@
+IMAGE_INSTALL += "web-webkit"
+IMAGE_INSTALL += "bigbuckbunny-ogg"
+IMAGE_INSTALL += "ogg-CC-BY-3.0-music-samples"

new file mode 100644
index 0000000..4022c58
@@ -0,0 +1,3 @@
+IMAGE_INSTALL += "web-webkit"
+IMAGE_INSTALL += "bigbuckbunny-ogg"
+IMAGE_INSTALL += "ogg-CC-BY-3.0-music-samples"

new file mode 100644
index 0000000..4022c58
@@ -0,0 +1,3 @@
+IMAGE_INSTALL += "web-webkit"
+IMAGE_INSTALL += "bigbuckbunny-ogg"
+IMAGE_INSTALL += "ogg-CC-BY-3.0-music-samples"

index 828e6fd..759c3b7 100755
@@ -1,4 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
+
 COMPATIBLE_MACHINE_cedartrail = "cedartrail"
 KMACHINE_cedartrail  = "cedartrail"
 

index 14c0b9d..0a05d8b 100755
@@ -1,5 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
+
 COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail"
 KMACHINE_cedartrail-nopvr  = "yocto/standard/cedartrail"
 KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc"

index 0a05d8b..03c5a27 100755
@@ -16,4 +16,4 @@ SRCREV_machine_pn-linux-yocto_cedartrail ?= "5746120ee0afefd1e28400bea4b74f285bd
 SRCREV_meta_pn-linux-yocto_cedartrail ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c"
 
 SRCREV_machine_pn-linux-yocto_cedartrail-nopvr ?= "5746120ee0afefd1e28400bea4b74f285bd5e59a"
-SRCREV_meta_pn-linux-yocto_cedartrail-nopvr ?= "d588bdafc0d9b4d2386144b7d76a1d379e2d16c0"
+SRCREV_meta_pn-linux-yocto_cedartrail-nopvr ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c"

index 2800464..3a4cb0c 100644
@@ -1,9 +1,9 @@
 require libva.inc
 
-LICENSE = "CC-BY-3.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-PR = R0 
+PR = "R0" 
 
 CDR_TRAIL = "download.meego.com/live/MeeGo:/1.2.0:/CedarTrail:"