diff options
| author | Beth Flanagan <elizabeth.flanagan@intel.com> | 2011-02-24 14:34:59 -0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2011-03-01 11:46:41 +0000 |
| commit | 926560497bef54a06a39850fcf551c5c1bba9bfc (patch) | |
| tree | 178c897ca39685d456b0b0fd1c1ae62885087dfa | |
| parent | 9f9e981ca20fe341a27765390fa723295b74a389 (diff) | |
| download | openembedded-core-926560497bef54a06a39850fcf551c5c1bba9bfc.tar.gz openembedded-core-926560497bef54a06a39850fcf551c5c1bba9bfc.tar.bz2 openembedded-core-926560497bef54a06a39850fcf551c5c1bba9bfc.zip | |
Emenlow Removal from Poky Core: meta-emenlow
Removing Emenlow from poky core as it is now in meta-intel as a BSP layer
[BUGID #769]
Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
67 files changed, 2 insertions, 9380 deletions
diff --git a/meta-emenlow/COPYING.MIT b/meta-emenlow/COPYING.MIT deleted file mode 100644 index fb950dc69f..0000000000 --- a/meta-emenlow/COPYING.MIT +++ /dev/null @@ -1,17 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/meta-emenlow/README b/meta-emenlow/README deleted file mode 100644 index 862af5481b..0000000000 --- a/meta-emenlow/README +++ /dev/null @@ -1,78 +0,0 @@ -This README file contains information on building the meta-emenlow -BSP layer using any of the supported machine configurations, and -booting the images contained in the /binary directory. - -If you're only interested in booting the images in the /binary -directory of a BSP tarball you've downloaded, there's nothing special -to do - the appropriate images are already in the /binary directory -depending on which BSP tarball you downloaded. - -Please see the corresponding sections below for details. - - -Table of Contents -================= - - I. Building the meta-emenlow BSP layer -II. Booting the images in /binary - - -I. Building the meta-emenlow BSP layer -======================================= - -In order to build an image with BSP support for emenlow, you just need -to check out the poky master branch. - -Having done that, you can build an emenlow image by adding the -location of the meta-emenlow layer to bblayers.conf e.g.: - - yocto/meta-emenlow \ - -To enable the emenlow layer, add the emenlow MACHINE to local.conf: - - MACHINE ?= "emenlow" - -You should then be able to build an emenlow image as such: - - $ source poky-init-build-env - $ bitbake poky-image-sato-live - -At the end of a successful build, you should have a live image that -you can boot from a USB flash drive (see instructions on how to do -that below, in the section 'Booting the images from /binary'). - - -II. Booting the images in /binary -================================= - -This BSP contains bootable live images, which can be used to directly -boot Yocto off of a USB flash drive. - -Under Linux, insert a USB flash drive. Assuming the USB flash drive -takes device /dev/sdf, use dd to copy the live image to it. For -example: - -# dd if=poky-image-sato-live-emenlow-20101207053738.hddimg of=/dev/sdf -# sync -# eject /dev/sdf - -This should give you a bootable USB flash device. Insert the device -into a bootable USB socket on the target, and power on. This should -result in a system booted to the Sato graphical desktop. - -If you want a terminal, use the arrows at the top of the UI to move to -different pages of available applications, one of which is named -'Terminal'. Clicking that should give you a root terminal. - -If you want to ssh into the system, you can use the root terminal to -ifconfig the IP address and use that to ssh in. The root password is -empty, so to log in type 'root' for the user name and hit 'Enter' at -the Password prompt: and you should be in. - ----- - -If you find you're getting corrupt images on the USB (it doesn't show -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 diff --git a/meta-emenlow/binary/.gitignore b/meta-emenlow/binary/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 --- a/meta-emenlow/binary/.gitignore +++ /dev/null diff --git a/meta-emenlow/conf/checksums.ini b/meta-emenlow/conf/checksums.ini deleted file mode 100644 index e6fc77fb78..0000000000 --- a/meta-emenlow/conf/checksums.ini +++ /dev/null @@ -1,23 +0,0 @@ -[https://launchpad.net/~gma500/+archive/ppa/+files/libdrm-poulsbo_2.3.0-1ubuntu0sarvatt4~1004um1ubuntu1.tar.gz] -md5=82c00bb9f1239f1d00b18411b89c2380 -sha256=335d4ac6694687475efe07b44a2d77a9a9fadcbc16946d01ea8a02339ae7d9ec - -[https://launchpad.net/~gma500/+archive/ppa/+files/libva_0.31.0-1+sds9.1ubuntu1.tar.gz] -md5=860f13e5a9d09511d7c6807b880e758b -sha256=306468f87b9e13fdb3b6f0c6e2159b20198b33eed9eda4c31d7381a88911554f - -[https://launchpad.net/~gma500/+archive/ppa/+files/psb-firmware_0.30-0ubuntu1netbook1ubuntu1.tar.gz] -md5=760005739edc64387240e56f6916e825 -sha256=714bc9162409b172caaabdaff5a942bc9d104a9b3a47a165754f7090803ba4b3 - -[https://launchpad.net/~gma500/+archive/ppa/+files/psb-kernel-source_4.42.0-0ubuntu2~1004um2.tar.gz] -md5=4f079e4f880bd45b281f5f3c017e8afa -sha256=91ac0646ab02423a91b0a6027ffa1b0dbf1082588c03a3f7e4302c37c155f3fd - -[https://launchpad.net/~gma500/+archive/ppa/+files/xpsb-glx_0.18-0ubuntu1netbook2~1004um1ubuntu1.tar.gz] -md5=50423a9e861ccff5814eb95a32494952 -sha256=03c958defef56ae0ec051c6f67620fa90733649925386824b7bf029f40bd7905 - -[https://launchpad.net/~gma500/+archive/ppa/+files/xserver-xorg-video-psb_0.36.0-0ubuntu3~1004um9.tar.gz] -md5=67bd808960db4fe9b3a7ff2582da1608 -sha256=deeaf6e4d059e709d8a4268bd013a172f7fbd70778236d7d1e2712d1951de72c diff --git a/meta-emenlow/conf/layer.conf b/meta-emenlow/conf/layer.conf deleted file mode 100644 index 563b9c8e6e..0000000000 --- a/meta-emenlow/conf/layer.conf +++ /dev/null @@ -1,10 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" - -# We have a packages directory, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_COLLECTIONS += "emenlow" -BBFILE_PATTERN_emenlow := "^${LAYERDIR}/" -BBFILE_PRIORITY_emenlow = "6" diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf deleted file mode 100644 index faedfe541c..0000000000 --- a/meta-emenlow/conf/machine/emenlow.conf +++ /dev/null @@ -1,48 +0,0 @@ -#@TYPE: Machine -#@NAME: emenlow - -#@DESCRIPTION: Machine configuration for eMenlow based systems, like the -# Webs-2120 box. - -TARGET_ARCH = "i586" -PACKAGE_EXTRA_ARCHS = "x86 core2" - -include conf/machine/include/tune-atom.inc - -BASE_PACKAGE_ARCH="core2" - -MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ - acpi serial usbgadget" - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-stable" -#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" -PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo" -PREFERRED_PROVIDER_drm = "libdrm-poulsbo" -PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim" -PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx" -PREFERRED_PROVIDER_virtual/xserver = "xserver-psb" -PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb" -PREFERRED_PROVIDER_xserver-xf86-dri-lite = "xserver-psb" - -XSERVER ?= "xserver-psb \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" - -GUI_MACHINE_CLASS = "bigscreen" - -IMAGE_ROOTFS_SIZE_ext3 = "2000000" - -IMAGE_FSTYPES ?= "ext3 cpio.gz" - -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" - -SRCREV_machine_pn-linux-yocto-stable_emenlow ?= "aae69fdf104b0a9d7b3710f808aac6ab303490f7" -SRCREV_meta_pn-linux-yocto-stable_emenlow ?= "50ccd2b3213b6a1bacb3f898c035119802dac420" diff --git a/meta-emenlow/recipes-bsp/formfactor/formfactor/emenlow/machconfig b/meta-emenlow/recipes-bsp/formfactor/formfactor/emenlow/machconfig deleted file mode 100644 index ffce012270..0000000000 --- a/meta-emenlow/recipes-bsp/formfactor/formfactor/emenlow/machconfig +++ /dev/null @@ -1,3 +0,0 @@ -# Assume a USB mouse and keyboard are connected -HAVE_TOUCHSCREEN=0 -HAVE_KEYBOARD=1 diff --git a/meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted file mode 100644 index 4a41d4871d..0000000000 --- a/meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS := "${THISDIR}/${PN}" - -PRINC = "1" diff --git a/meta-emenlow/recipes-graphics/libdrm-poulsbo/libdrm-poulsbo-2.3.0/libdrm-poulsbo.patch b/meta-emenlow/recipes-graphics/libdrm-poulsbo/libdrm-poulsbo-2.3.0/libdrm-poulsbo.patch deleted file mode 100644 index 14bde6887a..0000000000 --- a/meta-emenlow/recipes-graphics/libdrm-poulsbo/libdrm-poulsbo-2.3.0/libdrm-poulsbo.patch +++ /dev/null @@ -1,61 +0,0 @@ -# Make this package produce libdrm-poulsbo instead of libdrm so that the -# emenlow libdrm can coexist with the normal libdrm. -# jdike@linux.intel.com - -Index: libdrm-poulsbo-2.3.0/configure.ac -=================================================================== ---- libdrm-poulsbo-2.3.0.orig/configure.ac -+++ libdrm-poulsbo-2.3.0/configure.ac -@@ -19,7 +19,7 @@ - # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - AC_PREREQ(2.57) --AC_INIT([libdrm], 2.3.1, [dri-devel@lists.sourceforge.net], libdrm) -+AC_INIT([libdrm_poulsbo], 2.3.1, [dri-devel@lists.sourceforge.net], libdrm_poulsbo) - AC_CONFIG_SRCDIR([Makefile.am]) - AM_INIT_AUTOMAKE([dist-bzip2]) - -@@ -35,4 +35,4 @@ AC_SYS_LARGEFILE - pkgconfigdir=${libdir}/pkgconfig - AC_SUBST(pkgconfigdir) - --AC_OUTPUT([Makefile libdrm/Makefile shared-core/Makefile libdrm.pc]) -+AC_OUTPUT([Makefile libdrm/Makefile shared-core/Makefile libdrm_poulsbo.pc]) -Index: libdrm-poulsbo-2.3.0/Makefile.am -=================================================================== ---- libdrm-poulsbo-2.3.0.orig/Makefile.am -+++ libdrm-poulsbo-2.3.0/Makefile.am -@@ -25,6 +25,6 @@ AUTOMAKE_OPTIONS = foreign - SUBDIRS = libdrm shared-core - - pkgconfigdir = @pkgconfigdir@ --pkgconfig_DATA = libdrm.pc -+pkgconfig_DATA = libdrm_poulsbo.pc - --EXTRA_DIST = libdrm.pc.in -+EXTRA_DIST = libdrm_poulsbo.pc.in -Index: libdrm-poulsbo-2.3.0/libdrm/Makefile.am -=================================================================== ---- libdrm-poulsbo-2.3.0.orig/libdrm/Makefile.am -+++ libdrm-poulsbo-2.3.0/libdrm/Makefile.am -@@ -18,14 +18,14 @@ - # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --libdrm_la_LTLIBRARIES = libdrm.la --libdrm_ladir = $(libdir) --libdrm_la_LDFLAGS = -version-number 2:3:0 -no-undefined -+libdrm_poulsbo_la_LTLIBRARIES = libdrm_poulsbo.la -+libdrm_poulsbo_ladir = $(libdir) -+libdrm_poulsbo_la_LDFLAGS = -version-number 2:3:0 -no-undefined - - AM_CFLAGS = -I$(top_srcdir)/shared-core --libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c xf86drmMode.c -+libdrm_poulsbo_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c xf86drmMode.c - --libdrmincludedir = ${includedir}/psb --libdrminclude_HEADERS = xf86drm.h xf86mm.h xf86drmMode.h -+libdrm_poulsboincludedir = ${includedir}/psb -+libdrm_poulsboinclude_HEADERS = xf86drm.h xf86mm.h xf86drmMode.h - - EXTRA_DIST = ChangeLog TODO diff --git a/meta-emenlow/recipes-graphics/libdrm-poulsbo/libdrm-poulsbo_2.3.0.bb b/meta-emenlow/recipes-graphics/libdrm-poulsbo/libdrm-poulsbo_2.3.0.bb deleted file mode 100644 index d0e14a5622..0000000000 --- a/meta-emenlow/recipes-graphics/libdrm-poulsbo/libdrm-poulsbo_2.3.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Userspace interface to kernel DRM services" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://MIT_License.txt;md5=732825ecdcf420261531d935fcd914a7" -PR = "r4" - -PROVIDES = "libdrm-poulsbo" - -inherit autotools pkgconfig - -SRC_URI = "https://launchpad.net/~gma500/+archive/ppa/+files/libdrm-poulsbo_2.3.0-1ubuntu0sarvatt4~1004um1ubuntu1.tar.gz \ - file://libdrm-poulsbo.patch" - -SRC_URI[md5sum] = "82c00bb9f1239f1d00b18411b89c2380" -SRC_URI[sha256sum] = "335d4ac6694687475efe07b44a2d77a9a9fadcbc16946d01ea8a02339ae7d9ec" - -do_configure_prepend() { - sed -e 's/-ldrm/-ldrm_poulsbo/' -e 's/libdrm/libdrm_poulsbo/' \ - < ${S}/libdrm.pc.in > ${S}/libdrm_poulsbo.pc.in -} diff --git a/meta-emenlow/recipes-graphics/libva/libva-0.31.0/033_g45_add_rgba_subpic.patch b/meta-emenlow/recipes-graphics/libva/libva-0.31.0/033_g45_add_rgba_subpic.patch deleted file mode 100644 index 1b928b4c09..0000000000 --- a/meta-emenlow/recipes-graphics/libva/libva-0.31.0/033_g45_add_rgba_subpic.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 6622e8eba85cea476f8ef5b8c3620c4a0f024dcd Mon Sep 17 00:00:00 2001 -From: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com> -Date: Wed, 4 Nov 2009 10:56:54 +0000 -Subject: [PATCH] [G45] Add RGBA subpictures. - ---- - i965_drv_video/i965_drv_video.c | 18 ++++++++++++++++++ - i965_drv_video/i965_drv_video.h | 3 ++- - i965_drv_video/i965_render.c | 8 ++++---- - 3 files changed, 24 insertions(+), 5 deletions(-) - -diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c -index 8f4bfc1..92c4785 100644 ---- a/i965_drv_video/i965_drv_video.c -+++ b/i965_drv_video/i965_drv_video.c -@@ -70,6 +70,14 @@ i965_subpic_formats_map[I965_MAX_SUBPIC_FORMATS + 1] = { - { I965_SURFACETYPE_INDEXED, I965_SURFACEFORMAT_A4P4_UNORM, - { VA_FOURCC('A','I','4','4'), VA_MSB_FIRST, 8, }, - 0 }, -+ { I965_SURFACETYPE_RGBA, I965_SURFACEFORMAT_B8G8R8A8_UNORM, -+ { VA_FOURCC('B','G','R','A'), VA_LSB_FIRST, 32, -+ 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }, -+ 0 }, -+ { I965_SURFACETYPE_RGBA, I965_SURFACEFORMAT_R8G8B8A8_UNORM, -+ { VA_FOURCC('R','G','B','A'), VA_LSB_FIRST, 32, -+ 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000 }, -+ 0 }, - }; - - static const i965_subpic_format_map_t * -@@ -467,6 +475,7 @@ i965_CreateSubpicture(VADriverContextP ctx, - obj_subpic->format = m->format; - obj_subpic->width = obj_image->image.width; - obj_subpic->height = obj_image->image.height; - |
