summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKishore Bodke <kishore.k.bodke@intel.com>2013-02-08 22:18:58 (GMT)
committerTom Zanussi <tom.zanussi@linux.intel.com>2013-02-16 16:01:30 (GMT)
commit1d6b218a45e43441ca6299b899c4d84ec976082c (patch)
tree1152df28cfdc2e0327ccf361afd241f0d111d004
parentbfa92b97a9d8e4e19d770a87b42a59c16460c1b4 (diff)
downloadmeta-intel-1d6b218a45e43441ca6299b899c4d84ec976082c.tar.gz
cedartrail: remove BSP
Cedartrail will not be supported in the Yocto 1.4 Release. Remove it from meta-intel. Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
-rwxr-xr-xmeta-cedartrail/COPYING.MIT17
-rwxr-xr-xmeta-cedartrail/README199
-rwxr-xr-xmeta-cedartrail/README.sources17
-rw-r--r--meta-cedartrail/binary/.gitignore0
-rw-r--r--meta-cedartrail/conf/layer.conf12
-rw-r--r--meta-cedartrail/conf/machine/cedartrail-nopvr.conf21
-rw-r--r--meta-cedartrail/conf/machine/cedartrail.conf29
-rw-r--r--meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail-nopvr/machconfig3
-rw-r--r--meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail/machconfig3
-rw-r--r--meta-cedartrail/recipes-bsp/formfactor/formfactor_0.0.bbappend3
-rw-r--r--meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media-sdk.bb12
-rw-r--r--meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media.bb13
-rw-r--r--meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.3.bb197
-rw-r--r--meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf26
-rw-r--r--meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail/xorg.conf19
-rw-r--r--meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend1
-rw-r--r--meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend18
-rw-r--r--meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend23
-rw-r--r--meta-cedartrail/recipes-mediasamples/music-samples/ogg-CC-BY-3.0-music-samples_0.1.bb21
-rw-r--r--meta-cedartrail/recipes-mediasamples/video-samples/bigbuckbunny-ogg.bb22
20 files changed, 0 insertions, 656 deletions
diff --git a/meta-cedartrail/COPYING.MIT b/meta-cedartrail/COPYING.MIT
deleted file mode 100755
index fb950dc..0000000
--- a/meta-cedartrail/COPYING.MIT
+++ /dev/null
@@ -1,17 +0,0 @@
1Permission is hereby granted, free of charge, to any person obtaining a copy
2of this software and associated documentation files (the "Software"), to deal
3in the Software without restriction, including without limitation the rights
4to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
5copies of the Software, and to permit persons to whom the Software is
6furnished to do so, subject to the following conditions:
7
8The above copyright notice and this permission notice shall be included in
9all copies or substantial portions of the Software.
10
11THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
12IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
13FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
14AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
15LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
16OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
17THE SOFTWARE.
diff --git a/meta-cedartrail/README b/meta-cedartrail/README
deleted file mode 100755
index fe84c2d..0000000
--- a/meta-cedartrail/README
+++ /dev/null
@@ -1,199 +0,0 @@
1This README file contains information on building the meta-cedartrail
2BSP layer, and booting the images contained in the /binary directory.
3Please see the corresponding sections below for details.
4
5The 'Cedar Trail' platform consists of the Intel® Atom™
6N2600/N2800/D2550 processor, plus the Intel® NM10 Express Chispset
7(Cedarview + Tiger Point).
8
9It also supports on-chip SGX545 graphics and media accelerator
10via the Cedar Trail Power VR (PVR) graphics driver.
11
12Further information about the platforms supported by this BSP can be
13found here:
14
15 http://www.intel.com/p/en_US/embedded/hwsw/hardware/atom-n2000-d2000/overview
16
17Information on all Intel® embedded platforms can be found here:
18
19 http://www.intel.com/p/en_US/embedded/hwsw/hardware
20
21
22Compliance
23==========
24
25This BSP is compliant with the Yocto Project as per the requirements
26listed here:
27
28 https://www.yoctoproject.org/webform/yocto-project-compatible-registration
29
30
31Dependencies
32============
33
34This layer depends on:
35
36 URI: git://git.openembedded.org/bitbake
37 branch: master
38
39 URI: git://git.openembedded.org/openembedded-core
40 layers: meta
41 branch: master
42
43 URI: git://git.yoctoproject.org/meta-intel
44 layers: intel
45 branch: master
46
47
48Patches
49=======
50
51Please submit any patches against this BSP to the Yocto mailing list
52(yocto@yoctoproject.org) and cc: the maintainer:
53
54Maintainer: Kishore Bodke <kishore.k.bodke@intel.com>
55
56Please see the meta-intel/MAINTAINERS file for more details.
57
58Table of Contents
59=================
60
61 I. Building the meta-cedartrail BSP layer
62II. Booting the images in /binary
63
64
65I. Building the meta-cedartrail BSP layer
66=========================================
67
68In order to build an image with BSP support for a given release, you
69need to download the corresponding BSP tarball from the 'Board Support
70Package (BSP) Downloads' page of the Yocto Project website.
71
72Having done that, and assuming you extracted the BSP tarball contents
73at the top-level of your yocto build tree, you can build a cedartrail
74image by adding the location of the meta-cedartrail layer to
75bblayers.conf, along with the meta-intel layer itself (to access
76common metadata shared between BSPs) e.g.:
77
78 yocto/meta-intel \
79 yocto/meta-intel/meta-cedartrail \
80
81To enable the cedartrail layer that supports Power VR graphics,
82add the cedartrail MACHINE to local.conf:
83
84 MACHINE ?= "cedartrail"
85
86Power VR Graphics user-space driver binaries are covered by a
87"Intel Free Distribution Binary License". The build of this driver
88can be enabled by adding the following line to the local.conf file:
89
90LICENSE_FLAGS_WHITELIST += "license_cdv-pvr-driver_1.0.3"
91
92To enable the layer that does not support Power VR graphics
93add the following to the local.conf file:
94
95 MACHINE ?= "cedartrail-nopvr"
96
97
98You should then be able to build a cedartrail image as such:
99
100 $ source oe-init-build-env
101 $ bitbake core-image-sato
102
103The above image will not give you the webkit feature and will not
104have the Audio and Video media samples in the image.
105
106If you want the webkit feature and Audio , Video media samples built
107into the image by default, You should build the custom image by
108doing the following:
109
110 $ source oe-init-build-env
111 $ bitbake core-image-cdv-media
112
113At the end of a successful build, you should have a live image that
114you can boot from a USB flash drive (see instructions on how to do
115that below, in the section 'Booting the images from /binary').
116
117NOTE: The 'cedartrail' machine will include support for hardware video
118acceleration via gstreamer if and only if the "commercial" string is
119added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
120
121For example:
122
123 LICENSE_FLAGS_WHITELIST = "license_cdv-pvr-driver_1.0.3 commercial"
124
125The reason this is needed is to prevent the image from including
126anything that might violate the license terms of the packages used to
127implement the the video acceleration feature, such as gst-ffmpeg and
128ffmpeg. As always, please consult the licenses included in the
129specific packages for details if you use packages that require
130particular LICENSE_FLAGS.
131
132As an alternative to downloading the BSP tarball, you can also work
133directly from the meta-intel git repository. For each BSP in the
134'meta-intel' repository, there are multiple branches, one
135corresponding to each major release starting with 'laverne' (0.90), in
136addition to the latest code which tracks the current master. Instead
137of extracting a BSP tarball at the top level of your yocto build tree,
138you can equivalently check out the appropriate branch from the
139meta-intel repository at the same location.
140
141
142II. Booting the images in /binary
143==================================
144
145This BSP contains bootable live images, which can be used to directly
146boot Yocto off of a USB flash drive.
147
148Under Linux, insert a USB flash drive. Assuming the USB flash drive
149takes device /dev/sdf, use dd to copy the live image to it. For
150example:
151
152# dd if=core-image-sato-cedartrail-20120105232035.hddimg of=/dev/sdf
153# sync
154# eject /dev/sdf
155
156This should give you a bootable USB flash device. Insert the device
157into a bootable USB socket on the target, and power on. This should
158result in a system booted to the Sato graphical desktop.
159
160If you want a terminal, use the arrows at the top of the UI to move to
161different pages of available applications, one of which is named
162'Terminal'. Clicking that should give you a root terminal.
163
164If you want to ssh into the system, you can use the root terminal to
165ifconfig the IP address and use that to ssh in. The root password is
166empty, so to log in type 'root' for the user name and hit 'Enter' at
167the Password prompt: and you should be in.
168
169----
170
171If you find you're getting corrupt images on the USB (it doesn't show
172the syslinux boot: prompt, or the boot: prompt contains strange
173characters), try doing this first:
174
175# dd if=/dev/zero of=/dev/sdf bs=1M count=512
176
177Miscellaneous Notes
178====================
179
180Video and Music Samples
181-----------------------
182This BSP includes recipes to download Ogg format video and
183music files that can be played-back with the Video and music players
184included in the sato images. The sample files are installed in
185/home/Music and /home/Videos directories.
186
187
188Adding Glxgears to image
189-------------------------
190Glxgears can be added to the generated image by adding "tools-testapps"
191option to the extra image features variable in the default local.conf
192before building the BSP.
193
194e.g. to add Glxgears, locate the following line in local.conf
195EXTRA_IMAGE_FEATURES = "debug-tweaks"
196
197and change above line to..
198
199EXTRA_IMAGE_FEATURES = "debug-tweaks tools-testapps"
diff --git a/meta-cedartrail/README.sources b/meta-cedartrail/README.sources
deleted file mode 100755
index 0d4d849..0000000
--- a/meta-cedartrail/README.sources
+++ /dev/null
@@ -1,17 +0,0 @@
1The sources for the packages comprising the images shipped with this
2BSP can be found at the following location:
3
4http://downloads.yoctoproject.org/mirror/sources/
5
6The metadata used to generate the images shipped with this BSP, in
7addition to the code contained in this BSP, can be found at the
8following location:
9
10http://downloads.yoctoproject.org/releases/yocto/yocto-1.3/poky-danny-8.0.tar.bz2
11
12The metadata used to generate the images shipped with this BSP, in
13addition to the code contained in this BSP, can also be found at the
14following locations:
15
16git://git.yoctoproject.org/poky.git
17git://git.yoctoproject.org/meta-intel
diff --git a/meta-cedartrail/binary/.gitignore b/meta-cedartrail/binary/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/meta-cedartrail/binary/.gitignore
+++ /dev/null
diff --git a/meta-cedartrail/conf/layer.conf b/meta-cedartrail/conf/layer.conf
deleted file mode 100644
index 0166b35..0000000
--- a/meta-cedartrail/conf/layer.conf
+++ /dev/null
@@ -1,12 +0,0 @@
1# We have a conf and classes directory, add to BBPATH
2BBPATH .= ":${LAYERDIR}"
3
4# We have a recipes directory, add to BBFILES
5BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
6 ${LAYERDIR}/recipes-*/*/*.bbappend"
7
8BBFILE_COLLECTIONS += "cedartrail"
9BBFILE_PATTERN_cedartrail := "^${LAYERDIR}/"
10BBFILE_PRIORITY_cedartrail = "6"
11
12LAYERDEPENDS_cedartrail = "intel"
diff --git a/meta-cedartrail/conf/machine/cedartrail-nopvr.conf b/meta-cedartrail/conf/machine/cedartrail-nopvr.conf
deleted file mode 100644
index 7ccc6e1..0000000
--- a/meta-cedartrail/conf/machine/cedartrail-nopvr.conf
+++ /dev/null
@@ -1,21 +0,0 @@
1#@TYPE: Machine
2#@NAME: cedartrail-nopvr
3
4#@WEBTITLE: Intel Atom N2600/N2800/D2550 (Formerly Cedarview) Processor with NM10 Chipset (Cedar Trail Platform) with Open Source VESA Graphics
5
6#@DESCRIPTION: Machine configuration for Cedar Trail systems
7# i.e. N2600/N2800/D2550 + NM10
8
9require conf/machine/include/tune-atom.inc
10require conf/machine/include/ia32-base.inc
11
12XSERVER ?= "${XSERVER_IA32_BASE} \
13 ${XSERVER_IA32_EXT} \
14 ${XSERVER_IA32_VESA} \
15 "
16
17SYSLINUX_OPTS = "serial 0 115200"
18SERIAL_CONSOLE = "115200 ttyS0"
19APPEND += "console=ttyS0,115200 console=tty0"
20APPEND += "video=vesafb vga=0x318"
21
diff --git a/meta-cedartrail/conf/machine/cedartrail.conf b/meta-cedartrail/conf/machine/cedartrail.conf
deleted file mode 100644
index a5fa0f0..0000000
--- a/meta-cedartrail/conf/machine/cedartrail.conf
+++ /dev/null
@@ -1,29 +0,0 @@
1#@TYPE: Machine
2#@NAME: cedartrail
3
4#@WEBTITLE: Intel Atom N2600/N2800/D2550 (Formerly Cedarview) Processor with NM10 Chipset (Cedar Trail Platform) and PVR Accelerated Graphics
5
6#@DESCRIPTION: Machine configuration for Cedar Trail systems
7# i.e. N2600/N2800/D2550 + NM10
8
9require conf/machine/include/tune-atom.inc
10require conf/machine/include/ia32-base.inc
11
12MACHINE_FEATURES += "pcbios efi va-impl-intel"
13
14XSERVER ?= "${XSERVER_IA32_BASE} \
15 ${XSERVER_IA32_EXT} \
16 cdv-pvr-driver \
17 "
18PREFERRED_VERSION_linux-yocto ?= "3.0%"
19PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
20PREFERRED_VERSION_mesa-dri ?= "8.0.4"
21PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
22
23SYSLINUX_OPTS = "serial 0 115200"
24SERIAL_CONSOLE = "115200 ttyS0"
25APPEND += "console=ttyS0,115200 console=tty0"
26
27VA_FEATURES ?= "gst-va-intel va-intel"
28
29MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"
diff --git a/meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail-nopvr/machconfig b/meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail-nopvr/machconfig
deleted file mode 100644
index ffce012..0000000
--- a/meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail-nopvr/machconfig
+++ /dev/null
@@ -1,3 +0,0 @@
1# Assume a USB mouse and keyboard are connected
2HAVE_TOUCHSCREEN=0
3HAVE_KEYBOARD=1
diff --git a/meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail/machconfig b/meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail/machconfig
deleted file mode 100644
index ffce012..0000000
--- a/meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail/machconfig
+++ /dev/null
@@ -1,3 +0,0 @@
1# Assume a USB mouse and keyboard are connected
2HAVE_TOUCHSCREEN=0
3HAVE_KEYBOARD=1
diff --git a/meta-cedartrail/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-cedartrail/recipes-bsp/formfactor/formfactor_0.0.bbappend
deleted file mode 100644
index 2a3ee7a..0000000
--- a/meta-cedartrail/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3PRINC := "${@int(PRINC) + 2}"
diff --git a/meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media-sdk.bb b/meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media-sdk.bb
deleted file mode 100644
index 364d7b7..0000000
--- a/meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media-sdk.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1#
2# Copyright (C) 2011 Intel Corporation.
3# Author: Kishore Bodke
4# kishore.k.bodke@intel.com
5
6require recipes-sato/images/core-image-sato-sdk.bb
7
8IMAGE_INSTALL += "web-webkit bigbuckbunny-ogg ogg-CC-BY-3.0-music-samples"
9
10LICENSE = "MIT"
11
12PR = "r0"
diff --git a/meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media.bb b/meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media.bb
deleted file mode 100644
index a13ea09..0000000
--- a/meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1#
2# Copyright (C) 2011 Intel Corporation.
3# Author: Kishore Bodke
4# kishore.k.bodke@intel.com
5#
6
7require recipes-sato/images/core-image-sato.bb
8
9IMAGE_INSTALL += "web-webkit bigbuckbunny-ogg ogg-CC-BY-3.0-music-samples"
10
11LICENSE = "MIT"
12
13PR = "r0"
diff --git a/meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.3.bb b/meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.3.bb
deleted file mode 100644
index ebb5891..0000000
--- a/meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.3.bb
+++ /dev/null
@@ -1,197 +0,0 @@
1SUMMARY = "Cedartrail PowerVR Graphics Driver version 1.0.3 binaries"
2DESCRIPTION = "2D, 3D and Media user space driver for Cedartrail platform \
3The binaries are covered by the Intel Free Distribution Binary License. \
4The user must make himself/herself aware of the Licensing terms \
5before enabling build of the Cedartrail PowerVR Graphics Driver via \
6this recipe. Please see the README in meta-cedartrail for instructions \
7for enabling the build of the driver "
8
9LICENSE_FLAGS = "license_${PN}_${PV}"
10LICENSE = "Intel Free Distribution Binary License"
11LIC_FILES_CHKSUM = " \
12 file://${S}/usr/share/doc/psb-video-cdv-${PSB-VIDEO-REV}/license.txt;md5=b14d99f8d4ed664e9ce95057f0bb5b65 \
13 file://${S}/usr/share/doc/pvr-bin-cdv-${PVR-BIN-REV_LIC}/license.txt;md5=b14d99f8d4ed664e9ce95057f0bb5b65"
14
15DEPENDS = "rpm-native libva"
16
17PR = "r5"
18
19PSB-VIDEO = "psb-video-cdv-1.0.3-1.1.i586.rpm"
20PSB-VIDEO-REV = "1.0.3"
21
22PVR-BIN = "pvr-bin-cdv-1.0.3-1.1.i586.rpm"
23PVR-BIN-REV = "1.7.862890"
24PVR-BIN-REV_N = "1.7.862890_05"
25PVR-BIN-REV_LIC = "1.0.3"
26PVR-BIN-DEV = "pvr-bin-cdv-devel-1.0.3-1.1.i586.rpm"
27
28LIBWSBM = "libwsbm-cdv-1.1.0-3.1.i586.rpm"
29LIBWSBM-DEV = "libwsbm-cdv-devel-1.1.0-3.1.i586.rpm"
30
31
32NON-OSS-PATH = "http://repo.meego.com/MeeGo/updates/1.2.0/repos/non-oss/ia32/packages/"
33OSS-PATH = "http://repo.meego.com/MeeGo/updates/1.2.0/repos/oss/ia32/packages/"
34
35
36SRC_URI = "${NON-OSS-PATH}${PSB-VIDEO};name=psbrpm;unpack=0 \
37 ${NON-OSS-PATH}${PVR-BIN};name=pvrrpm;unpack=0 \
38 ${NON-OSS-PATH}${PVR-BIN-DEV};name=pvrrpmdev;unpack=0 \
39 ${OSS-PATH}${LIBWSBM};name=wsbmrpm;unpack=0 \
40 ${OSS-PATH}${LIBWSBM-DEV};name=wsbmrpmdev;unpack=0 \
41 "
42SRC_URI[pvrrpm.md5sum] = "3ae7db98825af642445f75f4b5ddb303"
43SRC_URI[pvrrpm.sha256sum] = "42b97e5d663444f35b1ee51cdf9573e3b1d5a4f49ae854218c5c4c9a66ba95cf"
44
45SRC_URI[pvrrpmdev.md5sum] = "e8f0815b5bbf94311a7cf229451f651f"
46SRC_URI[pvrrpmdev.sha256sum] = "facb67f6b8413504e7ba570a4e3e3ee20cb90d7bd02b303653f9ce5cc4fd7b20"
47
48SRC_URI[psbrpm.md5sum] = "ec486193dc4b3f91bc7c5e18d9ca9d8a"
49SRC_URI[psbrpm.sha256sum] = "0861d69b44d5ce29a3f778ac82976a22f7726af84d9b2e5438c18da5263ffdac"
50
51SRC_URI[wsbmrpm.md5sum] = "b8b21ca8325abd7850d197f9bf3071c7"
52SRC_URI[wsbmrpm.sha256sum] = "f436386967c1adec5211e662251bd542bbe0b8cd55e1d9f9c203da5ee934d4f0"
53
54SRC_URI[wsbmrpmdev.md5sum] = "895d0cafd878fcbe4e2f845b8e09eea3"
55SRC_URI[wsbmrpmdev.sha256sum] = "605ba605a2617ee67863d5becac114ce7f4ea440854543f75465e16f463bad70"
56
57
58# make sure generated rpm packages get non conflicting names
59PKG_${PN} = "cdv-pvr-driver"
60PKG_${PN}-dev = "cdv-pvr-driver-dev"
61PKG_${PN}-dbg = "cdv-pvr-driver-dbg"
62PKG_${PN}-doc = "cdv-pvr-driver-doc"
63
64S = "${WORKDIR}/cdv-graphics-drivers_${PV}"
65
66# These are closed binaries generated elsewhere so don't check ldflags
67INSANE_SKIP_${PN} = "ldflags"
68
69# Don't try stripping, as the binaries are already stripped
70INHIBIT_PACKAGE_STRIP = "1"
71
72# .so files in these binaries are not symlinks. Rearange package order
73# so that they go to ${PN} instead of $PN}-dev
74PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN} ${PN}-dev ${PN}-doc ${PN}-locale"
75
76
77FILES_${PN} += "${libdir}/dri ${libdir}/pvr/cdv/dri ${libdir}/pvr/cdv ${libdir}/xorg/modules/drivers"
78
79FILES_${PN} += "${base_libdir}/firmware"
80FILES_${PN} += "${sysconfdir}/X11/xorg.conf.d"
81
82FILES_${PN} += "${libdir}/lib*.so"
83
84FILES_${PN} += "${libdir}/pvr/cdv/xorg/modules/drivers"
85
86FILES_${PN} += "${datadir}/doc/psb-video-cdv-${PSB-VIDEO-REV}/license.txt"
87FILES_${PN} += "${datadir}/doc/pvr-bin-cdv-${PVR-BIN-REV_LIC}/license.txt"
88
89RDEPENDS_${PN} = "xserver-xorg-module-exa"
90
91# Add the ABI dependency at package generation time, as otherwise bitbake will
92# attempt to find a provider for it (and fail) when it does the parse.
93#
94# This version *must* be kept correct.
95python populate_packages_prepend() {
96 pn = d.getVar("PN", True)
97 d.appendVar("RDEPENDS_" + pn, " xorg-abi-video-8")
98}
99
100TARGET_CC_ARCH += "${CFLAGS}{LDFLAGS}"
101INSANE_SKIP_${PN} += "ldflags"
102INSANE_SKIP_${PN}-dbg += "ldflags"
103
104do_configure () {
105
106# Extract license files from rpms
107rpm2cpio.sh ${WORKDIR}/${PSB-VIDEO} |cpio -ivd ./usr/share/doc/psb-video-cdv-${PSB-VIDEO-REV}/license.txt
108rpm2cpio.sh ${WORKDIR}/${PVR-BIN} |cpio -ivd ./usr/share/doc/pvr-bin-cdv-${PVR-BIN-REV_LIC}/license.txt
109
110}
111
112do_install() {
113
114 mv ${WORKDIR}/*.rpm ${S}
115
116 rpm2cpio.sh ${S}/${LIBWSBM} | cpio -id
117
118 install -d -m 0755 ${D}${libdir}/dri
119
120 install -m 0755 ${S}/usr/lib/* ${D}${libdir}/
121
122 rpm2cpio.sh ${S}/${PSB-VIDEO} | cpio -id
123
124 install -d -m 0755 ${D}${base_libdir}/firmware
125
126 install -m 0755 ${S}/usr/lib/dri/* ${D}${libdir}/dri/
127
128 install -m 0755 ${S}/lib/firmware/* ${D}${base_libdir}/firmware
129
130 rpm2cpio.sh ${S}/${PVR-BIN} | cpio -id
131
132 install -d -m 0755 ${D}${libdir}/pvr/cdv/dri
133
134 install -m 0755 ${S}/usr/lib/pvr/cdv/dri/* ${D}${libdir}/pvr/cdv/dri
135
136 install -d -m 0755 ${D}${sysconfdir}/X11/xorg.conf.d
137 install -m 0755 ${S}/etc/powervr.ini ${D}${sysconfdir}/
138 install -m 0755 ${S}/etc/X11/xorg.conf.d/* ${D}${sysconfdir}/X11/xorg.conf.d/
139 install -m 0755 ${S}/usr/lib/dri/pvr_dri.so ${D}${libdir}/dri/
140 install -m 0755 ${S}/usr/lib/*.so.* ${D}${libdir}/
141
142
143 install -m 0755 ${S}/usr/lib/libegl4ogl.so.${PVR-BIN-REV} ${D}${libdir}/libegl4ogl.so
144 install -m 0755 ${S}/usr/lib/libEGL.so.${PVR-BIN-REV} ${D}${libdir}/libEGL.so
145 install -m 0755 ${S}/usr/lib/libGLES_CM.so.${PVR-BIN-REV} ${D}${libdir}/libGLES_CM.so
146 install -m 0755 ${S}/usr/lib/libGLES_CM.so.${PVR-BIN-REV} ${D}${libdir}/libGLESv1_CM.so
147 install -m 0755 ${S}/usr/lib/libGLESv2.so.${PVR-BIN-REV} ${D}${libdir}/libGLESv2.so
148 install -m 0755 ${S}/usr/lib/libglslcompiler.so.${PVR-BIN-REV} ${D}${libdir}/libglslcompiler.so
149 install -m 0755 ${S}/usr/lib/libIMGegl.so.${PVR-BIN-REV} ${D}${libdir}/libIMGegl.so
150 install -m 0755 ${S}/usr/lib/libOpenVG.so.${PVR-BIN-REV} ${D}${libdir}/libOpenVG.so
151 install -m 0755 ${S}/usr/lib/libOpenVGU.so.${PVR-BIN-REV} ${D}${libdir}/libOpenVGU.so
152 install -m 0755 ${S}/usr/lib/libpvr2d.so.${PVR-BIN-REV} ${D}${libdir}/libpvr2d.so
153 install -m 0755 ${S}/usr/lib/libPVROGL_MESA.so.${PVR-BIN-REV} ${D}${libdir}/libPVROGL_MESA.so
154 install -m 0755 ${S}/usr/lib/libpvrPVR2D_BLITWSEGL.so.${PVR-BIN-REV} ${D}${libdir}/libpvrPVR2D_BLITWSEGL.so
155 install -m 0755 ${S}/usr/lib/libpvrPVR2D_DRIWSEGL.so.${PVR-BIN-REV} ${D}${libdir}/libpvrPVR2D_DRIWSEGL.so
156 install -m 0755 ${S}/usr/lib/libpvrPVR2D_FLIPWSEGL.so.${PVR-BIN-REV} ${D}${libdir}/libpvrPVR2D_FLIPWSEGL.so
157 install -m 0755 ${S}/usr/lib/libpvrPVR2D_LINUXFBWSEGL.so.${PVR-BIN-REV} ${D}${libdir}/libpvrPVR2D_LINUXFBWSEGL.so
158 install -m 0755 ${S}/usr/lib/libPVRScopeServices.so.${PVR-BIN-REV} ${D}${libdir}/libPVRScopeServices.so
159 install -m 0755 ${S}/usr/lib/libsrv_init.so.${PVR-BIN-REV} ${D}${libdir}/libsrv_init.so
160 install -m 0755 ${S}/usr/lib/libsrv_um.so.${PVR-BIN-REV} ${D}${libdir}/libsrv_um.so
161 install -m 0755 ${S}/usr/lib/libusc.so.${PVR-BIN-REV} ${D}${libdir}/libusc.so
162
163 install -m 0755 ${S}/usr/lib/pvr/cdv/*.so.* ${D}${libdir}/pvr/cdv/
164
165 install -d -m 0755 ${D}${libdir}/pvr/cdv/xorg/modules/drivers
166 install -m 0755 ${S}/usr/lib/pvr/cdv/xorg/modules/drivers/* ${D}${libdir}/pvr/cdv/xorg/modules/drivers/
167
168 install -d -m 0755 ${D}${libdir}/xorg/modules/drivers
169
170 install -m 0755 ${S}/usr/lib/xorg/modules/drivers/* ${D}${libdir}/xorg/modules/drivers/
171
172 install -d -m 0755 ${D}${datadir}/doc/psb-video-cdv-${PSB-VIDEO-REV}
173 install -d -m 0755 ${D}${datadir}/doc/pvr-bin-cdv-${PVR-BIN-REV_N}
174
175 rpm2cpio.sh ${S}/${PVR-BIN-DEV} | cpio -id
176 install -d -m 0644 ${D}${includedir}
177 install -d -m 0644 ${D}${includedir}/GLES
178 install -d -m 0644 ${D}${includedir}/VG
179 install -d -m 0644 ${D}${includedir}/GLES2
180 install -d -m 0644 ${D}${includedir}/KHR
181 install -d -m 0644 ${D}${includedir}/EGL
182
183 install -m 0644 ${S}/${includedir}/GLES/*.h ${D}${includedir}/GLES
184 install -m 0644 ${S}/${includedir}/VG/*.h ${D}${includedir}/VG
185 install -m 0644 ${S}/${includedir}/GLES2/*.h ${D}${includedir}/GLES2
186 install -m 0644 ${S}/${includedir}/KHR/*.h ${D}${includedir}/KHR
187 install -m 0644 ${S}/${includedir}/EGL/*.h ${D}${includedir}/EGL
188
189 rpm2cpio.sh ${S}/${LIBWSBM-DEV} | cpio -id
190 install -d -m 0644 ${D}${includedir}/wsbm
191
192 install -m 0644 ${S}/${includedir}/wsbm/*.h ${D}${includedir}/wsbm
193 install -m 0644 ${S}/${libdir}/libwsbm.so ${D}${libdir}/libwsbm.so
194
195 install -m 0755 ${S}/usr/share/doc/psb-video-cdv-${PSB-VIDEO-REV}/license.txt ${D}${datadir}/doc/psb-video-cdv-${PSB-VIDEO-REV}/license.txt
196
197}
diff --git a/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf b/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf
deleted file mode 100644
index da4fc3c..0000000
--- a/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf
+++ /dev/null
@@ -1,26 +0,0 @@
1Section "Device"
2 Identifier "Generic VESA"
3 Driver "vesa"
4EndSection
5
6Section "Monitor"
7 Identifier "Generic Monitor"
8 Option "DPMS"
9EndSection
10
11Section "Screen"
12 Identifier "Default Screen"
13 Device "Generic VESA"
14 Monitor "Generic Monitor"
15 DefaultDepth 24
16EndSection
17
18Section "ServerLayout"
19 Identifier "Default Layout"
20 Screen "Default Screen"
21EndSection
22
23Section "ServerFlags"
24 Option "DontZap" "0"
25 Option "AutoAddDevices" "False"
26EndSection
diff --git a/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail/xorg.conf b/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail/xorg.conf
deleted file mode 100644
index d7c6a59..0000000
--- a/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail/xorg.conf
+++ /dev/null
@@ -1,19 +0,0 @@
1Section "Device"
2 Option "DRIDisableVSync" "False"
3 Identifier "Card0"
4 Driver "pvr"
5 BusID "PCI:0:2:0"
6 Option "SoftEXA" "Off"
7 Option "FlipChain" "On"
8EndSection
9
10Section "ServerLayout"
11 Identifier "default screen"
12 Option "AIGLX" "on"
13EndSection
14
15Section "ServerFlags"
16 Option "DontZap" "0"
17 Option "AutoAddDevices" "False"
18EndSection
19
diff --git a/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ /dev/null
@@ -1 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
deleted file mode 100644
index 2248c88..0000000
--- a/meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
+++ /dev/null
@@ -1,18 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2COMPATIBLE_MACHINE_cedartrail = "cedartrail"
3KMACHINE_cedartrail = "cedartrail"
4
5KERNEL_FEATURES_append_cedartrail += " cfg/smp.scc"
6KERNEL_FEATURES_append_cedartrail += " cfg/drm-cdvpvr.scc"
7KERNEL_FEATURES_append_cedartrail += " bsp/cedartrail/cedartrail-pvr-merge.scc"
8KERNEL_FEATURES_append_cedartrail += " cfg/efi-ext.scc"
9
10COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail"
11KMACHINE_cedartrail-nopvr = "cedartrail"
12KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc"
13
14
15# Update the following to use a different BSP branch or meta SRCREV
16#KBRANCH_cedartrail = "yocto/standard/preempt-rt/base"
17#SRCREV_machine_pn-linux-yocto-rt_cedartrail ?= XXXX
18#SRCREV_meta_pn-linux-yocto-rt_cedartrail ?= XXXX
diff --git a/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend
deleted file mode 100644
index 440cd77..0000000
--- a/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ /dev/null
@@ -1,23 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3SRC_URI_cedartrail = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;bareclone=1;branch=${KBRANCH},meta,yocto/pvr;name=machine,meta,pvr"
4
5SRC_URI_cedartrail-nopvr = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
6
7COMPATIBLE_MACHINE_cedartrail = "cedartrail"
8KMACHINE_cedartrail = "cedartrail"
9KBRANCH_cedartrail = "yocto/standard/cedartrail"
10KERNEL_FEATURES_append_cedartrail += "bsp/cedartrail/cedartrail-pvr-merge.scc"
11KERNEL_FEATURES_append_cedartrail += "cfg/efi-ext.scc"
12
13COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail"
14KMACHINE_cedartrail-nopvr = "cedartrail"
15KBRANCH_cedartrail-nopvr = "yocto/standard/cedartrail"
16KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc"
17
18SRCREV_machine_pn-linux-yocto_cedartrail ?= "${AUTOREV}"
19SRCREV_meta_pn-linux-yocto_cedartrail ?= "${AUTOREV}"
20SRCREV_pvr_pn-linux-yocto_cedartrail ?= "${AUTOREV}"
21
22SRCREV_machine_pn-linux-yocto_cedartrail-nopvr ?= "${AUTOREV}"
23SRCREV_meta_pn-linux-yocto_cedartrail-nopvr ?= "${AUTOREV}"
diff --git a/meta-cedartrail/recipes-mediasamples/music-samples/ogg-CC-BY-3.0-music-samples_0.1.bb b/meta-cedartrail/recipes-mediasamples/music-samples/ogg-CC-BY-3.0-music-samples_0.1.bb
deleted file mode 100644
index 796cd61..0000000
--- a/meta-cedartrail/recipes-mediasamples/music-samples/ogg-CC-BY-3.0-music-samples_0.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1SUMMARY = "ogg file format music samples"
2DESCRIPTION = "Installs ogg file format music samples in /home/Music dir"
3
4LICENSE = "CC-BY-3.0"
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
6
7PR = "r0"
8
9SRC_URI = "http://downloads.yoctoproject.org/releases/media/music/ogg-CC-BY-3.0-music-samples-${PV}.tar.bz2 \
10 "
11
12SRC_URI[md5sum] = "dc3dd4adca69996edaffe8828e1ee165"
13SRC_URI[sha256sum] = "86381f8474d5ac2c80f54c951a8c22f67d352daa977341d3dfb4161e39ca3975"
14
15do_install() {
16
17install -d ${D}${base_prefix}/home/music
18install -m 0644 ${WORKDIR}/ogg-CC-BY-3.0-music-samples-${PV}/*/*.ogg ${D}${base_prefix}/home/music
19}
20
21FILES_${PN} += "${base_prefix}/home/music/*.ogg"
diff --git a/meta-cedartrail/recipes-mediasamples/video-samples/bigbuckbunny-ogg.bb b/meta-cedartrail/recipes-mediasamples/video-samples/bigbuckbunny-ogg.bb
deleted file mode 100644
index 3b658e0..0000000
--- a/meta-cedartrail/recipes-mediasamples/video-samples/bigbuckbunny-ogg.bb
+++ /dev/null
@@ -1,22 +0,0 @@
1SUMMARY = "Big Buck Bunny video OGG sample "
2DESCRIPTION = "Installs Big Buck Bunny Video OGG file samples in /home/video dir "
3
4LICENSE = "CC-BY-3.0"
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
6
7PR = "r0"
8
9SRC_URI = "http://blender-mirror.kino3d.org/peach/bigbuckbunny_movies/big_buck_bunny_720p_stereo.ogg \
10 "
11
12
13SRC_URI[md5sum] = "576424c653da53e31b86c027e55758ae"
14SRC_URI[sha256sum] = "785b09a585be55f81326a3fcef2cdeeb7ebbc33932b6305fd84209928df67f28"
15
16do_install() {
17
18install -d ${D}${base_prefix}/home/Videos
19install -m 0644 ${WORKDIR}/*.ogg ${D}${base_prefix}/home/Videos
20}
21
22FILES_${PN} += "${base_prefix}/home/Videos/*.ogg"