From b141ffba3917e1ae953b19d82de0919758aba0af Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 7 Jun 2011 15:04:47 +0200 Subject: [PATCH 01/11] glib: update to glib-2.28.8 Signed-off-by: Stephan Raue --- packages/devel/glib/build | 23 ++++++++++++++--------- packages/devel/glib/meta | 6 +++--- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/packages/devel/glib/build b/packages/devel/glib/build index dee27b4291..3f407e3bf9 100755 --- a/packages/devel/glib/build +++ b/packages/devel/glib/build @@ -29,33 +29,38 @@ cd $PKG_BUILD mkdir -p .build-target && cd .build-target +ac_cv_func_mmap_fixed_mapped='yes' \ ac_cv_func_posix_getpwuid_r='yes' \ ac_cv_func_posix_getgrgid_r='yes' \ -glib_cv_uscore='no' \ +ac_cv_func_printf_unix98='yes' \ +ac_cv_func_snprintf_c99='yes' \ +ac_cv_func_vsnprintf_c99='yes' \ glib_cv_stack_grows='no' \ +glib_cv_uscore='no' \ +glib_cv_va_val_copy='no' \ ../configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-shared \ - --disable-static \ - --disable-debug \ --disable-silent-rules \ + --disable-debug \ + --disable-static \ + --enable-shared \ --disable-selinux \ --disable-fam \ --enable-xattr \ --enable-regex \ - --with-gnu-ld \ - --with-threads=posix \ + --disable-gtk-doc \ --disable-man \ --disable-dtrace \ --disable-systemtap \ --disable-gcov \ - --with-libiconv \ --enable-Bsymbolic \ - --disable-rebuilds \ - --disable-gtk-doc \ + --with-gnu-ld \ + --with-threads=posix \ + --with-pcre=system \ + --with-libiconv \ make diff --git a/packages/devel/glib/meta b/packages/devel/glib/meta index bf2bf5e815..c069832ebb 100644 --- a/packages/devel/glib/meta +++ b/packages/devel/glib/meta @@ -19,14 +19,14 @@ ################################################################################ PKG_NAME="glib" -PKG_VERSION="2.28.7" +PKG_VERSION="2.28.8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.28/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="zlib libiconv" -PKG_BUILD_DEPENDS="toolchain zlib libiconv gtk-doc glib-host" +PKG_DEPENDS="zlib libiconv pcre" +PKG_BUILD_DEPENDS="toolchain zlib libiconv pcre gtk-doc glib-host" PKG_PRIORITY="optional" PKG_SECTION="devel" PKG_SHORTDESC="glib: C support library" From f51c6c2b8681558f94c9f028a23267808d13964c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 7 Jun 2011 17:30:00 +0200 Subject: [PATCH 02/11] ConsoleKit: add proper shutdown and reboot helper scripts Signed-off-by: Stephan Raue --- packages/sysutils/ConsoleKit/install | 7 ++++--- packages/sysutils/ConsoleKit/scripts/ck-system-restart | 9 +++++++++ packages/sysutils/ConsoleKit/scripts/ck-system-stop | 9 +++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100755 packages/sysutils/ConsoleKit/scripts/ck-system-restart create mode 100755 packages/sysutils/ConsoleKit/scripts/ck-system-stop diff --git a/packages/sysutils/ConsoleKit/install b/packages/sysutils/ConsoleKit/install index f1af2e7fcf..dc6238b008 100755 --- a/packages/sysutils/ConsoleKit/install +++ b/packages/sysutils/ConsoleKit/install @@ -52,8 +52,10 @@ mkdir -p $INSTALL/usr/lib/ConsoleKit mkdir -p $INSTALL/usr/lib/ConsoleKit/run-seat.d mkdir -p $INSTALL/usr/lib/ConsoleKit/run-session.d mkdir -p $INSTALL/usr/lib/ConsoleKit/scripts - cp -P $PKG_BUILD/tools/linux/ck-system-restart $INSTALL/usr/lib/ConsoleKit/scripts - cp -P $PKG_BUILD/tools/linux/ck-system-stop $INSTALL/usr/lib/ConsoleKit/scripts +# cp -P $PKG_BUILD/tools/linux/ck-system-restart $INSTALL/usr/lib/ConsoleKit/scripts +# cp -P $PKG_BUILD/tools/linux/ck-system-stop $INSTALL/usr/lib/ConsoleKit/scripts + cp -P $PKG_DIR/scripts/ck-system-restart $INSTALL/usr/lib/ConsoleKit/scripts + cp -P $PKG_DIR/scripts/ck-system-stop $INSTALL/usr/lib/ConsoleKit/scripts mkdir -p $INSTALL/usr/share/dbus-1/interfaces cp -P $PKG_BUILD/src/org.freedesktop.ConsoleKit.Manager.xml $INSTALL/usr/share/dbus-1/interfaces @@ -65,4 +67,3 @@ mkdir -p $INSTALL/usr/share/dbus-1/system-services mkdir -p $INSTALL/usr/share/polkit-1/actions cp -P $PKG_BUILD/data/org.freedesktop.consolekit.policy $INSTALL/usr/share/polkit-1/actions - diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-restart b/packages/sysutils/ConsoleKit/scripts/ck-system-restart new file mode 100755 index 0000000000..d8a60faa81 --- /dev/null +++ b/packages/sysutils/ConsoleKit/scripts/ck-system-restart @@ -0,0 +1,9 @@ +#!/bin/sh + +#Try for common tools +if [ -x "/sbin/reboot" ] ; then + /sbin/reboot + exit $? +else + exit 1 +fi diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-stop b/packages/sysutils/ConsoleKit/scripts/ck-system-stop new file mode 100755 index 0000000000..6b40407703 --- /dev/null +++ b/packages/sysutils/ConsoleKit/scripts/ck-system-stop @@ -0,0 +1,9 @@ +#!/bin/sh + +#Try for common tools +if [ -x "/sbin/poweroff" ] ; then + /sbin/poweroff + exit $? +else + exit 1 +fi From 1e6ba853d6101095c6cd8d711f9fcc15f80d0486 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 7 Jun 2011 17:31:47 +0200 Subject: [PATCH 03/11] ConsoleKit: rework init script Signed-off-by: Stephan Raue --- packages/sysutils/ConsoleKit/init.d/34_ConsoleKit | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/sysutils/ConsoleKit/init.d/34_ConsoleKit b/packages/sysutils/ConsoleKit/init.d/34_ConsoleKit index aebb3ad2ed..c72203e234 100644 --- a/packages/sysutils/ConsoleKit/init.d/34_ConsoleKit +++ b/packages/sysutils/ConsoleKit/init.d/34_ConsoleKit @@ -22,12 +22,10 @@ # # runlevels: openelec, textmode -( - progress "starting ConsoleKit daemon" +progress "starting ConsoleKit daemon" - install -m 755 -d /var/log/ConsoleKit - install -m 755 -d /var/run/ConsoleKit + install -m 755 -d /var/log/ConsoleKit + install -m 755 -d /var/run/ConsoleKit + + console-kit-daemon - console-kit-daemon - ck-launch-session -)& From 7906900bacda5c913e5f78420e238f829ca1a72c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 7 Jun 2011 21:34:28 +0200 Subject: [PATCH 04/11] ConsoleKit: simplyfing stop and reboot scripts, add license headers Signed-off-by: Stephan Raue --- .../ConsoleKit/scripts/ck-system-restart | 28 ++++++++++++++----- .../ConsoleKit/scripts/ck-system-stop | 28 ++++++++++++++----- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-restart b/packages/sysutils/ConsoleKit/scripts/ck-system-restart index d8a60faa81..003c352270 100755 --- a/packages/sysutils/ConsoleKit/scripts/ck-system-restart +++ b/packages/sysutils/ConsoleKit/scripts/ck-system-restart @@ -1,9 +1,23 @@ #!/bin/sh -#Try for common tools -if [ -x "/sbin/reboot" ] ; then - /sbin/reboot - exit $? -else - exit 1 -fi +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +reboot diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-stop b/packages/sysutils/ConsoleKit/scripts/ck-system-stop index 6b40407703..a6e24e8385 100755 --- a/packages/sysutils/ConsoleKit/scripts/ck-system-stop +++ b/packages/sysutils/ConsoleKit/scripts/ck-system-stop @@ -1,9 +1,23 @@ #!/bin/sh -#Try for common tools -if [ -x "/sbin/poweroff" ] ; then - /sbin/poweroff - exit $? -else - exit 1 -fi +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +poweroff From 2a4ae395fc4d2b7e56e7a2d1565dfe7f52129e7b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 7 Jun 2011 21:42:45 +0200 Subject: [PATCH 05/11] xf86-video-nvidia: update to xf86-video-nvidia-275.09.04 Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-nvidia/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-nvidia/meta b/packages/x11/driver/xf86-video-nvidia/meta index feced14386..65c8a53dce 100644 --- a/packages/x11/driver/xf86-video-nvidia/meta +++ b/packages/x11/driver/xf86-video-nvidia/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-nvidia" -PKG_VERSION="275.09" +PKG_VERSION="275.09.04" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="nonfree" From df5d7e45cf7bafc58a56e889834e0e3079d7ff9f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 7 Jun 2011 21:50:45 +0200 Subject: [PATCH 06/11] util-linux: run fsck only on partitions Signed-off-by: Stephan Raue --- packages/sysutils/util-linux/udev.d/10-fsck.rules | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/sysutils/util-linux/udev.d/10-fsck.rules b/packages/sysutils/util-linux/udev.d/10-fsck.rules index 9ffbafe59a..e2af879c71 100644 --- a/packages/sysutils/util-linux/udev.d/10-fsck.rules +++ b/packages/sysutils/util-linux/udev.d/10-fsck.rules @@ -20,6 +20,7 @@ ################################################################################ SUBSYSTEM!="block", GOTO="end" +DEVTYPE!="partition", GOTO="end" ACTION=="add|change", RUN+="/sbin/fsck -M -T -a /dev/%k" From e5112ab2d7e806f4ace614ca0583630cd3e34b3c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 7 Jun 2011 21:51:14 +0200 Subject: [PATCH 07/11] ConsoleKit: dont start console-kit-daemon on boot Signed-off-by: Stephan Raue --- packages/sysutils/ConsoleKit/init.d/34_ConsoleKit | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/sysutils/ConsoleKit/init.d/34_ConsoleKit b/packages/sysutils/ConsoleKit/init.d/34_ConsoleKit index c72203e234..40f3efa16f 100644 --- a/packages/sysutils/ConsoleKit/init.d/34_ConsoleKit +++ b/packages/sysutils/ConsoleKit/init.d/34_ConsoleKit @@ -27,5 +27,3 @@ progress "starting ConsoleKit daemon" install -m 755 -d /var/log/ConsoleKit install -m 755 -d /var/run/ConsoleKit - console-kit-daemon - From 097b4049f42b9ff70615c35578dccf1fd523b1be Mon Sep 17 00:00:00 2001 From: Travis Glenn Hansen Date: Tue, 7 Jun 2011 11:35:37 -0600 Subject: [PATCH 08/11] making init check for /flash/MACH_KERNEL instead of /flash/atv_single_boot for update forcefully disabling when 'nvidia' is in the list of GRAPHIC_DRIVERS letting atv-bootloader include default initrd in the kernel --- packages/initramfs/sysutils/busybox-initramfs/scripts/init | 2 +- packages/linux/unpack | 2 ++ packages/tools/atv-bootloader/build | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init index 127fb8348a..87281929ff 100755 --- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init +++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init @@ -120,7 +120,7 @@ REBOOT="0" mount_part "$boot" "/flash" "ro,noatime" - if [ -f "/flash/atv_single_boot" ]; then + if [ -f "/flash/MACH_KERNEL" ]; then IMAGE_KERNEL="MACH_KERNEL" fi diff --git a/packages/linux/unpack b/packages/linux/unpack index 9523cd3a1a..60df5d8b7f 100755 --- a/packages/linux/unpack +++ b/packages/linux/unpack @@ -41,6 +41,8 @@ cp $KERNEL_CFG_FILE $LINUX/.config sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD/image/initramfs.cpio\"|" \ $LINUX/.config +# wipe out nouveau if GRAPHICS_DRIVERS contains nvidia +echo $GRAPHIC_DRIVERS | grep "nvidia" &>/dev/null && sed -i '/NOUVEAU/ d' $LINUX/.config && echo "# CONFIG_DRM_NOUVEAU is not set" >> $LINUX/.config # copy some extra firmware to linux tree cp -R $PKG_DIR/firmware/* $LINUX/firmware diff --git a/packages/tools/atv-bootloader/build b/packages/tools/atv-bootloader/build index e2834b3f91..423f7d5dbe 100755 --- a/packages/tools/atv-bootloader/build +++ b/packages/tools/atv-bootloader/build @@ -27,7 +27,7 @@ cd $PKG_BUILD cp -PR $(kernel_path)/arch/x86/boot/bzImage vmlinuz make clean -make LDFLAGS="" KERN_OBJ="vmlinuz.obj" \ +make LDFLAGS="" \ CC="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-gcc-4.0.1" \ LD="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-ld" From ae1816c106f01a5effd542fdf2087d0441f0060c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 7 Jun 2011 22:22:03 +0200 Subject: [PATCH 09/11] eventlircd: remap KEY_TITLE to KEY_SUBTITLE Signed-off-by: Stephan Raue --- packages/sysutils/remote/eventlircd/evmap/ircore.evmap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/sysutils/remote/eventlircd/evmap/ircore.evmap b/packages/sysutils/remote/eventlircd/evmap/ircore.evmap index 0960123c3d..792099c205 100644 --- a/packages/sysutils/remote/eventlircd/evmap/ircore.evmap +++ b/packages/sysutils/remote/eventlircd/evmap/ircore.evmap @@ -34,4 +34,5 @@ KEY_TEXT = KEY_TEXT KEY_EPG = KEY_EPG KEY_ENTER = KEY_OK -KEY_PLAYPAUSE = KEY_PLAY \ No newline at end of file +KEY_PLAYPAUSE = KEY_PLAY +KEY_TITLE = KEY_SUBTITLE From 6338a377912f63e4eba31b185f96f61af1c4050b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 7 Jun 2011 23:14:31 +0200 Subject: [PATCH 10/11] installer: specify filesystemtype on mount Signed-off-by: Stephan Raue --- packages/tools/installer/scripts/installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/installer/scripts/installer b/packages/tools/installer/scripts/installer index ea8ec4503b..ab76c2ac7a 100755 --- a/packages/tools/installer/scripts/installer +++ b/packages/tools/installer/scripts/installer @@ -228,7 +228,7 @@ do_install_quick() { mkdir -p $TMPDIR/part1 >> $LOGFILE 2>&1 msg_progress_install "40" "mounting ${INSTALL_DEVICE}1 to $TMPDIR/part1" - mount ${INSTALL_DEVICE}1 $TMPDIR/part1 >> $LOGFILE 2>&1 + mount -t ext4 ${INSTALL_DEVICE}1 $TMPDIR/part1 >> $LOGFILE 2>&1 # installing extlinux msg_progress_install "50" "installing extlinux to $TMPDIR/part1" From 1dc2816ebde771adfc23f7ac22053a9fa0ffec98 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 7 Jun 2011 23:16:02 +0200 Subject: [PATCH 11/11] xbmc: add KEY_LANGUAGE to Lircmap.xml Signed-off-by: Stephan Raue --- .../xbmc-10.1-Dharma-463-add_remote_devinput-0.1.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-463-add_remote_devinput-0.1.patch index c88c658d86..6fba762884 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-463-add_remote_devinput-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-463-add_remote_devinput-0.1.patch @@ -1,6 +1,6 @@ -diff -Naur xbmc-Dharma-10.1-c8405db/system/Lircmap.xml xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml ---- xbmc-Dharma-10.1-c8405db/system/Lircmap.xml 2011-02-15 14:28:59.646158376 +0100 -+++ xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml 2011-02-15 14:29:58.387980799 +0100 +diff -Naur xbmc-10.1-Dharma/system/Lircmap.xml xbmc-10.1-Dharma.patch/system/Lircmap.xml +--- xbmc-10.1-Dharma/system/Lircmap.xml 2011-06-07 23:02:00.297946207 +0200 ++++ xbmc-10.1-Dharma.patch/system/Lircmap.xml 2011-06-07 23:02:43.716485530 +0200 @@ -365,7 +365,6 @@ @@ -9,7 +9,7 @@ diff -Naur xbmc-Dharma-10.1-c8405db/system/Lircmap.xml xbmc-Dharma-10.1-c8405db. KEY_LEFT KEY_RIGHT KEY_UP -@@ -452,4 +451,57 @@ +@@ -452,4 +451,58 @@ yellow blue @@ -38,6 +38,7 @@ diff -Naur xbmc-Dharma-10.1-c8405db/system/Lircmap.xml xbmc-Dharma-10.1-c8405db. + KEY_PREVIOUS + KEY_EPG + KEY_SUBTITLE ++ KEY_LANGUAGE + KEY_INFO + KEY_ZOOM + KEY_MUTE