From adb8971ca1c166f047d46b8668c821a419cf1964 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 4 Feb 2013 08:28:10 +0400 Subject: [PATCH 1/6] atv: add xorg.conf comments to match other builds --- projects/ATV/filesystem/etc/X11/xorg-nvidia.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf b/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf index a3e4bf67a1..dc8c0d4fc0 100644 --- a/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf +++ b/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf @@ -9,6 +9,13 @@ Section "Device" Option "ModeValidation" "NoVesaModes, NoXServerModes" Option "HWCursor" "false" Option "RegistryDwords" "RMDisableRenderToSysmem=1" + # To put Xorg in debug mode change "false" to "true" in the line below: + Option "ModeDebug" "false" + # To use a local /storage/.config/edid.bin file uncomment the 4 lines below +# Option "ConnectedMonitor" "DFP-0" +# Option "CustomEDID" "DFP-0:/storage/.config/edid.bin" +# Option "IgnoreEDID" "false" +# Option "UseEDID" "true" EndSection Section "Screen" From 91ebd27b9e3952143f264ff3dbc95a94bb239b62 Mon Sep 17 00:00:00 2001 From: Mettbrot Date: Mon, 4 Feb 2013 17:16:22 +0100 Subject: [PATCH 2/6] Update README.md When updating openELEC, copy md5 files too. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c3f7558a44..1ddbc66192 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ providing cutting edge hardware support to deliver a set-top box experience. read-only with the exception of /var (containing runtime configuration data). * Manual update/downgrade procedure is as follows: Extract the snapshot and navigate to the 'target' directory. - Copy KERNEL and SYSTEM to the 'Update' network share (or /storage/.update) on + Copy KERNEL and SYSTEM along with KERNEL.md5 and SYSTEM.md5 to the 'Update' network share (or /storage/.update) on your openelec machine. Your system will automatically upgrade during the next reboot. * Automatic mounting of filesystems is supported. Devices such as USB Flash From 37aff83993221258761169837febcff5d8df2451 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 4 Feb 2013 13:52:28 +0200 Subject: [PATCH 3/6] new package: add package 'intel-gpu-tools' --- packages/x11/other/intel-gpu-tools/build | 33 +++++++++++++++++ packages/x11/other/intel-gpu-tools/install | 26 +++++++++++++ packages/x11/other/intel-gpu-tools/meta | 37 +++++++++++++++++++ .../intel-gpu-tools-1.2-disable-cairo.patch | 25 +++++++++++++ 4 files changed, 121 insertions(+) create mode 100755 packages/x11/other/intel-gpu-tools/build create mode 100755 packages/x11/other/intel-gpu-tools/install create mode 100644 packages/x11/other/intel-gpu-tools/meta create mode 100644 packages/x11/other/intel-gpu-tools/patches/intel-gpu-tools-1.2-disable-cairo.patch diff --git a/packages/x11/other/intel-gpu-tools/build b/packages/x11/other/intel-gpu-tools/build new file mode 100755 index 0000000000..db6860a4ff --- /dev/null +++ b/packages/x11/other/intel-gpu-tools/build @@ -0,0 +1,33 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +cd $PKG_BUILD +mkdir -p m4 && do_autoreconf + +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --disable-nouveau \ + +make diff --git a/packages/x11/other/intel-gpu-tools/install b/packages/x11/other/intel-gpu-tools/install new file mode 100755 index 0000000000..cbf471cdad --- /dev/null +++ b/packages/x11/other/intel-gpu-tools/install @@ -0,0 +1,26 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +mkdir -p $INSTALL/usr/bin + cp -R $PKG_BUILD/tools/intel_reg_write $INSTALL/usr/bin diff --git a/packages/x11/other/intel-gpu-tools/meta b/packages/x11/other/intel-gpu-tools/meta new file mode 100644 index 0000000000..e4c11845a8 --- /dev/null +++ b/packages/x11/other/intel-gpu-tools/meta @@ -0,0 +1,37 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="intel-gpu-tools" +PKG_VERSION="1.2" +PKG_REV="1" +PKG_ARCH="i386 x86_64" +PKG_LICENSE="OSS" +PKG_SITE="http://xorg.freedesktop.org" +#PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://cgit.freedesktop.org/xorg/app/intel-gpu-tools/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_DEPENDS="libdrm" +PKG_BUILD_DEPENDS="toolchain libdrm" +PKG_PRIORITY="optional" +PKG_SECTION="x11/other" +PKG_SHORTDESC="tools for debugging the Intel graphics driver" +PKG_LONGDESC="tools for debugging the Intel graphics driver" +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/x11/other/intel-gpu-tools/patches/intel-gpu-tools-1.2-disable-cairo.patch b/packages/x11/other/intel-gpu-tools/patches/intel-gpu-tools-1.2-disable-cairo.patch new file mode 100644 index 0000000000..fe85571c64 --- /dev/null +++ b/packages/x11/other/intel-gpu-tools/patches/intel-gpu-tools-1.2-disable-cairo.patch @@ -0,0 +1,25 @@ +diff --git a/Makefile.am b/Makefile.am +index 6cd724c..9e77183 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -19,7 +19,7 @@ + # 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. + +-SUBDIRS = lib man tools scripts tests benchmarks demos ++SUBDIRS = lib man tools scripts benchmarks demos + + if BUILD_SHADER_DEBUGGER + SUBDIRS += debugger +diff --git a/configure.ac b/configure.ac +index 94d54a6..236904a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,7 +57,6 @@ PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.31 libdrm]) + PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) + + # for testdisplay +-PKG_CHECK_MODULES(CAIRO, cairo) + PKG_CHECK_MODULES(LIBUDEV, [libudev], [udev=yes], [udev=no]) + if test x"$udev" = xyes; then + AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection]) From 2fb1ca693a0def47f11ee9b229169a686774df8f Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 4 Feb 2013 14:14:11 +0200 Subject: [PATCH 4/6] linux: do not disable CONFIG_DEBUG_FS. required for intel-gpu-tools --- packages/linux/unpack | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/linux/unpack b/packages/linux/unpack index 10beb98aaa..9621709a31 100755 --- a/packages/linux/unpack +++ b/packages/linux/unpack @@ -50,13 +50,6 @@ sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD sed -i -e "s|^CONFIG_SWAP=.*$|# CONFIG_SWAP is not set|" $LINUX/.config fi -# dont install some debug stuff on release builds - if [ ! "$DEVTOOLS" = yes ]; then - sed -i -e "s|^CONFIG_DEBUG_FS=.*$|# CONFIG_DEBUG_FS is not set|" $LINUX/.config -# sed -i -e "s|^CONFIG_NET_SCHED=.*$|# CONFIG_NET_SCHED is not set|" $LINUX/.config -# sed -i -e "s|^CONFIG_NET_SCH_NETEM=.*$|# CONFIG_NET_SCH_NETEM is not set|" $LINUX/.config - fi - # copy some extra firmware to linux tree cp -R $PKG_DIR/firmware/* $LINUX/firmware From a28b8d1fa65143bb25e1570230e737776c85059d Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 4 Feb 2013 14:15:34 +0200 Subject: [PATCH 5/6] xf86-video-intel: depend on 'intel-gpu-tools' --- packages/x11/driver/xf86-video-intel/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-intel/meta b/packages/x11/driver/xf86-video-intel/meta index 5e9ae82427..4c99ab510e 100644 --- a/packages/x11/driver/xf86-video-intel/meta +++ b/packages/x11/driver/xf86-video-intel/meta @@ -25,7 +25,7 @@ PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" PKG_SITE="http://intellinuxgraphics.org/" PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="systemd" +PKG_DEPENDS="systemd intel-gpu-tools" PKG_BUILD_DEPENDS="toolchain util-macros fontsproto systemd xorg-server" PKG_PRIORITY="optional" PKG_SECTION="x11/driver" From 3f9a6d33533cc222801a926f739caabe840cd879 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 4 Feb 2013 14:24:59 +0200 Subject: [PATCH 6/6] busybox: mount debugfs --- packages/sysutils/busybox/init.d/01_mount-filesystem | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/sysutils/busybox/init.d/01_mount-filesystem b/packages/sysutils/busybox/init.d/01_mount-filesystem index 290c5ee287..1ae9128f70 100644 --- a/packages/sysutils/busybox/init.d/01_mount-filesystem +++ b/packages/sysutils/busybox/init.d/01_mount-filesystem @@ -31,3 +31,4 @@ progress "mounting needed filesystems" mount -n -t tmpfs none /dev/shm mount -n -t ramfs none /var + mount -n -t debugfs none /sys/kernel/debug