misc meta-intel commits

PATCH Superseded [email protected] 4 participants 19 messages Oct 10, 2012 – Oct 11, 2012

lore

Share & tools

lore

[email protected]

author

2012-10-10 01:17 UTC #0 lore raw

v2 cover misc meta-intel commits

From: Nitin A Kamble <[email protected]>

This is v2 of the commits, updated after feedback from mailing list. This has been tested on crownbay and sugarbay BSPs to work as expected.

Thanks,
Nitin

The following changes since commit 2bd31135bdcdda19dabdf69706d9a38d5872e1fe:

crownbay: uprev v3.4 kernel commit ids (2012-10-08 16:09:33 -0500)

are available in the git repository at:
git://git.yoctoproject.org/meta-intel-contrib nitin/misc
http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin/misc

Nitin A Kamble (5):
xf86-video-intel: Bring 2.20.0 version to match released graphics
stack
crownbay.conf: specify the 8.0.4 version as preferred version of
mesa-dri
emgd-driver_bin_1.10: Remove in favor of 1.14 fishriver BSP retirement
update maintainers of various BSPs

 MAINTAINERS                                        |   16 +--
 .../xorg-driver/emgd-driver-bin_1.10.bb            |   93 ----------------
 .../xorg-driver/xf86-video-intel_2.20.0.bb         |   27 +++++
 .../xorg-driver/xorg-driver-common.inc             |   33 ++++++
 .../xorg-driver/xorg-driver-video.inc              |    4 +
 meta-chiefriver/README                             |   11 ++
 meta-crownbay/README                               |    2 +-
 meta-crownbay/conf/machine/crownbay.conf           |    2 +-
 meta-emenlow/README                                |    2 +-
 meta-fishriver/COPYING.MIT                         |   17 ---
 meta-fishriver/README                              |  114 --------------------
 meta-fishriver/README.sources                      |   17 ---
 meta-fishriver/conf/layer.conf                     |   12 --
 meta-fishriver/conf/machine/fishriver.conf         |   17 ---
 .../formfactor/formfactor/fishriver/machconfig     |    3 -
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    3 -
 .../xserver-xf86-config/fishriver/xorg.conf        |   26 -----
 .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 -
 .../linux/linux-yocto-rt_3.0.bbappend              |    8 --
 .../linux/linux-yocto-rt_3.2.bbappend              |    8 --
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    9 --
 .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    8 --
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    8 --
 meta-jasperforest/README                           |    2 +-
 meta-sugarbay/README                               |    2 +-
 25 files changed, 86 insertions(+), 359 deletions(-)
 delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin_1.10.bb
 create mode 100644 common/recipes-graphics/xorg-driver/xf86-video-intel_2.20.0.bb
 create mode 100644 common/recipes-graphics/xorg-driver/xorg-driver-common.inc
 create mode 100644 common/recipes-graphics/xorg-driver/xorg-driver-video.inc
 delete mode 100644 meta-fishriver/COPYING.MIT
 delete mode 100644 meta-fishriver/README
 delete mode 100644 meta-fishriver/README.sources
 delete mode 100644 meta-fishriver/binary/.gitignore
 delete mode 100644 meta-fishriver/conf/layer.conf
 delete mode 100644 meta-fishriver/conf/machine/fishriver.conf
 delete mode 100644 meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfig
 delete mode 100644 meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend
 delete mode 100644 meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fishriver/xorg.conf
 delete mode 100644 meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend

Signature · 1 line

1.7.3.4

[email protected]

author

2012-10-10 01:17 UTC #1 lore raw

PATCH v2 1/5 xf86-video-intel: Bring 2.20.0 version to match released graphics stack

From: Nitin A Kamble <[email protected]>

The Intel Linux graphics stack version 12.07 released on 2012-07-24 requires version 2.20.0 as seen here:
http://intellinuxgraphics.org/2012.07.html

Currently oecore has 2.19.0 version. So get this 2.20.0 version in meta-intel layer to be used by sugarbay and other BSPs using the Intel graphics stack.

Also took changes from version 2.20.8 recipe from Ross Burton's branch.

Signed-off-by Nitin A Kamble <[email protected]>

---
 .../xorg-driver/xf86-video-intel_2.20.0.bb         |   27 ++++++++++++++++
 .../xorg-driver/xorg-driver-common.inc             |   33 ++++++++++++++++++++
 .../xorg-driver/xorg-driver-video.inc              |    4 ++
 3 files changed, 64 insertions(+), 0 deletions(-)
 create mode 100644 common/recipes-graphics/xorg-driver/xf86-video-intel_2.20.0.bb
 create mode 100644 common/recipes-graphics/xorg-driver/xorg-driver-common.inc
 create mode 100644 common/recipes-graphics/xorg-driver/xorg-driver-video.inc

common/recipes-graphics/xorg-driver/xf86-video-intel_2.20.0.bb new file +27 -0

new file mode 100644
index 0000000..6cfca03
@@ -0,0 +1,27 @@
+require xorg-driver-video.inc
+
+SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver"
+
+DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \
+chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \
+the driver supports hardware accelerated 3D via the Direct Rendering \
+Infrastructure (DRI)."
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
+
+PR = "${INC_PR}.0"
+
+DEPENDS += "virtual/libx11 drm xf86driproto glproto \
+	    virtual/libgl xineramaproto xf86driproto libpciaccess"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[sna] = "--enable-sna,--disable-sna"
+PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
+
+# --enable-kms-only option is required by ROOTLESS_X
+EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}'
+
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+
+SRC_URI[md5sum] = "070bb866b05a16366bd9bb844c9b91aa"
+SRC_URI[sha256sum] = "21949297220ceda32bba430f778c6409002079dc717c7190dbd1062ab4a56783"

common/recipes-graphics/xorg-driver/xorg-driver-common.inc new file +33 -0

new file mode 100644
index 0000000..1ed2742
@@ -0,0 +1,33 @@
+DESCRIPTION = "X driver"
+HOMEPAGE = "http://www.x.org"
+BUGTRACKER = "https://bugs.freedesktop.org"
+SECTION = "x11/drivers"
+LICENSE = "MIT-X"
+
+PE = "2"
+INC_PR = "r0"
+
+DEPENDS = "virtual/xserver xproto randrproto util-macros"
+
+SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2"
+
+S = "${WORKDIR}/${BPN}-${PV}"
+
+FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
+FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
+
+inherit autotools pkgconfig
+
+# AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement
+# macro that simply assumes the test succeeds. 
+do_configure_prepend () {
+    echo 'AC_DEFUN(CC_AC_CHECK_FILE, $2)' > configure.ac.new
+    sed 's/AC_CHECK_FILE/CC_AC_CHECK_FILE/g' configure.ac >> configure.ac.new
+    mv configure.ac.new configure.ac
+}
+
+# FIXME: We don't want to include the libtool archives (*.la) from modules
+# directory, as they serve no useful purpose. Upstream should fix Makefile.am
+do_install_append() {
+	find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f --
+}

common/recipes-graphics/xorg-driver/xorg-driver-video.inc new file +4 -0

new file mode 100644
index 0000000..57c80d1
@@ -0,0 +1,4 @@
+include xorg-driver-common.inc
+
+DEPENDS =+ "renderproto videoproto xextproto fontsproto"
+

Signature · 1 line

1.7.3.4

[email protected]

author

2012-10-10 01:17 UTC #2 lore raw

PATCH v2 2/5 crownbay.conf: specify the 8.0.4 version as preferred version of mesa-dri

From: Nitin A Kamble <[email protected]>

Avoid following warnings while building crownbay BSPs:

NOTE: preferred version 7.11 of mesa-dri not available (for item virtual/libgl)
NOTE: versions of mesa-dri available: 2:8.0.4 2:8.0.4+git1+c1f4867c89adb1a6b19d66ec8ad146115909f0a7

This commit addresses one of the issue reported on the bug:
[YOCTO #3238]

Signed-off-by Nitin A Kamble <[email protected]>

---
 meta-crownbay/conf/machine/crownbay.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta-crownbay/conf/machine/crownbay.conf +1 -1

index c18fa1d..72431de 100644
@@ -18,7 +18,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
            "
 
 PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
-PREFERRED_VERSION_mesa-dri ?= "7.11"
+PREFERRED_VERSION_mesa-dri ?= "8.0.4"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
 
 APPEND += "video=vesafb vga=0x318 vmalloc=256MB"

Signature · 1 line

1.7.3.4

Darren Hart

Acked-by on v2 2/5

2012-10-10 02:47 UTC #3 lore raw

Re: [PATCHv2 2/5] crownbay.conf: specify the 8.0.4 version as preferred version of mesa-dri

Quoted 11 lines · On 10/09/2012 06:16 PM, [email protected] wrote:

From: Nitin A Kamble <[email protected]>
Avoid following warnings while building crownbay BSPs:
NOTE: preferred version 7.11 of mesa-dri not available (for item virtual/libgl)
NOTE: versions of mesa-dri available: 2:8.0.4 2:8.0.4+git1+c1f4867c89adb1a6b19d66ec8ad146115909f0a7
This commit addresses one of the issue reported on the bug:
[YOCTO #3238]
Signed-off-by Nitin A Kamble <[email protected]>

Acked-by Darren Hart <[email protected]>

Quoted 18 lines

---
 meta-crownbay/conf/machine/crownbay.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta-crownbay/conf/machine/crownbay.conf +1 -1

index c18fa1d..72431de 100644
@@ -18,7 +18,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
            "
 
 PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
-PREFERRED_VERSION_mesa-dri ?= "7.11"
+PREFERRED_VERSION_mesa-dri ?= "8.0.4"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
 
 APPEND += "video=vesafb vga=0x318 vmalloc=256MB"

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Burton, Ross

2012-10-10 09:25 UTC #4 lore raw

Re: [PATCHv2 2/5] crownbay.conf: specify the 8.0.4 version as preferred version of mesa-dri

In reply to [email protected]

Quoted 4 lines · On 10 October 2012 02:16, <[email protected]> wrote:

Avoid following warnings while building crownbay BSPs:
NOTE: preferred version 7.11 of mesa-dri not available (for item virtual/libgl)
NOTE: versions of mesa-dri available: 2:8.0.4 2:8.0.4+git1+c1f4867c89adb1a6b19d66ec8ad146115909f0a7

This is the preferred version in oe-core, so wouldn't it be easier to just drop this preferred version line and avoid this repeating itself in the future?

Ross

Kamble, Nitin A

author

2012-10-10 23:14 UTC #5 lore raw

Re: [PATCHv2 2/5] crownbay.conf: specify the 8.0.4 version as preferred version of mesa-dri

Quoted 18 lines

-----Original Message-----
From: Burton, Ross [mailto:[email protected]]
Sent: Wednesday, October 10, 2012 2:25 AM
To: Kamble, Nitin A
Cc: Zanussi, Tom; Hart, Darren; [email protected]
Subject: Re: [yocto] [PATCHv2 2/5] crownbay.conf: specify the 8.0.4 version as preferred version of mesa-dri
Quoted 6 lines · On 10 October 2012 02:16, <[email protected]> wrote:
Avoid following warnings while building crownbay BSPs:
NOTE: preferred version 7.11 of mesa-dri not available (for item
virtual/libgl)
NOTE: versions of mesa-dri available: 2:8.0.4
2:8.0.4+git1+c1f4867c89adb1a6b19d66ec8ad146115909f0a7

Quoted 4 lines

This is the preferred version in oe-core, so wouldn't it be easier to just drop this preferred version line and avoid this repeating itself in the future?
Ross

Hi Ross,
The reason is we want to know if the version of mesa in oecore has changed or not. EMGD has specific needs of mesa, and in the testing we are not finding any issues with v8.0.4 of mesa. But that may not hold true for future versions of mesa, so we would like to pin the version here so we know that this version works as expected.

Nitin

Burton, Ross

2012-10-11 10:28 UTC #6 lore raw

Re: [PATCHv2 2/5] crownbay.conf: specify the 8.0.4 version as preferred version of mesa-dri

Quoted 1 line · Nitin A

The reason is we want to know if the version of mesa in oecore has changed or not. EMGD has specific needs of mesa, and in the testing we are not finding any issues with v8.0.4 of mesa. But that may not hold true for future versions of mesa, so we would like to pin the version here so we know that this version works as expected.

That's an excellent reason.

Ross

[email protected]

author

2012-10-10 01:17 UTC #7 lore raw

PATCH v2 3/5 emgd-driver_bin_1.10: Remove in favor of 1.14

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

All BSPs have been migrated to 1.14, we can now safely retire 1.10

Signed-off-by Nitin A Kamble <[email protected]>

---
 .../xorg-driver/emgd-driver-bin_1.10.bb            |   93 --------------------
 1 files changed, 0 insertions(+), 93 deletions(-)
 delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin_1.10.bb

common/recipes-graphics/xorg-driver/emgd-driver-bin_1.10.bb deleted +0 ~~-93~~

deleted file mode 100644
index 6d80bee..0000000
@@ -1,93 +0,0 @@
-SUMMARY = "EMGD 1.10 xserver binaries"
-DESCRIPTION = "EMGD 1.10 includes some userspace binaries that use non-free \
-licensing, which are now available via a non-click-through downloadable \
-tarball, and is what this recipe now uses.  Since it is a non-free license, \
-this recipe is marked as 'License_emgd-driver-bin_1.10' and you need to add \
-to LICENSE_FLAGS_WHITELIST += \"License_emgd-driver-bin_1.10\" to your \
-local.conf in order to enable it in a build."
-LICENSE = "Intel-binary-only"
-LICENSE_FLAGS = "license_${PN}_${PV}"
-PR = "r1"
-
-EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License"
-EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2"
-EMGD_VIDEO_PLUGIN_DIR = "../common/video_plugin"
-
-LIC_FILES_CHKSUM = "file://${WORKDIR}/${EMGD_LIC_DIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d"
-
-DEPENDS = "rpm-native xz-native"
-
-SRC_URI = "https://edc.intel.com/App_Shared/Downloads/LIN_EMGD_1_10_RC_2209.tgz"
-
-SRC_URI[md5sum] = "e4a38d9efa0b086ae21b68145c4db4e9"
-SRC_URI[sha256sum] = "acea5f0f93a31553553428623c007d7ed0c604cf715fd87dfe075751da4be548"
-
-# These are closed binaries generated elsewhere so don't check ldflags
-INSANE_SKIP_${PN} = "ldflags"
-# Inhibit warnings about files being stripped, we can't do anything about it.
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-
-FILES_${PN} += "${libdir}/dri ${libdir}/gstreamer-0.10 ${libdir}/xorg/modules/drivers"
-FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug"
-
-S = "${WORKDIR}/${EMGD_RPM_DIR}"
-
-do_install () {
-    # A gstreamer VA buffer library
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/gst-vabuffer*.rpm | cpio -id
-
-    # MIX Common contains common classes, datatype, header files used by other MIX components
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/mixcommon*.rpm | cpio -id
-
-    # MIX Video Bitstream Parser is an user library interface for various video format bitstream parsing
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/mixvbp*.rpm | cpio -id
-
-    # MIX Video is an user library interface for various video codecs available on the platform.
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/mixvideo*.rpm | cpio -id
-
-    install -d -m 0755                                    ${D}${libdir}/gstreamer-0.10
-    install -m 0755 ${S}/usr/lib/*                        ${D}${libdir}/
-
-    # A gstreamer plugin that uses MIX Video for hardware accelerated video decoding and rendering.
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/gst-plugins-mixvideo*.rpm | cpio -id
-
-    # A collection of gstreamer plugins that uses VA libraries for hardware accelerated video rendering and text overlay.
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/gst-plugins-va*.rpm | cpio -id
-
-    install -m 0755 ${S}/usr/lib/gstreamer-0.10/*         ${D}${libdir}/gstreamer-0.10/
-
-    # EMGD runtime graphics libraries
-    rpm2cpio ${S}/emgd-bin*.rpm | xz -d | cpio -id
-
-    install -d -m 0755                                    ${D}${libdir}/dri
-    install -d -m 0755                                    ${D}${libdir}/xorg/modules/drivers
-    install -d -m 0755                                    ${D}${sysconfdir}
-    install -d -m 0755                                    ${D}${mandir}/man4
-    install -m 0755 ${S}/usr/lib/*.so.*                   ${D}${libdir}/
-    install -m 0755 ${S}/usr/lib/dri/*                    ${D}${libdir}/dri/
-    install -m 0755 ${S}/usr/lib/xorg/modules/drivers/*   ${D}${libdir}/xorg/modules/drivers/
-    install -m 0755 ${S}/etc/*                            ${D}${sysconfdir}/
-    install -m 0755 ${S}/usr/share/man/man4/*             ${D}${mandir}/man4/
-
-    # Khronos development headers needed for EGL, OpenGL-ES, and OpenVG development
-    rpm2cpio ${S}/emgd-devel*.rpm | xz -d | cpio -id
-
-    install -d -m 0755                                    ${D}${includedir}/EGL
-    install -m 0755 ${S}/usr/include/EGL/*.h              ${D}${includedir}/EGL/
-    install -d -m 0755                                    ${D}${includedir}/GLES
-    install -m 0755 ${S}/usr/include/GLES/*.h             ${D}${includedir}/GLES/
-    install -d -m 0755                                    ${D}${includedir}/GLES2
-    install -m 0755 ${S}/usr/include/GLES2/*.h            ${D}${includedir}/GLES2/
-    install -d -m 0755                                    ${D}${includedir}/KHR
-    install -m 0755 ${S}/usr/include/KHR/*.h              ${D}${includedir}/KHR/
-    install -d -m 0755                                    ${D}${includedir}/VG
-    install -m 0755 ${S}/usr/include/VG/*.h               ${D}${includedir}/VG/
-
-    ln -sf libEGL.so.1                                    ${D}${libdir}/libEGL.so
-    ln -sf libGLES_CM.so.1                                ${D}${libdir}/libGLES_CM.so
-    ln -sf libGLESv2.so.2                                 ${D}${libdir}/libGLESv2.so
-    ln -sf libOpenVG.so.1                                 ${D}${libdir}/libOpenVG.so
-    ln -sf libOpenVGU.so.1                                ${D}${libdir}/libOpenVGU.so
-}
-
-LEAD_SONAME = "libEGL.so"

Signature · 1 line

1.7.3.4

Darren Hart

Acked-by on v2 3/5

2012-10-10 02:46 UTC #8 lore raw

Re: [PATCHv2 3/5] emgd-driver_bin_1.10: Remove in favor of 1.14

Quoted 5 lines · On 10/09/2012 06:16 PM, [email protected] wrote:

From: Nitin A Kamble <[email protected]>
All BSPs have been migrated to 1.14, we can now safely retire 1.10
Signed-off-by Nitin A Kamble <[email protected]>

Acked-by Darren Hart <[email protected]>

Quoted 105 lines

---
 .../xorg-driver/emgd-driver-bin_1.10.bb            |   93 --------------------
 1 files changed, 0 insertions(+), 93 deletions(-)
 delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin_1.10.bb

common/recipes-graphics/xorg-driver/emgd-driver-bin_1.10.bb deleted +0 ~~-93~~

deleted file mode 100644
index 6d80bee..0000000
@@ -1,93 +0,0 @@
-SUMMARY = "EMGD 1.10 xserver binaries"
-DESCRIPTION = "EMGD 1.10 includes some userspace binaries that use non-free \
-licensing, which are now available via a non-click-through downloadable \
-tarball, and is what this recipe now uses.  Since it is a non-free license, \
-this recipe is marked as 'License_emgd-driver-bin_1.10' and you need to add \
-to LICENSE_FLAGS_WHITELIST += \"License_emgd-driver-bin_1.10\" to your \
-local.conf in order to enable it in a build."
-LICENSE = "Intel-binary-only"
-LICENSE_FLAGS = "license_${PN}_${PV}"
-PR = "r1"
-
-EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License"
-EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2"
-EMGD_VIDEO_PLUGIN_DIR = "../common/video_plugin"
-
-LIC_FILES_CHKSUM = "file://${WORKDIR}/${EMGD_LIC_DIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d"
-
-DEPENDS = "rpm-native xz-native"
-
-SRC_URI = "https://edc.intel.com/App_Shared/Downloads/LIN_EMGD_1_10_RC_2209.tgz"
-
-SRC_URI[md5sum] = "e4a38d9efa0b086ae21b68145c4db4e9"
-SRC_URI[sha256sum] = "acea5f0f93a31553553428623c007d7ed0c604cf715fd87dfe075751da4be548"
-
-# These are closed binaries generated elsewhere so don't check ldflags
-INSANE_SKIP_${PN} = "ldflags"
-# Inhibit warnings about files being stripped, we can't do anything about it.
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-
-FILES_${PN} += "${libdir}/dri ${libdir}/gstreamer-0.10 ${libdir}/xorg/modules/drivers"
-FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug"
-
-S = "${WORKDIR}/${EMGD_RPM_DIR}"
-
-do_install () {
-    # A gstreamer VA buffer library
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/gst-vabuffer*.rpm | cpio -id
-
-    # MIX Common contains common classes, datatype, header files used by other MIX components
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/mixcommon*.rpm | cpio -id
-
-    # MIX Video Bitstream Parser is an user library interface for various video format bitstream parsing
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/mixvbp*.rpm | cpio -id
-
-    # MIX Video is an user library interface for various video codecs available on the platform.
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/mixvideo*.rpm | cpio -id
-
-    install -d -m 0755                                    ${D}${libdir}/gstreamer-0.10
-    install -m 0755 ${S}/usr/lib/*                        ${D}${libdir}/
-
-    # A gstreamer plugin that uses MIX Video for hardware accelerated video decoding and rendering.
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/gst-plugins-mixvideo*.rpm | cpio -id
-
-    # A collection of gstreamer plugins that uses VA libraries for hardware accelerated video rendering and text overlay.
-    rpm2cpio ${S}/${EMGD_VIDEO_PLUGIN_DIR}/gst-plugins-va*.rpm | cpio -id
-
-    install -m 0755 ${S}/usr/lib/gstreamer-0.10/*         ${D}${libdir}/gstreamer-0.10/
-
-    # EMGD runtime graphics libraries
-    rpm2cpio ${S}/emgd-bin*.rpm | xz -d | cpio -id
-
-    install -d -m 0755                                    ${D}${libdir}/dri
-    install -d -m 0755                                    ${D}${libdir}/xorg/modules/drivers
-    install -d -m 0755                                    ${D}${sysconfdir}
-    install -d -m 0755                                    ${D}${mandir}/man4
-    install -m 0755 ${S}/usr/lib/*.so.*                   ${D}${libdir}/
-    install -m 0755 ${S}/usr/lib/dri/*                    ${D}${libdir}/dri/
-    install -m 0755 ${S}/usr/lib/xorg/modules/drivers/*   ${D}${libdir}/xorg/modules/drivers/
-    install -m 0755 ${S}/etc/*                            ${D}${sysconfdir}/
-    install -m 0755 ${S}/usr/share/man/man4/*             ${D}${mandir}/man4/
-
-    # Khronos development headers needed for EGL, OpenGL-ES, and OpenVG development
-    rpm2cpio ${S}/emgd-devel*.rpm | xz -d | cpio -id
-
-    install -d -m 0755                                    ${D}${includedir}/EGL
-    install -m 0755 ${S}/usr/include/EGL/*.h              ${D}${includedir}/EGL/
-    install -d -m 0755                                    ${D}${includedir}/GLES
-    install -m 0755 ${S}/usr/include/GLES/*.h             ${D}${includedir}/GLES/
-    install -d -m 0755                                    ${D}${includedir}/GLES2
-    install -m 0755 ${S}/usr/include/GLES2/*.h            ${D}${includedir}/GLES2/
-    install -d -m 0755                                    ${D}${includedir}/KHR
-    install -m 0755 ${S}/usr/include/KHR/*.h              ${D}${includedir}/KHR/
-    install -d -m 0755                                    ${D}${includedir}/VG
-    install -m 0755 ${S}/usr/include/VG/*.h               ${D}${includedir}/VG/
-
-    ln -sf libEGL.so.1                                    ${D}${libdir}/libEGL.so
-    ln -sf libGLES_CM.so.1                                ${D}${libdir}/libGLES_CM.so
-    ln -sf libGLESv2.so.2                                 ${D}${libdir}/libGLESv2.so
-    ln -sf libOpenVG.so.1                                 ${D}${libdir}/libOpenVG.so
-    ln -sf libOpenVGU.so.1                                ${D}${libdir}/libOpenVGU.so
-}
-
-LEAD_SONAME = "libEGL.so"

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

[email protected]

author

2012-10-10 01:17 UTC #9 lore raw

PATCH v2 4/5 fishriver BSP retirement

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

This commit removes fishriver bsp from meta-intel layer.

Fish-River-Islnad-2 hardware and BSP has made this
Fish-River-Island hardware and BSP absolute.
Also we discussed this on the Yocto Execution Tracking Meeting,
and to our knowledge no customer is using (cares about) this BSP now.

Signed-off-by Nitin A Kamble <[email protected]>

---
 MAINTAINERS                                        |    4 -
 meta-fishriver/COPYING.MIT                         |   17 ---
 meta-fishriver/README                              |  114 --------------------
 meta-fishriver/README.sources                      |   17 ---
 meta-fishriver/conf/layer.conf                     |   12 --
 meta-fishriver/conf/machine/fishriver.conf         |   17 ---
 .../formfactor/formfactor/fishriver/machconfig     |    3 -
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    3 -
 .../xserver-xf86-config/fishriver/xorg.conf        |   26 -----
 .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 -
 .../linux/linux-yocto-rt_3.0.bbappend              |    8 --
 .../linux/linux-yocto-rt_3.2.bbappend              |    8 --
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    9 --
 .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    8 --
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    8 --
 15 files changed, 0 insertions(+), 255 deletions(-)
 delete mode 100644 meta-fishriver/COPYING.MIT
 delete mode 100644 meta-fishriver/README
 delete mode 100644 meta-fishriver/README.sources
 delete mode 100644 meta-fishriver/binary/.gitignore
 delete mode 100644 meta-fishriver/conf/layer.conf
 delete mode 100644 meta-fishriver/conf/machine/fishriver.conf
 delete mode 100644 meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfig
 delete mode 100644 meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend
 delete mode 100644 meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fishriver/xorg.conf
 delete mode 100644 meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend
 delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend

MAINTAINERS +0 -4

index 5bcf470..3bf0add 100644
@@ -56,10 +56,6 @@ EMENLOW
 M:	Tom Zanussi <[email protected]>
 F:	meta-emenlow/
 
-FISHRIVER
-M:	Tom Zanussi <[email protected]>
-F:	meta-fishriver/
-
 FRI2
 M:	Darren Hart <[email protected]>
 F:	meta-fri2/

meta-fishriver/COPYING.MIT deleted +0 ~~-17~~

deleted file mode 100644
index fb950dc..0000000
@@ -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.

meta-fishriver/README deleted +0 ~~-114~~

114 lines not on this page · raw message

meta-fishriver/README.sources deleted +0 ~~-17~~

deleted file mode 100644
index 76180f1..0000000
@@ -1,17 +0,0 @@
-The sources for the packages comprising the images shipped with this
-BSP can be found at the following location:
-
-http://downloads.yoctoproject.org/mirror/sources/
-
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can be found at the
-following location:
-
-http://www.yoctoproject.org/downloads/yocto-1.2/poky-denzil-7.0.tar.bz2
-
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can also be found at the
-following locations:
-
-git://git.yoctoproject.org/poky.git
-git://git.yoctoproject.org/meta-intel

meta-fishriver/binary/.gitignore deleted +0 -0

deleted file mode 100644
index e69de29..0000000

meta-fishriver/conf/layer.conf deleted +0 ~~-12~~

deleted file mode 100644
index 61e292b..0000000
@@ -1,12 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH := "${BBPATH}:${LAYERDIR}"
-
-# We have a recipes directory, add to BBFILES
-BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "fishriver"
-BBFILE_PATTERN_fishriver := "^${LAYERDIR}/"
-BBFILE_PRIORITY_fishriver = "6"
-
-LAYERDEPENDS_fishriver = "intel"

meta-fishriver/conf/machine/fishriver.conf deleted +0 ~~-17~~

deleted file mode 100644
index ec2e87f..0000000
@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: fishriver
-
-#@DESCRIPTION: Machine configuration for Fish River Island systems
-# i.e. Z530/E660 + EG20T
-
-PREFERRED_VERSION_linux-yocto ?= "3.4%"
-
-require conf/machine/include/tune-atom.inc
-require conf/machine/include/ia32-base.inc
-
-XSERVER ?= "${XSERVER_IA32_BASE} \
-           ${XSERVER_IA32_EXT} \
-           ${XSERVER_IA32_VESA} \
-           "
-
-APPEND += "video=vesafb vga=0x318"

meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfig deleted +0 -3

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

meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted +0 -3

deleted file mode 100644
index 54da0ff..0000000
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
- 
-PRINC = "1"

meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fishriver/xorg.conf deleted +0 ~~-26~~

deleted file mode 100644
index da4fc3c..0000000
@@ -1,26 +0,0 @@
-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

meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend deleted +0 -1

deleted file mode 100644
index 72d991c..0000000
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend deleted +0 -8

deleted file mode 100644
index 7a502bd..0000000
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-
-# Update the following to use a different BSP branch or meta SRCREV
-#KBRANCH_fishriver  = "yocto/standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_fishriver ?= XXXX
-#SRCREV_meta_pn-linux-yocto-rt_fishriver ?= XXXX

meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend deleted +0 -8

deleted file mode 100644
index a91a425..0000000
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-
-# Update the following to use a different BSP branch or meta SRCREV
-#KBRANCH_fishriver  = "standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_fishriver ?= XXXX
-#SRCREV_meta_pn-linux-yocto-rt_fishriver ?= XXXX

meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend deleted +0 -9

deleted file mode 100644
index 6ac6ef5..0000000
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "yocto/standard/fishriver"
-KERNEL_FEATURES_append_fishriver += " cfg/smp.scc"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?= "c139592c96722727a9f074515a4061c3820da1a6"
-SRCREV_meta_pn-linux-yocto_fishriver ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"

meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend deleted +0 -8

deleted file mode 100644
index 9a2f678..0000000
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "standard/default/fishriver"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?= "969edd015a46eed77d6c3daeffdc299dd06e3397"
-SRCREV_meta_pn-linux-yocto_fishriver ?= "5b4c9dc78b5ae607173cc3ddab9bce1b5f78129b"

meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend deleted +0 -8

deleted file mode 100644
index c0d04dc..0000000
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "standard/fishriver"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f"
-SRCREV_meta_pn-linux-yocto_fishriver ?= "5bdc655034a58a7147176a8a882d81e2fd51e4b9"

Signature · 1 line

1.7.3.4

Darren Hart

2012-10-10 02:43 UTC #10 lore raw

Re: [PATCHv2 4/5] fishriver BSP retirement

Quoted 5 lines · On 10/09/2012 06:16 PM, [email protected] wrote:

From: Nitin A Kamble <[email protected]>
This commit removes fishriver bsp from meta-intel layer.
Fish-River-Islnad-2 hardware and BSP has made this

s/Islnad/Island/

Quoted 1 line

Fish-River-Island hardware and BSP absolute.

s/absolute/obsolete/

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Kamble, Nitin A

author

2012-10-10 02:50 UTC #11 lore raw

Re: [PATCHv2 4/5] fishriver BSP retirement

Sorry for these typos. I fixed these on the contrib branch.

Thanks,
Nitin

Quoted 24 lines

-----Original Message-----
From: Hart, Darren
Sent: Tuesday, October 09, 2012 7:42 PM
To: Kamble, Nitin A
Cc: Zanussi, Tom; [email protected]
Subject: Re: [PATCHv2 4/5] fishriver BSP retirement
Quoted 5 lines · On 10/09/2012 06:16 PM, [email protected] wrote:
From: Nitin A Kamble <[email protected]>
This commit removes fishriver bsp from meta-intel layer.
Fish-River-Islnad-2 hardware and BSP has made this
s/Islnad/Island/
Quoted 1 line
Fish-River-Island hardware and BSP absolute.
s/absolute/obsolete/
--
Darren Hart
Intel Open Source Technology Center Yocto Project - Linux Kernel

Darren Hart

Acked-by

2012-10-10 03:08 UTC #12 lore raw

Re: [PATCHv2 4/5] fishriver BSP retirement

Quoted 2 lines · Nitin A

Sorry for these typos. I fixed these on the contrib branch.

Acked-by Darren Hart <[email protected]>

Quoted 28 lines

Thanks,
Nitin
Quoted 24 lines
-----Original Message-----
From: Hart, Darren
Sent: Tuesday, October 09, 2012 7:42 PM
To: Kamble, Nitin A
Cc: Zanussi, Tom; [email protected]
Subject: Re: [PATCHv2 4/5] fishriver BSP retirement
Quoted 5 lines · On 10/09/2012 06:16 PM, [email protected] wrote:
From: Nitin A Kamble <[email protected]>
This commit removes fishriver bsp from meta-intel layer.
Fish-River-Islnad-2 hardware and BSP has made this
s/Islnad/Island/
Quoted 1 line
Fish-River-Island hardware and BSP absolute.
s/absolute/obsolete/
--
Darren Hart
Intel Open Source Technology Center Yocto Project - Linux Kernel

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Bruce Ashfield

2012-10-10 21:07 UTC #13 lore raw

Re: [PATCHv2 4/5] fishriver BSP retirement

In reply to [email protected]

Quoted 8 lines · On 12-10-09 09:16 PM, [email protected] wrote:

From: Nitin A Kamble<[email protected]>
This commit removes fishriver bsp from meta-intel layer.
Fish-River-Islnad-2 hardware and BSP has made this
Fish-River-Island hardware and BSP absolute.
Also we discussed this on the Yocto Execution Tracking Meeting,
and to our knowledge no customer is using (cares about) this BSP now.

Just so I don't forget, can you send a patch that also removes the kernel meta data for the BSP ? That way I won't recreate the branch for future releases :)

I assume it is ok that the kernel branches stay in the 3.x kernels for the yocto 1.3 release ?

Cheers,

Bruce

Quoted 388 lines

Signed-off-by Nitin A Kamble<[email protected]>

---
  MAINTAINERS                                        |    4 -
  meta-fishriver/COPYING.MIT                         |   17 ---
  meta-fishriver/README                              |  114 --------------------
  meta-fishriver/README.sources                      |   17 ---
  meta-fishriver/conf/layer.conf                     |   12 --
  meta-fishriver/conf/machine/fishriver.conf         |   17 ---
  .../formfactor/formfactor/fishriver/machconfig     |    3 -
  .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    3 -
  .../xserver-xf86-config/fishriver/xorg.conf        |   26 -----
  .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 -
  .../linux/linux-yocto-rt_3.0.bbappend              |    8 --
  .../linux/linux-yocto-rt_3.2.bbappend              |    8 --
  .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    9 --
  .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    8 --
  .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    8 --
  15 files changed, 0 insertions(+), 255 deletions(-)

delete mode 100644 meta-fishriver/COPYING.MIT
delete mode 100644 meta-fishriver/README
delete mode 100644 meta-fishriver/README.sources
delete mode 100644 meta-fishriver/binary/.gitignore
delete mode 100644 meta-fishriver/conf/layer.conf
delete mode 100644 meta-fishriver/conf/machine/fishriver.conf
delete mode 100644 meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfig delete mode 100644 meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend delete mode 100644 meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fishriver/xorg.conf delete mode 100644 meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend
delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend
delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend

MAINTAINERS +0 -4

index 5bcf470..3bf0add 100644
@@ -56,10 +56,6 @@ EMENLOW
  M:	Tom Zanussi<[email protected]>
  F:	meta-emenlow/
 
-FISHRIVER
-M:	Tom Zanussi<[email protected]>
-F:	meta-fishriver/
-
  FRI2
  M:	Darren Hart<[email protected]>
  F:	meta-fri2/

meta-fishriver/COPYING.MIT deleted +0 ~~-17~~

deleted file mode 100644
index fb950dc..0000000
@@ -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.

meta-fishriver/README deleted +0 ~~-114~~

deleted file mode 100644
index 1dd0a4c..0000000
@@ -1,114 +0,0 @@
-This README file contains information on building the meta-fishriver
-BSP layer, and booting the images contained in the /binary directory.
-Please see the corresponding sections below for details.
-
-
-Dependencies
-============
-
-This layer depends on:
-
-  URI: git://git.openembedded.org/bitbake
-  branch: master
-
-  URI: git://git.openembedded.org/openembedded-core
-  layers: meta
-  branch: master
-
-  URI: git://git.yoctoproject.org/meta-intel
-  layers: intel
-  branch: master
-
-
-Patches
-=======
-
-Please submit any patches against this BSP to the Yocto mailing list
-([email protected]) and cc: the maintainer:
-
-Maintainer: Tom Zanussi<[email protected]>
-
-Please see the meta-intel/MAINTAINERS file for more details.
-
-
-Table of Contents
-=================
-
-  I. Building the meta-fishriver BSP layer
- II. Booting the images in /binary
-
-
-I. Building the meta-fishriver BSP layer
-========================================
-
-In order to build an image with BSP support for a given release, you
-need to download the corresponding BSP tarball from the 'Board Support
-Package (BSP) Downloads' page of the Yocto Project website.
-
-Having done that, and assuming you extracted the BSP tarball contents
-at the top-level of your yocto build tree, you can build a fishriver
-image by adding the location of the meta-fishriver layer to
-bblayers.conf, along with the meta-intel layer itself (to access
-common metadata shared between BSPs) e.g.:
-
-  yocto/meta-intel \
-  yocto/meta-intel/meta-fishriver \
-
-To enable the fishriver layer, add the fishriver MACHINE to local.conf:
-
-  MACHINE ?= "fishriver"
-
-You should then be able to build a fishriver image as such:
-
-  $ source oe-init-build-env
-  $ bitbake core-image-sato
-
-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').
-
-As an alternative to downloading the BSP tarball, you can also work
-directly from the meta-intel git repository.  For each BSP in the
-'meta-intel' repository, there are multiple branches, one
-corresponding to each major release starting with 'laverne' (0.90), in
-addition to the latest code which tracks the current master (note that
-not all BSPs are present in every release).  Instead of extracting a
-BSP tarball at the top level of your yocto build tree, you can
-equivalently check out the appropriate branch from the meta-intel
-repository at the same location.
-
-
-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=core-image-sato-fishriver-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

meta-fishriver/README.sources deleted +0 ~~-17~~

deleted file mode 100644
index 76180f1..0000000
@@ -1,17 +0,0 @@
-The sources for the packages comprising the images shipped with this
-BSP can be found at the following location:
-
-http://downloads.yoctoproject.org/mirror/sources/
-
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can be found at the
-following location:
-
-http://www.yoctoproject.org/downloads/yocto-1.2/poky-denzil-7.0.tar.bz2
-
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can also be found at the
-following locations:
-
-git://git.yoctoproject.org/poky.git
-git://git.yoctoproject.org/meta-intel

meta-fishriver/binary/.gitignore deleted +0 -0

deleted file mode 100644
index e69de29..0000000

meta-fishriver/conf/layer.conf deleted +0 ~~-12~~

deleted file mode 100644
index 61e292b..0000000
@@ -1,12 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH := "${BBPATH}:${LAYERDIR}"
-
-# We have a recipes directory, add to BBFILES
-BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "fishriver"
-BBFILE_PATTERN_fishriver := "^${LAYERDIR}/"
-BBFILE_PRIORITY_fishriver = "6"
-
-LAYERDEPENDS_fishriver = "intel"

meta-fishriver/conf/machine/fishriver.conf deleted +0 ~~-17~~

deleted file mode 100644
index ec2e87f..0000000
@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: fishriver
-
-#@DESCRIPTION: Machine configuration for Fish River Island systems
-# i.e. Z530/E660 + EG20T
-
-PREFERRED_VERSION_linux-yocto ?= "3.4%"
-
-require conf/machine/include/tune-atom.inc
-require conf/machine/include/ia32-base.inc
-
-XSERVER ?= "${XSERVER_IA32_BASE} \
-           ${XSERVER_IA32_EXT} \
-           ${XSERVER_IA32_VESA} \
-           "
-
-APPEND += "video=vesafb vga=0x318"

meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfig deleted +0 -3

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

meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted +0 -3

deleted file mode 100644
index 54da0ff..0000000
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC = "1"

meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fishriver/xorg.conf deleted +0 ~~-26~~

deleted file mode 100644
index da4fc3c..0000000
@@ -1,26 +0,0 @@
-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

meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend deleted +0 -1

deleted file mode 100644
index 72d991c..0000000
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend deleted +0 -8

deleted file mode 100644
index 7a502bd..0000000
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-
-# Update the following to use a different BSP branch or meta SRCREV
-#KBRANCH_fishriver  = "yocto/standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_fishriver ?= XXXX
-#SRCREV_meta_pn-linux-yocto-rt_fishriver ?= XXXX

meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend deleted +0 -8

deleted file mode 100644
index a91a425..0000000
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-
-# Update the following to use a different BSP branch or meta SRCREV
-#KBRANCH_fishriver  = "standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_fishriver ?= XXXX
-#SRCREV_meta_pn-linux-yocto-rt_fishriver ?= XXXX

meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend deleted +0 -9

deleted file mode 100644
index 6ac6ef5..0000000
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "yocto/standard/fishriver"
-KERNEL_FEATURES_append_fishriver += " cfg/smp.scc"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?= "c139592c96722727a9f074515a4061c3820da1a6"
-SRCREV_meta_pn-linux-yocto_fishriver ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"

meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend deleted +0 -8

deleted file mode 100644
index 9a2f678..0000000
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "standard/default/fishriver"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?= "969edd015a46eed77d6c3daeffdc299dd06e3397"
-SRCREV_meta_pn-linux-yocto_fishriver ?= "5b4c9dc78b5ae607173cc3ddab9bce1b5f78129b"

meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend deleted +0 -8

deleted file mode 100644
index c0d04dc..0000000
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "standard/fishriver"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f"
-SRCREV_meta_pn-linux-yocto_fishriver ?= "5bdc655034a58a7147176a8a882d81e2fd51e4b9"

Kamble, Nitin A

author

2012-10-10 23:18 UTC #14 lore raw

Re: [PATCHv2 4/5] fishriver BSP retirement

Quoted 14 lines

-----Original Message-----
From: Bruce Ashfield [mailto:[email protected]]
Sent: Wednesday, October 10, 2012 2:07 PM
To: Kamble, Nitin A
Cc: Zanussi, Tom; Hart, Darren; [email protected]
Subject: Re: [yocto] [PATCHv2 4/5] fishriver BSP retirement
Quoted 4 lines · On 12-10-09 09:16 PM, [email protected] wrote:
From: Nitin A Kamble<[email protected]>
This commit removes fishriver bsp from meta-intel layer.

Quoted 9 lines

Quoted 4 lines
Fish-River-Islnad-2 hardware and BSP has made this
Fish-River-Island hardware and BSP absolute.
Also we discussed this on the Yocto Execution Tracking Meeting, and
to our knowledge no customer is using (cares about) this BSP now.
Just so I don't forget, can you send a patch that also removes the kernel meta data for the BSP ? That way I won't recreate the branch for future releases :)

Removing the FRI-1 contents from meta branch of v3.4 kernel tree should be ok because it preserves the old commits. But I think we will have to leave the topic branch for fishriver machine as it is.

Quoted 3 lines

I assume it is ok that the kernel branches stay in the 3.x kernels for the yocto 1.3 release ?

I also think that is the right way to handle it.

Regards,
Nitin

Quoted 439 lines

Cheers,
Bruce
Quoted 19 lines
Signed-off-by Nitin A Kamble<[email protected]>
---
  MAINTAINERS                                        |    4 -
  meta-fishriver/COPYING.MIT                         |   17 ---
  meta-fishriver/README                              |  114 --------------------
  meta-fishriver/README.sources                      |   17 ---
  meta-fishriver/conf/layer.conf                     |   12 --
  meta-fishriver/conf/machine/fishriver.conf         |   17 ---
  .../formfactor/formfactor/fishriver/machconfig     |    3 -
  .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    3 -
  .../xserver-xf86-config/fishriver/xorg.conf        |   26 -----
  .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 -
  .../linux/linux-yocto-rt_3.0.bbappend              |    8 --
  .../linux/linux-yocto-rt_3.2.bbappend              |    8 --
  .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    9 --
  .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    8 --
  .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    8 --
  15 files changed, 0 insertions(+), 255 deletions(-)
Quoted 7 lines
delete mode 100644 meta-fishriver/COPYING.MIT delete mode 100644 meta-fishriver/README
delete mode 100644 meta-fishriver/README.sources delete mode 100644 meta-fishriver/binary/.gitignore delete mode 100644 meta-fishriver/conf/layer.conf delete mode 100644 meta-fishriver/conf/machine/fishriver.conf delete mode 100644 meta-fishriver/recipes-
bsp/formfactor/formfactor/fishriver/machconfig
Quoted 1 line
delete mode 100644 meta-fishriver/recipes-
bsp/formfactor/formfactor_0.0.bbappend
Quoted 1 line
delete mode 100644 meta-fishriver/recipes-graphics/xorg-
xserver/xserver-xf86-config/fishriver/xorg.conf
Quoted 1 line
delete mode 100644 meta-fishriver/recipes-graphics/xorg-
xserver/xserver-xf86-config_0.1.bbappend
Quoted 1 line
delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-
rt_3.0.bbappend
Quoted 1 line
delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-
rt_3.2.bbappend
Quoted 1 line
delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-
yocto_3.0.bbappend
Quoted 1 line
delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-
yocto_3.2.bbappend
Quoted 23 lines
delete mode 100644
meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend
MAINTAINERS +0 -4
@@ -56,10 +56,6 @@ EMENLOW
  M:	Tom Zanussi<[email protected]>
  F:	meta-emenlow/
 
-FISHRIVER
-M:	Tom Zanussi<[email protected]>
-F:	meta-fishriver/
-
  FRI2
  M:	Darren Hart<[email protected]>
  F:	meta-fri2/
meta-fishriver/COPYING.MIT deleted +0 -1
deleted file mode 100644 index fb950dc..0000000
@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining
Quoted 5 lines
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:
Quoted 6 lines
meta-fishriver/COPYING.MIT deleted +0 -2
-
-The above copyright notice and this permission notice shall be
included in -all copies or substantial portions of the Software.
meta-fishriver/COPYING.MIT deleted +0 -2
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF
Quoted 2 lines
MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT
HOLDERS
Quoted 1 line
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN
AN
Quoted 1 line
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR
IN
Quoted 1 line
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -
THE SOFTWARE.
Quoted 302 lines
meta-fishriver/README deleted renamed from meta-fishriver/README +0 -0
file mode 100644 index 1dd0a4c..0000000
meta-fishriver/README deleted +0 ~~-45~~
@@ -1,114 +0,0 @@
-This README file contains information on building the meta-fishriver
-BSP layer, and booting the images contained in the /binary directory.
-Please see the corresponding sections below for details.
-
-
-Dependencies
-============
-
-This layer depends on:
-
-  URI: git://git.openembedded.org/bitbake
-  branch: master
-
-  URI: git://git.openembedded.org/openembedded-core
-  layers: meta
-  branch: master
-
-  URI: git://git.yoctoproject.org/meta-intel
-  layers: intel
-  branch: master
-
-
-Patches
-=======
-
-Please submit any patches against this BSP to the Yocto mailing list
-([email protected]) and cc: the maintainer:
-
-Maintainer: Tom Zanussi<[email protected]>
-
-Please see the meta-intel/MAINTAINERS file for more details.
-
-
-Table of Contents
-=================
-
-  I. Building the meta-fishriver BSP layer
- II. Booting the images in /binary
-
-
-I. Building the meta-fishriver BSP layer
-========================================
-
-In order to build an image with BSP support for a given release, you
-need to download the corresponding BSP tarball from the 'Board
Support -Package (BSP) Downloads' page of the Yocto Project website.
meta-fishriver/README deleted +0 ~~-27~~
-
-Having done that, and assuming you extracted the BSP tarball contents
-at the top-level of your yocto build tree, you can build a fishriver
-image by adding the location of the meta-fishriver layer to
-bblayers.conf, along with the meta-intel layer itself (to access
-common metadata shared between BSPs) e.g.:
-
-  yocto/meta-intel \
-  yocto/meta-intel/meta-fishriver \
-
-To enable the fishriver layer, add the fishriver MACHINE to local.conf:
-
-  MACHINE ?= "fishriver"
-
-You should then be able to build a fishriver image as such:
-
-  $ source oe-init-build-env
-  $ bitbake core-image-sato
-
-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').
-
-As an alternative to downloading the BSP tarball, you can also work
-directly from the meta-intel git repository.  For each BSP in the
-'meta-intel' repository, there are multiple branches, one
-corresponding to each major release starting with 'laverne' (0.90),
in -addition to the latest code which tracks the current master (note that -not all BSPs are present in every release). Instead of extracting a -BSP tarball at the top level of your yocto build tree, you can -equivalently check out the appropriate branch from the meta-intel -repository at the same location.
meta-fishriver/README deleted +0 ~~-20~~
-
-
-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=core-image-sato-fishriver-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.
meta-fishriver/README deleted +0 ~~-13~~
-
-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-fishriver/README.sources b/meta-fishriver/README.sources deleted file mode 100644 index 76180f1..0000000
meta-fishriver/README.sources deleted +0 ~~-10~~
@@ -1,17 +0,0 @@
-The sources for the packages comprising the images shipped with this
-BSP can be found at the following location:
-
-http://downloads.yoctoproject.org/mirror/sources/
-
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can be found at the
-following location:
-
-http://www.yoctoproject.org/downloads/yocto-1.2/poky-denzil-7.0.tar.b
z2
meta-fishriver/README.sources deleted +0 -7
-
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can also be found at the
-following locations:
-
-git://git.yoctoproject.org/poky.git
-git://git.yoctoproject.org/meta-intel
meta-fishriver/binary/.gitignore deleted +0 -0
deleted file mode 100644
index e69de29..0000000
(quoted diff) +0 -0
b/meta-fishriver/conf/layer.conf deleted file mode 100644 index 61e292b..0000000
meta-fishriver/conf/layer.conf deleted +0 -1
@@ -1,12 +0,0 @@
-# We have a conf and classes directory, add to BBPATH -BBPATH :=
"${BBPATH}:${LAYERDIR}"
meta-fishriver/conf/layer.conf deleted +0 -2
-
-# We have a recipes directory, add to BBFILES -BBFILES := "${BBFILES}
${LAYERDIR}/recipes-*/*/*.bb \
meta-fishriver/conf/layer.conf deleted +0 -7
-	${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "fishriver"
-BBFILE_PATTERN_fishriver := "^${LAYERDIR}/"
-BBFILE_PRIORITY_fishriver = "6"
-
-LAYERDEPENDS_fishriver = "intel"
meta-fishriver/conf/machine/fishriver.conf deleted +0 -4
deleted file mode 100644
index ec2e87f..0000000
@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: fishriver
-
-#@DESCRIPTION: Machine configuration for Fish River Island systems -#
i.e. Z530/E660 + EG20T
meta-fishriver/conf/machine/fishriver.conf deleted +0 ~~-12~~
-
-PREFERRED_VERSION_linux-yocto ?= "3.4%"
-
-require conf/machine/include/tune-atom.inc
-require conf/machine/include/ia32-base.inc
-
-XSERVER ?= "${XSERVER_IA32_BASE} \
-           ${XSERVER_IA32_EXT} \
-           ${XSERVER_IA32_VESA} \
-           "
-
-APPEND += "video=vesafb vga=0x318"
diff --git a/meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfi g b/meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfi g
deleted file mode 100644
index ffce012..0000000
---
a/meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfi g
+++ /dev/null
meta-fishriver/conf/machine/fishriver.conf deleted +0 -3
@@ -1,3 +0,0 @@
-# Assume a USB mouse and keyboard are connected
-HAVE_TOUCHSCREEN=0
-HAVE_KEYBOARD=1
diff --git a/meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted file mode 100644
index 54da0ff..0000000
meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted +0 -3
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC = "1"
diff --git a/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fis hriver/xorg.conf b/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fis hriver/xorg.conf
deleted file mode 100644
index da4fc3c..0000000
---
a/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fis hriver/xorg.conf
+++ /dev/null
meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted +0 ~~-26~~
@@ -1,26 +0,0 @@
-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
diff --git a/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1 .bbappend b/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1 .bbappend
deleted file mode 100644
index 72d991c..0000000
---
a/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1 .bbappend
+++ /dev/null
meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted +0 -1
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend deleted file mode 100644
index 7a502bd..0000000
meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend deleted +0 -8
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-
-# Update the following to use a different BSP branch or meta SRCREV
-#KBRANCH_fishriver  = "yocto/standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_fishriver ?= XXXX
-#SRCREV_meta_pn-linux-yocto-rt_fishriver ?= XXXX diff --git
a/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend deleted file mode 100644
index a91a425..0000000
meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend deleted +0 -8
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-
-# Update the following to use a different BSP branch or meta SRCREV
-#KBRANCH_fishriver  = "standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_fishriver ?= XXXX
-#SRCREV_meta_pn-linux-yocto-rt_fishriver ?= XXXX diff --git
a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend deleted file mode 100644
index 6ac6ef5..0000000
meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend line 8
Quoted 8 lines
meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend deleted +0 -8
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "yocto/standard/fishriver"
-KERNEL_FEATURES_append_fishriver += " cfg/smp.scc"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?=
"c139592c96722727a9f074515a4061c3820da1a6"
meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend line 9
Quoted 1 line
meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend deleted +0 -1
-SRCREV_meta_pn-linux-yocto_fishriver ?=
"59314a3523e360796419d76d78c6f7d8c5ef2593"
Quoted 8 lines
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend deleted file mode 100644
index 9a2f678..0000000
meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend line 7
Quoted 7 lines
meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend deleted +0 -7
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "standard/default/fishriver"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?=
"969edd015a46eed77d6c3daeffdc299dd06e3397"
meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend line 8
Quoted 1 line
meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend deleted +0 -1
-SRCREV_meta_pn-linux-yocto_fishriver ?=
"5b4c9dc78b5ae607173cc3ddab9bce1b5f78129b"
Quoted 8 lines
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend deleted file mode 100644
index c0d04dc..0000000
meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend line 7
Quoted 7 lines
meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend deleted +0 -7
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "standard/fishriver"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?=
"3fa06aa29078fdb2af431de2d3fdae7d281ba85f"
meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend line 8
Quoted 1 line
meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend deleted +0 -1
-SRCREV_meta_pn-linux-yocto_fishriver ?=
"5bdc655034a58a7147176a8a882d81e2fd51e4b9"

Bruce Ashfield

2012-10-10 23:26 UTC #15 lore raw

Re: [PATCHv2 4/5] fishriver BSP retirement

Quoted 19 lines · Nitin A

Quoted 19 lines
-----Original Message-----
From: Bruce Ashfield [mailto:[email protected]]
Sent: Wednesday, October 10, 2012 2:07 PM
To: Kamble, Nitin A
Cc: Zanussi, Tom; Hart, Darren; [email protected]
Subject: Re: [yocto] [PATCHv2 4/5] fishriver BSP retirement
Quoted 8 lines · On 12-10-09 09:16 PM, [email protected] wrote:
From: Nitin A Kamble<[email protected]>
This commit removes fishriver bsp from meta-intel layer.
Fish-River-Islnad-2 hardware and BSP has made this
Fish-River-Island hardware and BSP absolute.
Also we discussed this on the Yocto Execution Tracking Meeting, and
to our knowledge no customer is using (cares about) this BSP now.

Quoted 6 lines

Quoted 4 lines
Just so I don't forget, can you send a patch that also removes the kernel meta data for the BSP ? That way I won't recreate the branch for future releases :)
Removing the FRI-1 contents from meta branch of v3.4 kernel tree should be ok because it preserves the old commits. But I think we will have to leave the topic branch for fishriver machine as it is.

ok, works for me. We still do have the yocto-kernel-cache repository to track the history, but for historical purposes, I agree that keeping it in all the 3.x trees is ok, without the meta-intel support .. you can't build it and it doesn't do any harm.

Quoted 5 lines

Quoted 4 lines
I assume it is ok that the kernel branches stay in the 3.x kernels for the yocto 1.3 release ?
I also think that is the right way to handle it.

Fine with me as well, I'll just ensure that it doesn't appear in new repos, a kernel meta commit patch against the 3.4 tree that says 3.6+ will make sure that happens.

Bruce

Quoted 445 lines

Regards,
Nitin
Quoted 439 lines
Cheers,
Bruce
Quoted 19 lines
Signed-off-by Nitin A Kamble<[email protected]>
---
   MAINTAINERS                                        |    4 -
   meta-fishriver/COPYING.MIT                         |   17 ---
   meta-fishriver/README                              |  114 --------------------
   meta-fishriver/README.sources                      |   17 ---
   meta-fishriver/conf/layer.conf                     |   12 --
   meta-fishriver/conf/machine/fishriver.conf         |   17 ---
   .../formfactor/formfactor/fishriver/machconfig     |    3 -
   .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    3 -
   .../xserver-xf86-config/fishriver/xorg.conf        |   26 -----
   .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 -
   .../linux/linux-yocto-rt_3.0.bbappend              |    8 --
   .../linux/linux-yocto-rt_3.2.bbappend              |    8 --
   .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    9 --
   .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    8 --
   .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    8 --
   15 files changed, 0 insertions(+), 255 deletions(-)
Quoted 7 lines
delete mode 100644 meta-fishriver/COPYING.MIT delete mode 100644 meta-fishriver/README
delete mode 100644 meta-fishriver/README.sources delete mode 100644 meta-fishriver/binary/.gitignore delete mode 100644 meta-fishriver/conf/layer.conf delete mode 100644 meta-fishriver/conf/machine/fishriver.conf delete mode 100644 meta-fishriver/recipes-
bsp/formfactor/formfactor/fishriver/machconfig
Quoted 1 line
delete mode 100644 meta-fishriver/recipes-
bsp/formfactor/formfactor_0.0.bbappend
Quoted 1 line
delete mode 100644 meta-fishriver/recipes-graphics/xorg-
xserver/xserver-xf86-config/fishriver/xorg.conf
Quoted 1 line
delete mode 100644 meta-fishriver/recipes-graphics/xorg-
xserver/xserver-xf86-config_0.1.bbappend
Quoted 1 line
delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-
rt_3.0.bbappend
Quoted 1 line
delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-
rt_3.2.bbappend
Quoted 1 line
delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-
yocto_3.0.bbappend
Quoted 1 line
delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-
yocto_3.2.bbappend
Quoted 23 lines
   delete mode 100644
meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend
MAINTAINERS +0 -4
@@ -56,10 +56,6 @@ EMENLOW
   M:	Tom Zanussi<[email protected]>
   F:	meta-emenlow/
 
-FISHRIVER
-M:	Tom Zanussi<[email protected]>
-F:	meta-fishriver/
-
   FRI2
   M:	Darren Hart<[email protected]>
   F:	meta-fri2/
meta-fishriver/COPYING.MIT deleted +0 -1
deleted file mode 100644 index fb950dc..0000000
@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining
Quoted 5 lines
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:
Quoted 6 lines
meta-fishriver/COPYING.MIT deleted +0 -2
-
-The above copyright notice and this permission notice shall be
included in -all copies or substantial portions of the Software.
meta-fishriver/COPYING.MIT deleted +0 -2
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF
Quoted 2 lines
MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT
HOLDERS
Quoted 1 line
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN
AN
Quoted 1 line
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR
IN
Quoted 1 line
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -
THE SOFTWARE.
Quoted 302 lines
meta-fishriver/README deleted renamed from meta-fishriver/README +0 -0
file mode 100644 index 1dd0a4c..0000000
meta-fishriver/README deleted +0 ~~-45~~
@@ -1,114 +0,0 @@
-This README file contains information on building the meta-fishriver
-BSP layer, and booting the images contained in the /binary directory.
-Please see the corresponding sections below for details.
-
-
-Dependencies
-============
-
-This layer depends on:
-
-  URI: git://git.openembedded.org/bitbake
-  branch: master
-
-  URI: git://git.openembedded.org/openembedded-core
-  layers: meta
-  branch: master
-
-  URI: git://git.yoctoproject.org/meta-intel
-  layers: intel
-  branch: master
-
-
-Patches
-=======
-
-Please submit any patches against this BSP to the Yocto mailing list
-([email protected]) and cc: the maintainer:
-
-Maintainer: Tom Zanussi<[email protected]>
-
-Please see the meta-intel/MAINTAINERS file for more details.
-
-
-Table of Contents
-=================
-
-  I. Building the meta-fishriver BSP layer
- II. Booting the images in /binary
-
-
-I. Building the meta-fishriver BSP layer
-========================================
-
-In order to build an image with BSP support for a given release, you
-need to download the corresponding BSP tarball from the 'Board
Support -Package (BSP) Downloads' page of the Yocto Project website.
meta-fishriver/README deleted +0 ~~-27~~
-
-Having done that, and assuming you extracted the BSP tarball contents
-at the top-level of your yocto build tree, you can build a fishriver
-image by adding the location of the meta-fishriver layer to
-bblayers.conf, along with the meta-intel layer itself (to access
-common metadata shared between BSPs) e.g.:
-
-  yocto/meta-intel \
-  yocto/meta-intel/meta-fishriver \
-
-To enable the fishriver layer, add the fishriver MACHINE to local.conf:
-
-  MACHINE ?= "fishriver"
-
-You should then be able to build a fishriver image as such:
-
-  $ source oe-init-build-env
-  $ bitbake core-image-sato
-
-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').
-
-As an alternative to downloading the BSP tarball, you can also work
-directly from the meta-intel git repository.  For each BSP in the
-'meta-intel' repository, there are multiple branches, one
-corresponding to each major release starting with 'laverne' (0.90),
in -addition to the latest code which tracks the current master (note that -not all BSPs are present in every release). Instead of extracting a -BSP tarball at the top level of your yocto build tree, you can -equivalently check out the appropriate branch from the meta-intel -repository at the same location.
meta-fishriver/README deleted +0 ~~-20~~
-
-
-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=core-image-sato-fishriver-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.
meta-fishriver/README deleted +0 ~~-13~~
-
-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-fishriver/README.sources b/meta-fishriver/README.sources deleted file mode 100644 index 76180f1..0000000
meta-fishriver/README.sources deleted +0 ~~-10~~
@@ -1,17 +0,0 @@
-The sources for the packages comprising the images shipped with this
-BSP can be found at the following location:
-
-http://downloads.yoctoproject.org/mirror/sources/
-
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can be found at the
-following location:
-
-http://www.yoctoproject.org/downloads/yocto-1.2/poky-denzil-7.0.tar.b
z2
meta-fishriver/README.sources deleted +0 -7
-
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can also be found at the
-following locations:
-
-git://git.yoctoproject.org/poky.git
-git://git.yoctoproject.org/meta-intel
meta-fishriver/binary/.gitignore deleted +0 -0
deleted file mode 100644
index e69de29..0000000
(quoted diff) +0 -0
b/meta-fishriver/conf/layer.conf deleted file mode 100644 index 61e292b..0000000
meta-fishriver/conf/layer.conf deleted +0 -1
@@ -1,12 +0,0 @@
-# We have a conf and classes directory, add to BBPATH -BBPATH :=
"${BBPATH}:${LAYERDIR}"
meta-fishriver/conf/layer.conf deleted +0 -2
-
-# We have a recipes directory, add to BBFILES -BBFILES := "${BBFILES}
${LAYERDIR}/recipes-*/*/*.bb \
meta-fishriver/conf/layer.conf deleted +0 -7
-	${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "fishriver"
-BBFILE_PATTERN_fishriver := "^${LAYERDIR}/"
-BBFILE_PRIORITY_fishriver = "6"
-
-LAYERDEPENDS_fishriver = "intel"
meta-fishriver/conf/machine/fishriver.conf deleted +0 -4
deleted file mode 100644
index ec2e87f..0000000
@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: fishriver
-
-#@DESCRIPTION: Machine configuration for Fish River Island systems -#
i.e. Z530/E660 + EG20T
meta-fishriver/conf/machine/fishriver.conf deleted +0 ~~-12~~
-
-PREFERRED_VERSION_linux-yocto ?= "3.4%"
-
-require conf/machine/include/tune-atom.inc
-require conf/machine/include/ia32-base.inc
-
-XSERVER ?= "${XSERVER_IA32_BASE} \
-           ${XSERVER_IA32_EXT} \
-           ${XSERVER_IA32_VESA} \
-           "
-
-APPEND += "video=vesafb vga=0x318"
diff --git a/meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfi g b/meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfi g
deleted file mode 100644
index ffce012..0000000
---
a/meta-fishriver/recipes-bsp/formfactor/formfactor/fishriver/machconfi g
+++ /dev/null
meta-fishriver/conf/machine/fishriver.conf deleted +0 -3
@@ -1,3 +0,0 @@
-# Assume a USB mouse and keyboard are connected
-HAVE_TOUCHSCREEN=0
-HAVE_KEYBOARD=1
diff --git a/meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted file mode 100644
index 54da0ff..0000000
meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted +0 -3
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC = "1"
diff --git a/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fis hriver/xorg.conf b/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fis hriver/xorg.conf
deleted file mode 100644
index da4fc3c..0000000
---
a/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fis hriver/xorg.conf
+++ /dev/null
meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted +0 ~~-26~~
@@ -1,26 +0,0 @@
-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
diff --git a/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1 .bbappend b/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1 .bbappend
deleted file mode 100644
index 72d991c..0000000
---
a/meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1 .bbappend
+++ /dev/null
meta-fishriver/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted +0 -1
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend deleted file mode 100644
index 7a502bd..0000000
meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend deleted +0 -8
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-
-# Update the following to use a different BSP branch or meta SRCREV
-#KBRANCH_fishriver  = "yocto/standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_fishriver ?= XXXX
-#SRCREV_meta_pn-linux-yocto-rt_fishriver ?= XXXX diff --git
a/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend deleted file mode 100644
index a91a425..0000000
meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend deleted +0 -8
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-
-# Update the following to use a different BSP branch or meta SRCREV
-#KBRANCH_fishriver  = "standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_fishriver ?= XXXX
-#SRCREV_meta_pn-linux-yocto-rt_fishriver ?= XXXX diff --git
a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend deleted file mode 100644
index 6ac6ef5..0000000
meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend line 8
Quoted 8 lines
meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend deleted +0 -8
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "yocto/standard/fishriver"
-KERNEL_FEATURES_append_fishriver += " cfg/smp.scc"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?=
"c139592c96722727a9f074515a4061c3820da1a6"
meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend line 9
Quoted 1 line
meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend deleted +0 -1
-SRCREV_meta_pn-linux-yocto_fishriver ?=
"59314a3523e360796419d76d78c6f7d8c5ef2593"
Quoted 8 lines
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend deleted file mode 100644
index 9a2f678..0000000
meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend line 7
Quoted 7 lines
meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend deleted +0 -7
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "standard/default/fishriver"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?=
"969edd015a46eed77d6c3daeffdc299dd06e3397"
meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend line 8
Quoted 1 line
meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend deleted +0 -1
-SRCREV_meta_pn-linux-yocto_fishriver ?=
"5b4c9dc78b5ae607173cc3ddab9bce1b5f78129b"
Quoted 8 lines
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend deleted file mode 100644
index c0d04dc..0000000
meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend line 7
Quoted 7 lines
meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend deleted +0 -7
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "standard/fishriver"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?=
"3fa06aa29078fdb2af431de2d3fdae7d281ba85f"
meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend line 8
Quoted 1 line
meta-fishriver/recipes-kernel/linux/linux-yocto_3.4.bbappend deleted +0 -1
-SRCREV_meta_pn-linux-yocto_fishriver ?=
"5bdc655034a58a7147176a8a882d81e2fd51e4b9"

[email protected]

author

2012-10-10 01:17 UTC #16 lore raw

PATCH v2 5/5 update maintainers of various BSPs

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

BSP maintainership for following BSPs is now transitioned from Tom to Nitin
sugarbay, emenlow, crownbay, jasperforest, chiefriver

Signed-off-by Nitin A Kamble <[email protected]>

---
 MAINTAINERS              |   12 ++++++------
 meta-chiefriver/README   |   11 +++++++++++
 meta-crownbay/README     |    2 +-
 meta-emenlow/README      |    2 +-
 meta-jasperforest/README |    2 +-
 meta-sugarbay/README     |    2 +-
 6 files changed, 21 insertions(+), 10 deletions(-)

MAINTAINERS +6 -6

index 3bf0add..d63ed31 100644
@@ -37,15 +37,15 @@ M:      Kishore Bodke <[email protected]>
 F:      meta-cedartrail/
 
 CHIEFRIVER
-M:	Tom Zanussi <[email protected]>
+M:	Nitin A Kamble<[email protected]>
 F:	meta-chiefriver/
 
 COMMON
-M:	Tom Zanussi <[email protected]>
+M:	Nitin A Kamble<[email protected]>
 F:	common/recipes-core/
 
 CROWNBAY
-M:	Tom Zanussi <[email protected]>
+M:	Nitin A Kamble<[email protected]>
 F:	meta-crownbay/
 
 CRYSTALFOREST

@@ -53,7 +53,7 @@ M:      Kishore Bodke <[email protected]>
 F:      meta-crystalforest/
 
 EMENLOW
-M:	Tom Zanussi <[email protected]>
+M:	Nitin A Kamble<[email protected]>
 F:	meta-emenlow/
 
 FRI2

@@ -61,7 +61,7 @@ M:	Darren Hart <[email protected]>
 F:	meta-fri2/
 
 JASPERFOREST
-M:	Tom Zanussi <[email protected]>
+M:	Nitin A Kamble<[email protected]>
 F:	meta-jasperforest/
 
 N450

@@ -73,6 +73,6 @@ M:      Kishore Bodke <[email protected]>
 F:      meta-romley/
 
 SUGARBAY
-M:	Tom Zanussi <[email protected]>
+M:	Nitin A Kamble<[email protected]>
 F:	meta-sugarbay/

meta-chiefriver/README +11 -0

index 438c293..7c47b02 100644
@@ -24,6 +24,17 @@ This layer depends on:
   branch: master
 
 
+Patches
+=======
+
+Please submit any patches against this BSP to the Yocto mailing list
+([email protected]) and cc: the maintainer:
+
+Maintainer: Nitin A Kamble <[email protected]>
+
+Please see the meta-intel/MAINTAINERS file for more details.
+
+
 Table of Contents
 =================

meta-crownbay/README +1 -1

index f7aeffa..4bc9f31 100644
@@ -32,7 +32,7 @@ Patches
 Please submit any patches against this BSP to the Yocto mailing list
 ([email protected]) and cc: the maintainer:
 
-Maintainer: Tom Zanussi <[email protected]>
+Maintainer: Nitin A Kamble <[email protected]>
 
 Please see the meta-intel/MAINTAINERS file for more details.

meta-emenlow/README +1 -1

index 9bef671..3932718 100644
@@ -36,7 +36,7 @@ Patches
 Please submit any patches against this BSP to the Yocto mailing list
 ([email protected]) and cc: the maintainer:
 
-Maintainer: Tom Zanussi <[email protected]>
+Maintainer: Nitin A Kamble <[email protected]>
 
 Please see the meta-intel/MAINTAINERS file for more details.

meta-jasperforest/README +1 -1

index 78852bd..12f84c2 100644
@@ -31,7 +31,7 @@ Patches
 Please submit any patches against this BSP to the Yocto mailing list
 ([email protected]) and cc: the maintainer:
 
-Maintainer: Tom Zanussi <[email protected]>
+Maintainer: Nitin A Kamble <[email protected]>
 
 Please see the meta-intel/MAINTAINERS file for more details.

meta-sugarbay/README +1 -1

index 80833c1..c8a99d7 100644
@@ -30,7 +30,7 @@ Patches
 Please submit any patches against this BSP to the Yocto mailing list
 ([email protected]) and cc: the maintainer:
 
-Maintainer: Tom Zanussi <[email protected]>
+Maintainer: Nitin A Kamble <[email protected]>
 
 Please see the meta-intel/MAINTAINERS file for more details.

Signature · 1 line

1.7.3.4

Darren Hart

2012-10-10 02:44 UTC #17 lore raw

Re: [PATCHv2 1/5] xf86-video-intel: Bring 2.20.0 version to match released graphics stack

In reply to [email protected]

Quoted 11 lines · On 10/09/2012 06:16 PM, [email protected] wrote:

From: Nitin A Kamble <[email protected]>
The Intel Linux graphics stack version 12.07 released on 2012-07-24 requires version 2.20.0 as seen here:
   http://intellinuxgraphics.org/2012.07.html
Currently oecore has 2.19.0 version. So get this 2.20.0 version in meta-intel layer to be used by sugarbay and other BSPs using the Intel graphics stack.
Also took changes from version 2.20.8 recipe from Ross Burton's branch.

Saw you asked in a bug about the impact of this, I'd like to hear back from Ross on the changes regarding xvmc and PACKAGECONFIG.

--
Darren

Quoted 94 lines

Signed-off-by Nitin A Kamble <[email protected]>

---
 .../xorg-driver/xf86-video-intel_2.20.0.bb         |   27 ++++++++++++++++
 .../xorg-driver/xorg-driver-common.inc             |   33 ++++++++++++++++++++
 .../xorg-driver/xorg-driver-video.inc              |    4 ++
 3 files changed, 64 insertions(+), 0 deletions(-)
 create mode 100644 common/recipes-graphics/xorg-driver/xf86-video-intel_2.20.0.bb
 create mode 100644 common/recipes-graphics/xorg-driver/xorg-driver-common.inc
 create mode 100644 common/recipes-graphics/xorg-driver/xorg-driver-video.inc

common/recipes-graphics/xorg-driver/xf86-video-intel_2.20.0.bb new file +27 -0

new file mode 100644
index 0000000..6cfca03
@@ -0,0 +1,27 @@
+require xorg-driver-video.inc
+
+SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver"
+
+DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \
+chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \
+the driver supports hardware accelerated 3D via the Direct Rendering \
+Infrastructure (DRI)."
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
+
+PR = "${INC_PR}.0"
+
+DEPENDS += "virtual/libx11 drm xf86driproto glproto \
+	    virtual/libgl xineramaproto xf86driproto libpciaccess"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[sna] = "--enable-sna,--disable-sna"
+PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
+
+# --enable-kms-only option is required by ROOTLESS_X
+EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}'
+
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+
+SRC_URI[md5sum] = "070bb866b05a16366bd9bb844c9b91aa"
+SRC_URI[sha256sum] = "21949297220ceda32bba430f778c6409002079dc717c7190dbd1062ab4a56783"

common/recipes-graphics/xorg-driver/xorg-driver-common.inc new file +33 -0

new file mode 100644
index 0000000..1ed2742
@@ -0,0 +1,33 @@
+DESCRIPTION = "X driver"
+HOMEPAGE = "http://www.x.org"
+BUGTRACKER = "https://bugs.freedesktop.org"
+SECTION = "x11/drivers"
+LICENSE = "MIT-X"
+
+PE = "2"
+INC_PR = "r0"
+
+DEPENDS = "virtual/xserver xproto randrproto util-macros"
+
+SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2"
+
+S = "${WORKDIR}/${BPN}-${PV}"
+
+FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
+FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
+
+inherit autotools pkgconfig
+
+# AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement
+# macro that simply assumes the test succeeds. 
+do_configure_prepend () {
+    echo 'AC_DEFUN(CC_AC_CHECK_FILE, $2)' > configure.ac.new
+    sed 's/AC_CHECK_FILE/CC_AC_CHECK_FILE/g' configure.ac >> configure.ac.new
+    mv configure.ac.new configure.ac
+}
+
+# FIXME: We don't want to include the libtool archives (*.la) from modules
+# directory, as they serve no useful purpose. Upstream should fix Makefile.am
+do_install_append() {
+	find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f --
+}

common/recipes-graphics/xorg-driver/xorg-driver-video.inc new file +4 -0

new file mode 100644
index 0000000..57c80d1
@@ -0,0 +1,4 @@
+include xorg-driver-common.inc
+
+DEPENDS =+ "renderproto videoproto xextproto fontsproto"
+

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Burton, Ross

2012-10-10 09:23 UTC #18 lore raw

Re: [PATCHv2 1/5] xf86-video-intel: Bring 2.20.0 version to match released graphics stack

Quoted 2 lines · Darren Hart

Saw you asked in a bug about the impact of this, I'd like to hear back from Ross on the changes regarding xvmc and PACKAGECONFIG.

So everyone hears and not just people on the bug, I'll repeat what I put.

XVMC is disabled by default (as before) but available to be enabled via PACKAGECONFIG.

SNA (new acceleration architecture) is disabled by default but also enabled via PACKAGECONFIG. Enabling SNA adds about 1MB to the binary.

Ross