xf86-video-intel: Bring 2.20.0 version to match released graphics stack
PATCH v4 1/8 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.
--- .../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
@@ -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
@@ -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
@@ -0,0 +1,4 @@ +include xorg-driver-common.inc + +DEPENDS =+ "renderproto videoproto xextproto fontsproto" +
Signature · 1 line
1.7.3.4
PATCH v4 2/8 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]
--- meta-crownbay/conf/machine/crownbay.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta-crownbay/conf/machine/crownbay.conf +1 -1
@@ -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
PATCH v4 3/8 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
--- .../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
@@ -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
PATCH v4 4/8 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-Island-2 hardware and BSP has made this
Fish-River-Island hardware and BSP obsolete.
Also we discussed this on the Yocto Execution Tracking Meeting,
and to our knowledge no customer is using (cares about) this BSP now.
--- 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
@@ -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
@@ -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
@@ -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
meta-fishriver/conf/layer.conf deleted +0 -12
@@ -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
@@ -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
@@ -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
@@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PRINC := "${@int(PRINC) + 2}"
meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config/fishriver/xorg.conf 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
meta-fishriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend deleted +0 -1
@@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
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
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
meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend deleted +0 -9
@@ -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
@@ -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
@@ -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
PATCH v4 5/8 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
--- 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
PATCH v4 6/8 mesa-dri.bbappend: avoid conflict with emgd-driver-bin
In reply to [email protected]From: Nitin A Kamble <[email protected]>
Extend the mesa-dri recipe from oecore to avoid conflict with files generated by emgd-driver-bin recipe.
This extention is needed only when emgd-driver-bin recipe is included in the target image, so the code is conditional to run only on the machine with emgd graphics driver.
The emgd binary driver also provides egl, gles1, gles2 library & headers. To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image is bundling the emgd driver.
This commits avoids these build warning
WARNING: The recipe is trying to install files into a shared area when those files already exist. Those files are:
/srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/KHR/khrplatform.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglplatform.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglext.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/EGL/egl.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES/glplatform.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES/gl.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES/glext.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2ext.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2platform.h
This resolves part of the issue reported on the bug:
[Yocto #3238]
--- .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend | 24 ++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) create mode 100644 common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend new file +24 -0
@@ -0,0 +1,24 @@ + +# The emgd binary driver also provides egl, gles1, gles2 library & headers. +# To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image +# is bundling the emgd driver. + +python __anonymous () { + import re + xserver = d.getVar('XSERVER', True) + if 'emgd-driver-bin' in xserver.split(' '): + extra_oeconf = d.getVar('EXTRA_OECONF', True).split() + take_out = ["--enable-egl", "--enable-gles1", "--enable-gles2"] + put_in = ["--disable-egl", "--disable-gles1", "--disable-gles2"] + pattern = re.compile("--with-egl-platforms") + new_extra_oeconf = [ ] + for i in extra_oeconf: + if ( i not in take_out ) and ( not pattern.match(i)): + new_extra_oeconf.append(i) + for i in put_in: + new_extra_oeconf.append(i) + + d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf)) + depends = d.getVar('DEPENDS', True) + d.setVar('DEPENDS', depends + " emgd-driver-bin") +}
Signature · 1 line
1.7.3.4
Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-driver-bin
Quoted 2 lines · On 12 October 2012 00:31, <[email protected]> wrote:
Extend the mesa-dri recipe from oecore to avoid conflict with files generated by emgd-driver-bin recipe.
The commit message should also say what the high level changes were, in this case
common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend line 4
Quoted 2 lines
common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend new file +2
-0+# To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image +# is bundling the emgd driver.
I'm not entirely keen on this level of deep hackery, it looks very
fragile. Is there any difference in the headers installed by emgd
and mesa? An alternative would be to consider mesa a more canonical source of GL headers for the build, and change EMGD to not install
anything to staging. This would mean that emgd wouldn't build-time
provide any virtual/libgl packages, just runtime provides so that the image can be built using EMGD and Mesa's libgl.
FYI, In ross/xorg I've started re-arranging the packaging of mesa, so that the packages are called libgl-mesa and RPROVIDE libgl. I plan to make the same changes to EMGD once I have the shlib resolution sorted.
Ross
Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-driver-bin
Quoted 10 lines
-----Original Message-----
From: Burton, Ross [mailto:[email protected]]
Sent: Friday, October 12, 2012 2:49 AM
To: Kamble, Nitin A
Cc: Zanussi, Tom; Hart, Darren; [email protected]
Subject: Re: [yocto] [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-driver-bin
Quoted 7 lines
Quoted 2 lines · On 12 October 2012 00:31, <[email protected]> wrote:
Extend the mesa-dri recipe from oecore to avoid conflict with files generated by emgd-driver-bin recipe.
The commit message should also say what the high level changes were, in this case
The information about high level change is in the next lines in the comment. As seen in the lines bellow here.
Quoted 5 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+# To avoid conflict disable egl, gles1, gles2 from meta-dri if the +BSP image # is bundling the emgd driver.I'm not entirely keen on this level of deep hackery, it looks very fragile.
What seems like the hackery here, is simple change to EXTRA_OECONF variable of the mesa-dri recipe. But the way original mesa-dri recipe is written, there is no simpler bitbake way to change EXTRA_OECONF.
Quoted 2 lines
Is there any difference in the headers installed by emgd
and mesa?
Yes, there are differences, the EMGD recipe is providing GL implementation at ABI level which has not going in the open source version of mesa-dri.
Quoted 6 lines
An alternative would be to consider mesa a more canonical source of GL headers for the build, and change EMGD to not install
anything to staging. This would mean that emgd wouldn't build-time
provide any virtual/libgl packages, just runtime provides so that the image can be built using EMGD and Mesa's libgl.
There is a reason EMGD recipe is providing these GL libraries in binary form and not in the source form, I think there is EMGD specific proprietary code in these libraries. I can check with EMGD guys to confirm this.
Quoted 4 lines
FYI, In ross/xorg I've started re-arranging the packaging of mesa, so that the packages are called libgl-mesa and RPROVIDE libgl. I plan to make the same changes to EMGD once I have the shlib resolution sorted.
Looks like this kind of packaging change would not change functionality of both recipes.
Cheers,
Nitin
Quoted 1 line
Ross
Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-driver-bin
In reply to [email protected]Quoted 55 lines · On 10/11/2012 04:31 PM, [email protected] wrote:
From: Nitin A Kamble <[email protected]>
Extend the mesa-dri recipe from oecore to avoid conflict with files generated by emgd-driver-bin recipe.
This extention is needed only when emgd-driver-bin recipe is included in the target image, so the code is conditional to run only on the machine with emgd graphics driver.
The emgd binary driver also provides egl, gles1, gles2 library & headers. To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image is bundling the emgd driver.
This commits avoids these build warning
WARNING: The recipe is trying to install files into a shared area when those files already exist. Those files are:
/srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/KHR/khrplatform.h/srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglplatform.h/srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglext.h/srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/EGL/egl.h/srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES/glplatform.h/srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES/gl.h/srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES/glext.h/srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2ext.h/srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2.h/srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2platform.hThis resolves part of the issue reported on the bug:
[Yocto #3238]Signed-off-by Nitin A Kamble <[email protected]>--- .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend | 24 ++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) create mode 100644 common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappendcommon/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend new file +13
-0@@ -0,0 +1,24 @@ + +# The emgd binary driver also provides egl, gles1, gles2 library & headers. +# To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image +# is bundling the emgd driver. + +python __anonymous () { + import re + xserver = d.getVar('XSERVER', True) + if 'emgd-driver-bin' in xserver.split(' '): + extra_oeconf = d.getVar('EXTRA_OECONF', True).split() + take_out = ["--enable-egl", "--enable-gles1", "--enable-gles2"] + put_in = ["--disable-egl", "--disable-gles1", "--disable-gles2"] + pattern = re.compile("--with-egl-platforms")
common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend line 23
Quoted 10 lines
common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend new file +10
-0+ new_extra_oeconf = [ ] + for i in extra_oeconf: + if ( i not in take_out ) and ( not pattern.match(i)): + new_extra_oeconf.append(i) + for i in put_in: + new_extra_oeconf.append(i) + + d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf)) + depends = d.getVar('DEPENDS', True) + d.setVar('DEPENDS', depends + " emgd-driver-bin")
Odd mix of whitespace and tabs above.
Also, I have to agree with Ross. This places very specific knowledge of an external package in the general purpose recipe. This is opposite of how these things should be built up.
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel
Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-driver-bin
Quoted 94 lines
-----Original Message-----
From: Hart, Darren
Sent: Monday, October 15, 2012 9:10 AM
To: Kamble, Nitin A
Cc: Zanussi, Tom; [email protected]
Subject: Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd- driver-binQuoted 9 lines · On 10/11/2012 04:31 PM, [email protected] wrote:
From: Nitin A Kamble <[email protected]>
Extend the mesa-dri recipe from oecore to avoid conflict with files generated by emgd-driver-bin recipe.
This extention is needed only when emgd-driver-bin recipe is included in the target image, so the code is conditional to run only on the machine with emgd graphics driver.
Quoted 7 lines
The emgd binary driver also provides egl, gles1, gles2 library & headers. To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image is bundling the emgd driver.
This commits avoids these build warning
WARNING: The recipe is trying to install files into a shared area when those
files already exist. Those files are:
Quoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/KHR/khrplatform.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglplatform.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglext.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/EGL/egl.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/GLES/glplatform.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/GLES/gl.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/GLES/glext.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2ext.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2.hQuoted 2 lines
/srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/u
Quoted 8 lines
sr/include/GLES2/gl2platform.hThis resolves part of the issue reported on the bug:
[Yocto #3238]Signed-off-by Nitin A Kamble <[email protected]>--- .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend | 24++++++++++++++++++++
Quoted 23 lines
1 files changed, 24 insertions(+), 0 deletions(-) create mode 100644common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend new file +13
-0@@ -0,0 +1,24 @@ + +# The emgd binary driver also provides egl, gles1, gles2 library & headers. +# To avoid conflict disable egl, gles1, gles2 from meta-dri if the +BSP image # is bundling the emgd driver. + +python __anonymous () { + import re + xserver = d.getVar('XSERVER', True) + if 'emgd-driver-bin' in xserver.split(' '): + extra_oeconf = d.getVar('EXTRA_OECONF', True).split() + take_out = ["--enable-egl", "--enable-gles1", "--enable-gles2"] + put_in = ["--disable-egl", "--disable-gles1", "--disable-gles2"] + pattern = re.compile("--with-egl-platforms")common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend line 23
Quoted 10 lines
common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend new file +10
-0+ new_extra_oeconf = [ ] + for i in extra_oeconf: + if ( i not in take_out ) and ( not pattern.match(i)): + new_extra_oeconf.append(i) + for i in put_in: + new_extra_oeconf.append(i) + + d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf)) + depends = d.getVar('DEPENDS', True) + d.setVar('DEPENDS', depends + " emgd-driver-bin")Odd mix of whitespace and tabs above.
Quoted 4 lines
Also, I have to agree with Ross. This places very specific knowledge of an external package in the general purpose recipe. This is opposite of how these things should be built up.
Whitespace issues can be solved easily. But if this solution is not acceptable, then I am not sure how to solve the issue. Do we push the issue to 1.4?
Nitin
Quoted 4 lines
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-driver-bin
Quoted 94 lines · Nitin A
Quoted 94 lines
-----Original Message-----
From: Hart, Darren
Sent: Monday, October 15, 2012 9:10 AM
To: Kamble, Nitin A
Cc: Zanussi, Tom; [email protected]
Subject: Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd- driver-binQuoted 9 lines · On 10/11/2012 04:31 PM, [email protected] wrote:
From: Nitin A Kamble <[email protected]>
Extend the mesa-dri recipe from oecore to avoid conflict with files generated by emgd-driver-bin recipe.
This extention is needed only when emgd-driver-bin recipe is included in the target image, so the code is conditional to run only on the machine with emgd graphics driver.
Quoted 7 lines
The emgd binary driver also provides egl, gles1, gles2 library & headers. To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image is bundling the emgd driver.
This commits avoids these build warning
WARNING: The recipe is trying to install files into a shared area when those
files already exist. Those files are:
Quoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/KHR/khrplatform.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglplatform.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglext.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/EGL/egl.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/GLES/glplatform.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/GLES/gl.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/GLES/glext.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2ext.hQuoted 1 line
/srv/home/nitin/build-test-bsps/build-
crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2.hQuoted 2 lines
/srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/u
Quoted 8 lines
sr/include/GLES2/gl2platform.hThis resolves part of the issue reported on the bug:
[Yocto #3238]Signed-off-by Nitin A Kamble <[email protected]>--- .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend | 24++++++++++++++++++++
Quoted 23 lines
1 files changed, 24 insertions(+), 0 deletions(-) create mode 100644common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend new file +13
-0@@ -0,0 +1,24 @@ + +# The emgd binary driver also provides egl, gles1, gles2 library & headers. +# To avoid conflict disable egl, gles1, gles2 from meta-dri if the +BSP image # is bundling the emgd driver. + +python __anonymous () { + import re + xserver = d.getVar('XSERVER', True) + if 'emgd-driver-bin' in xserver.split(' '): + extra_oeconf = d.getVar('EXTRA_OECONF', True).split() + take_out = ["--enable-egl", "--enable-gles1", "--enable-gles2"] + put_in = ["--disable-egl", "--disable-gles1", "--disable-gles2"] + pattern = re.compile("--with-egl-platforms")common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend line 23
Quoted 10 lines
common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend new file +10
-0+ new_extra_oeconf = [ ] + for i in extra_oeconf: + if ( i not in take_out ) and ( not pattern.match(i)): + new_extra_oeconf.append(i) + for i in put_in: + new_extra_oeconf.append(i) + + d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf)) + depends = d.getVar('DEPENDS', True) + d.setVar('DEPENDS', depends + " emgd-driver-bin")Odd mix of whitespace and tabs above.
Quoted 6 lines
Quoted 4 lines
Also, I have to agree with Ross. This places very specific knowledge of an external package in the general purpose recipe. This is opposite of how these things should be built up.
Whitespace issues can be solved easily. But if this solution is not acceptable, then I am not sure how to solve the issue. Do we push the issue to 1.4?
Can you define a variable that EXTRA_OECONF includes which can be manipulated in a bbappend in the meta-intel? This would keep this complex logic out of the core recipe and move into the place that actually needs it.
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel
Re: [PATCHv4 6/8] mesa-dri.bbappend: avoid conflict with emgd-driver-bin
Quoted 40 lines
Quoted 10 lines
Quoted 10 lines
common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend line 2
Quoted 10 lines
common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend new file +2
-0@@ -0,0 +1,24 @@ + +# The emgd binary driver also provides egl, gles1, gles2 library &headers.
Quoted 29 lines
Quoted 28 lines
Quoted 11 lines
common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend new file +11
-0+# To avoid conflict disable egl, gles1, gles2 from meta-dri if the +BSP image # is bundling the emgd driver. + +python __anonymous () { + import re + xserver = d.getVar('XSERVER', True) + if 'emgd-driver-bin' in xserver.split(' '): + extra_oeconf = d.getVar('EXTRA_OECONF', True).split() + take_out = ["--enable-egl", "--enable-gles1", "--enable-gles2"] + put_in = ["--disable-egl", "--disable-gles1", "--disable-gles2"] + pattern = re.compile("--with-egl-platforms")common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend line 23
Quoted 10 lines
common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend new file +10
-0+ new_extra_oeconf = [ ] + for i in extra_oeconf: + if ( i not in take_out ) and ( not pattern.match(i)): + new_extra_oeconf.append(i) + for i in put_in: + new_extra_oeconf.append(i) + + d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf)) + depends = d.getVar('DEPENDS', True) + d.setVar('DEPENDS', depends + " emgd-driver-bin")Odd mix of whitespace and tabs above.
Also, I have to agree with Ross. This places very specific knowledge of an external package in the general purpose recipe. This is opposite of how these things should be built up.
Quoted 7 lines
Quoted 1 line
Whitespace issues can be solved easily. But if this solution is not
acceptable, then I am not sure how to solve the issue. Do we push the issue to 1.4?
Can you define a variable that
EXTRA_OECONFincludes which can be manipulated in a bbappend in the meta-intel? This would keep this complex logic out of the core recipe and move into the place that actually needs it.
If we can modify the recipe in poky, then this method is not needed to achieve same thing. But because of release we may not be able to do it.
Nitin
Quoted 5 lines
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
PATCH v4 7/8 emgd-driver-bin: note all the EMGD licenses
In reply to [email protected]From: Nitin A Kamble <[email protected]>
There are two files containing the custom license data for EMGD:
license: which holds INTEL SOFTWARE LICENSE AGREEMENT readme.txt: which holds User Space Graphics Driver Binary License
checksum both these files to track any license changes in future.
--- .../xorg-driver/emgd-driver-bin_1.14.bb | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb +3 -2
@@ -5,7 +5,7 @@ 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.14' and you need to add \ to LICENSE_FLAGS_WHITELIST += \"License_emgd-driver-bin_1.14\" to your \ local.conf in order to enable it in a build." -LICENSE = "Intel-binary-only" +LICENSE = "Intel-software-license-emgd-1.14 & Intel-user-space-graphics-driver-binary-license-emgd-1.14" LICENSE_FLAGS = "license_${PN}_${PV}" PR = "r2"
@@ -13,7 +13,8 @@ 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" +LIC_FILES_CHKSUM = "file://${WORKDIR}/${EMGD_LIC_DIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d \ + file://${WORKDIR}/${EMGD_LIC_DIR}/readme.txt;md5=73cbec7a0d2bc22faf567238e055bfc8" DEPENDS = "rpm-native xz-native" RDEPENDS = "libxcb-dri2"
Signature · 1 line
1.7.3.4
PATCH v4 8/8 custom-licenses dir for emgd recipe Licenses
In reply to [email protected]From: Nitin A Kamble <[email protected]>
Add a directory common/custom-licenses to store license texts of recipes in meta-intel layer using custom licenses.
Adding these licenses text for emgd-driver-bin recipe:
- Intel-software-license-emgd-1.14
- Intel-user-space-graphics-driver-binary-license-emgd-1.14
This takes care of this build warning:
WARNING: emgd-driver-bin: No generic license file exists for: Intel-binary-only in any provider
This addresses one of the issue reported in the bug:
[YOCTO #3238]
--- .../Intel-software-license-emgd-1.14 | 42 ++ ...-space-graphics-driver-binary-license-emgd-1.14 | 559 ++++++++++++++++++++ conf/layer.conf | 3 + 3 files changed, 604 insertions(+), 0 deletions(-) create mode 100644 common/custom-licenses/Intel-software-license-emgd-1.14 create mode 100644 common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.14
common/custom-licenses/Intel-software-license-emgd-1.14 new file +42 -0
@@ -0,0 +1,42 @@ +INTEL SOFTWARE LICENSE AGREEMENT + +IMPORTANT - READ BEFORE COPYING, INSTALLING OR USING. + +Do not use or load this software and any associated materials (collectively, the "Software") until you have carefully read the following terms and conditions. By loading or using the Software, you agree to the terms of this Agreement. If you do not wish to so agree, do not install or use the Software. + +* The Linux DRM kernel source code, when included with this Software, is not subject to the terms of this Agreement but is subject to the �GNU General Public License Version 2�, which may be obtained at the following web site: http://www.gnu.org/licenses/gpl.txt + +* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. (copyright may need to be changed) + * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining 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 (including the next paragraph) 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 PRECISION INSIGHT AND/OR ITS +* SUPPLIERS 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. + + +Copyright (c) 2011, Intel Corporation. +All rights reserved. + +Redistribution. Redistribution and use in binary form, without modification, are permitted provided that the following conditions are met: + +� Redistributions must reproduce the above copyright notice and the following disclaimer in the documentation and/or other materials provided with the distribution. +� Neither the name of Intel Corporation nor the names of its suppliers may be used to endorse or promote products derived from this software without specific prior written permission. +� No reverse engineering, decompilation, or disassembly of this software is permitted. +� �Binary form� includes any format commonly used for electronic conveyance which is a reversible, bit-exact translation of binary representation to ASCII or ISO text, for example, �uuencode.� + +DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.14 new file +559 -0
559 lines not on this page · raw message
conf/layer.conf +3 -0
@@ -8,3 +8,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "intel" BBFILE_PATTERN_intel := "^${LAYERDIR}/" BBFILE_PRIORITY_intel = "5" + +# Additional license directories. +LICENSE_PATH += "${LAYERDIR}/common/custom-licenses"
Signature · 1 line
1.7.3.4
v4 cover Misc meta-intel commits
From: Nitin A Kamble <[email protected]>
This v4 pull request add these extra commits compared to v3
mesa-dri.bbappend: avoid conflict with emgd-driver-bin
emgd-driver-bin: note all the EMGD licenses custom-licenses dir for emgd recipe Licenses
Thanks,
Nitin
The following changes since commit 5d8a05811101f7d69994f4028ec620c4480f6da4:
Fix use of PRINC in meta-intel BSPs (2012-10-09 16:04:30 -0700)
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 (8):
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
mesa-dri.bbappend: avoid conflict with emgd-driver-bin
emgd-driver-bin: note all the EMGD licenses custom-licenses dir for emgd recipe Licenses
MAINTAINERS | 16 +- .../Intel-software-license-emgd-1.14 | 42 ++ ...-space-graphics-driver-binary-license-emgd-1.14 | 559 ++++++++++++++++++++ .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend | 24 + .../xorg-driver/emgd-driver-bin_1.10.bb | 93 ---- .../xorg-driver/emgd-driver-bin_1.14.bb | 5 +- .../xorg-driver/xf86-video-intel_2.20.0.bb | 27 + .../xorg-driver/xorg-driver-common.inc | 33 ++ .../xorg-driver/xorg-driver-video.inc | 4 + conf/layer.conf | 3 + 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 +- 30 files changed, 717 insertions(+), 361 deletions(-) create mode 100644 common/custom-licenses/Intel-software-license-emgd-1.14 create mode 100644 common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.14 create mode 100644 common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend 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
Re: [PATCHv4 0/8] Misc meta-intel commits
Quoted 7 lines · On Thu, 2012-10-11 at 16:30 -0700, [email protected] wrote:
From: Nitin A Kamble <[email protected]>
This v4 pull request add these extra commits compared to v3
mesa-dri.bbappend: avoid conflict with emgd-driver-bin
emgd-driver-bin: note all the EMGD licenses custom-licenses dir for emgd recipe Licenses
All except 'mesa-dri.bbappend: avoid conflict with emgd-driver-bin' pulled in to meta-intel/master.
The one change I made was to tweak the commit subject lines to the proper format for each of the commits that didn't have the normal [component: short-description] form like the other commits in meta-intel.
Thanks,
Tom
Quoted 77 lines
Thanks,
NitinThe following changes since commit
5d8a05811101f7d69994f4028ec620c4480f6da4:Fix use of PRINC in meta-intel BSPs (2012-10-09 16:04:30 -0700)
are available in the git repository at:
git://git.yoctoproject.org/meta-intel-contribnitin/misc
http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin/miscNitin A Kamble (8):
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
mesa-dri.bbappend: avoid conflict with emgd-driver-bin
emgd-driver-bin: note all the EMGD licenses custom-licenses dir for emgd recipe LicensesMAINTAINERS | 16 +- .../Intel-software-license-emgd-1.14 | 42 ++ ...-space-graphics-driver-binary-license-emgd-1.14 | 559 ++++++++++++++++++++ .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend | 24 + .../xorg-driver/emgd-driver-bin_1.10.bb | 93 ---- .../xorg-driver/emgd-driver-bin_1.14.bb | 5 +- .../xorg-driver/xf86-video-intel_2.20.0.bb | 27 + .../xorg-driver/xorg-driver-common.inc | 33 ++ .../xorg-driver/xorg-driver-video.inc | 4 + conf/layer.conf | 3 + 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 +- 30 files changed, 717 insertions(+), 361 deletions(-) create mode 100644 common/custom-licenses/Intel-software-license-emgd-1.14 create mode 100644 common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.14 create mode 100644 common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend 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