From 951c243eabc42df3e8a6b7774f2f017dba1c14a2 Mon Sep 17 00:00:00 2001 From: Andras Kutrovics Date: Sat, 13 Mar 2010 20:15:55 +0100 Subject: [PATCH 01/84] SAbnzbd: update to 0.5.0 final --- packages/plugins/SABnzbd/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/plugins/SABnzbd/url b/packages/plugins/SABnzbd/url index a4a12a6c11..b26ed7cf10 100644 --- a/packages/plugins/SABnzbd/url +++ b/packages/plugins/SABnzbd/url @@ -1 +1 @@ -http://poc.ginf.hu/SABnzbd-0.5.0.tar.gz +http://switch.dl.sourceforge.net/sourceforge/sabnzbdplus/SABnzbd-0.5.0-src.tar.gz From 9fdfd65c8b942bca5796fbacc601e45f653e80dd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 13 Mar 2010 22:19:20 +0100 Subject: [PATCH 02/84] xf86-input-evdev: - cosmetics --- packages/x11/driver/xf86-input-evdev/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/x11/driver/xf86-input-evdev/install b/packages/x11/driver/xf86-input-evdev/install index 6458108fee..feb114d0d6 100755 --- a/packages/x11/driver/xf86-input-evdev/install +++ b/packages/x11/driver/xf86-input-evdev/install @@ -5,8 +5,8 @@ PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/$XORG_PATH_MODULES/input -cp $PKG_BUILD/src/.libs/evdev_drv.so $INSTALL/$XORG_PATH_MODULES/input + cp -P $PKG_BUILD/src/.libs/evdev_drv.so $INSTALL/$XORG_PATH_MODULES/input mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty -cp $PKG_DIR/config/10-x11-evdev.fdi \ - $INSTALL/usr/share/hal/fdi/policy/20thirdparty + cp -P $PKG_DIR/config/10-x11-evdev.fdi \ + $INSTALL/usr/share/hal/fdi/policy/20thirdparty From 75bf65129ab7434f131b33cf5c87a39a760b1be7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 13 Mar 2010 22:19:47 +0100 Subject: [PATCH 03/84] xf86-input-synaptics: - cosmetics --- packages/x11/driver/xf86-input-synaptics/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/x11/driver/xf86-input-synaptics/install b/packages/x11/driver/xf86-input-synaptics/install index d70b51ef49..6cd60cdb6f 100755 --- a/packages/x11/driver/xf86-input-synaptics/install +++ b/packages/x11/driver/xf86-input-synaptics/install @@ -5,7 +5,7 @@ $SCRIPTS/install libXi mkdir -p $INSTALL/$XORG_PATH_MODULES/input - cp $PKG_BUILD/src/.libs/synaptics_drv.so $INSTALL/$XORG_PATH_MODULES/input + cp -P $PKG_BUILD/src/.libs/synaptics_drv.so $INSTALL/$XORG_PATH_MODULES/input mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty/ - cp $PKG_BUILD/fdi/*.fdi $INSTALL/usr/share/hal/fdi/policy/20thirdparty/ + cp -P $PKG_BUILD/fdi/*.fdi $INSTALL/usr/share/hal/fdi/policy/20thirdparty/ From 6b9487204d375d365fbbb2d5536aef51806fa8df Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 13 Mar 2010 22:20:03 +0100 Subject: [PATCH 04/84] xf86-input-wacom: - cosmetics --- packages/x11/driver/xf86-input-wacom/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/x11/driver/xf86-input-wacom/install b/packages/x11/driver/xf86-input-wacom/install index 38599edb63..04d2ac7e04 100755 --- a/packages/x11/driver/xf86-input-wacom/install +++ b/packages/x11/driver/xf86-input-wacom/install @@ -3,10 +3,10 @@ . config/options mkdir -p $INSTALL/$XORG_PATH_MODULES/input - cp -PR $PKG_BUILD/src/.libs/wacom_drv.so $INSTALL/$XORG_PATH_MODULES/input + cp -P $PKG_BUILD/src/.libs/wacom_drv.so $INSTALL/$XORG_PATH_MODULES/input mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty/ - cp -PR $PKG_BUILD/fdi/*.fdi $INSTALL/usr/share/hal/fdi/policy/20thirdparty/ + cp -P $PKG_BUILD/fdi/*.fdi $INSTALL/usr/share/hal/fdi/policy/20thirdparty/ mkdir -p $INSTALL/usr/bin - cp -PR $PKG_BUILD/tools/xsetwacom $INSTALL/usr/bin + cp -P $PKG_BUILD/tools/xsetwacom $INSTALL/usr/bin From a37b3a37355e95b7c2e371c2df0cb14ade507bf9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 13 Mar 2010 22:20:17 +0100 Subject: [PATCH 05/84] xf86-video-ati: - cosmetics --- packages/x11/driver/xf86-video-ati/install | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/x11/driver/xf86-video-ati/install b/packages/x11/driver/xf86-video-ati/install index 7266d220d9..1f4b9c1dda 100755 --- a/packages/x11/driver/xf86-video-ati/install +++ b/packages/x11/driver/xf86-video-ati/install @@ -10,10 +10,10 @@ $SCRIPTS/install libpciaccess $SCRIPTS/install libdrm mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers - cp $PKG_BUILD/src/.libs/ati_drv.so $INSTALL/$XORG_PATH_MODULES/drivers - cp $PKG_BUILD/src/.libs/radeon_drv.so $INSTALL/$XORG_PATH_MODULES/drivers + cp -P $PKG_BUILD/src/.libs/ati_drv.so $INSTALL/$XORG_PATH_MODULES/drivers + cp -P $PKG_BUILD/src/.libs/radeon_drv.so $INSTALL/$XORG_PATH_MODULES/drivers mkdir -p $INSTALL/$XORG_PATH_MODULES/multimedia - cp $PKG_BUILD/src/.libs/theatre_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia - cp $PKG_BUILD/src/.libs/theatre200_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia - cp $PKG_BUILD/src/.libs/theatre_detect_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia + cp -P $PKG_BUILD/src/.libs/theatre_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia + cp -P $PKG_BUILD/src/.libs/theatre200_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia + cp -P $PKG_BUILD/src/.libs/theatre_detect_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia From ac7ef0bd32a8861223fc4594093f5b621c9cf6f9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 13 Mar 2010 22:20:33 +0100 Subject: [PATCH 06/84] xf86-video-intel: - cosmetics --- packages/x11/driver/xf86-video-intel/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-intel/install b/packages/x11/driver/xf86-video-intel/install index cc3c5ff9be..a6c558a5dd 100755 --- a/packages/x11/driver/xf86-video-intel/install +++ b/packages/x11/driver/xf86-video-intel/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers - cp $PKG_BUILD/src/.libs/intel_drv.so $INSTALL/$XORG_PATH_MODULES/drivers + cp -P $PKG_BUILD/src/.libs/intel_drv.so $INSTALL/$XORG_PATH_MODULES/drivers From 4f27ee27577ad40ea0a06d01f49803ba38b3b5fd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 13 Mar 2010 22:20:48 +0100 Subject: [PATCH 07/84] xf86-video-nvidia: - cosmetics --- packages/x11/driver/xf86-video-nvidia/install | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/x11/driver/xf86-video-nvidia/install b/packages/x11/driver/xf86-video-nvidia/install index 52056114f1..18fc67452d 100755 --- a/packages/x11/driver/xf86-video-nvidia/install +++ b/packages/x11/driver/xf86-video-nvidia/install @@ -9,21 +9,21 @@ PKG_DIR=`find $PACKAGES -type d -name $1` VER=`ls $BUILD/linux*/modules/lib/modules` mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers - cp $BUILD/$1/usr/X11R6/lib/modules/drivers/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers + cp -P $BUILD/$1/usr/X11R6/lib/modules/drivers/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers mkdir -p $INSTALL/$XORG_PATH_MODULES/extensions - cp $BUILD/$1/usr/X11R6/lib/modules/extensions/libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so + cp -P $BUILD/$1/usr/X11R6/lib/modules/extensions/libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so mkdir -p $INSTALL/etc/X11 - cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11 + cp -P $PKG_DIR/config/*.conf $INSTALL/etc/X11 mkdir -p $INSTALL/usr/lib - cp $BUILD/$1/usr/lib/libGLcore.so* $INSTALL/usr/lib/libGLcore.so.1 - cp $BUILD/$1/usr/lib/libGL.so* $INSTALL/usr/lib/libGL_nvidia.so.1 - cp $BUILD/$1/usr/lib/tls/*tls*.so* $INSTALL/usr/lib/libnvidia-tls.so.1 + cp -P $BUILD/$1/usr/lib/libGLcore.so* $INSTALL/usr/lib/libGLcore.so.1 + cp -P $BUILD/$1/usr/lib/libGL.so* $INSTALL/usr/lib/libGL_nvidia.so.1 + cp -P $BUILD/$1/usr/lib/tls/*tls*.so* $INSTALL/usr/lib/libnvidia-tls.so.1 mkdir -p $INSTALL/lib/modules/$VER/nvidia - cp $BUILD/$1/usr/src/nv/nvidia.ko $INSTALL/lib/modules/$VER/nvidia + cp -P $BUILD/$1/usr/src/nv/nvidia.ko $INSTALL/lib/modules/$VER/nvidia for MOD in `find $INSTALL/lib/modules/$VER/nvidia -name *.ko`; do $STRIP --strip-debug $MOD From af6bcc131b2415ea74f4564bba6471ec6b6c2652 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 13 Mar 2010 22:21:10 +0100 Subject: [PATCH 08/84] xorg-server: - cosmetics --- packages/x11/xserver/xorg-server/install | 44 +++++++++++------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index a510cb56b4..d94cc20f28 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -23,42 +23,42 @@ XORG_DST="$INSTALL/$XORG_PATH_MODULES" PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/usr/bin - cp $XORG_SRC/Xorg $INSTALL/usr/bin + cp -P $XORG_SRC/Xorg $INSTALL/usr/bin mkdir -p $XORG_DST - cp $XORG_SRC/exa/.libs/libexa.so $XORG_DST - cp $XORG_SRC/dixmods/.libs/libfb.so $XORG_DST - cp $XORG_SRC/int10/.libs/libint10.so $XORG_DST - cp $XORG_SRC/dixmods/.libs/libshadow.so $XORG_DST - cp $XORG_SRC/shadowfb/.libs/libshadowfb.so $XORG_DST - cp $XORG_SRC/vbe/.libs/libvbe.so $XORG_DST - cp $XORG_SRC/vgahw/.libs/libvgahw.so $XORG_DST - cp $XORG_SRC/dixmods/.libs/libwfb.so $XORG_DST - cp $XORG_SRC/xaa/.libs/libxaa.so $XORG_DST - cp $XORG_SRC/xf8_16bpp/.libs/libxf8_16bpp.so $XORG_DST + cp -P $XORG_SRC/exa/.libs/libexa.so $XORG_DST + cp -P $XORG_SRC/dixmods/.libs/libfb.so $XORG_DST + cp -P $XORG_SRC/int10/.libs/libint10.so $XORG_DST + cp -P $XORG_SRC/dixmods/.libs/libshadow.so $XORG_DST + cp -P $XORG_SRC/shadowfb/.libs/libshadowfb.so $XORG_DST + cp -P $XORG_SRC/vbe/.libs/libvbe.so $XORG_DST + cp -P $XORG_SRC/vgahw/.libs/libvgahw.so $XORG_DST + cp -P $XORG_SRC/dixmods/.libs/libwfb.so $XORG_DST + cp -P $XORG_SRC/xaa/.libs/libxaa.so $XORG_DST + cp -P $XORG_SRC/xf8_16bpp/.libs/libxf8_16bpp.so $XORG_DST mkdir -p $XORG_DST/extensions - cp $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions - cp $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions - cp $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions - cp $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions - cp $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers + cp -P $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions + cp -P $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions + cp -P $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions + cp -P $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions + cp -P $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers ln -sf /var/lib/libglx.so $XORG_DST/extensions/libglx.so mkdir -p $XORG_DST/linux - cp $XORG_SRC/fbdevhw/.libs/libfbdevhw.so $XORG_DST/linux + cp -P $XORG_SRC/fbdevhw/.libs/libfbdevhw.so $XORG_DST/linux mkdir -p $XORG_DST/multimedia - cp $XORG_SRC/i2c/.libs/*_drv.so $XORG_DST/multimedia + cp -P $XORG_SRC/i2c/.libs/*_drv.so $XORG_DST/multimedia mkdir -p $INSTALL/usr/lib/xorg - cp $PKG_BUILD/dix/protocol.txt $INSTALL/usr/lib/xorg + cp -P $PKG_BUILD/dix/protocol.txt $INSTALL/usr/lib/xorg mkdir -p $INSTALL/etc/dbus-1/system.d - cp $PKG_BUILD/config/xorg-server.conf $INSTALL/etc/dbus-1/system.d + cp -P $PKG_BUILD/config/xorg-server.conf $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/ - cp $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi + cp -P $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi #Fonts $SCRIPTS/install encodings @@ -76,8 +76,6 @@ mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/ $SCRIPTS/install xf86-input-synaptics $SCRIPTS/install xf86-input-wacom -get_graphicdrivers - for drv in $XORG_DRIVERS; do $SCRIPTS/install xf86-video-$drv done From c24cc043847167decf7bbdf69f7ddf9146bbf37f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 01:19:50 +0100 Subject: [PATCH 09/84] new package: - add package uxlaunch for launching Xorg --- packages/sysutils/uxlaunch/build | 12 ++++++++++++ packages/sysutils/uxlaunch/install | 10 ++++++++++ packages/sysutils/uxlaunch/url | 1 + 3 files changed, 23 insertions(+) create mode 100755 packages/sysutils/uxlaunch/build create mode 100755 packages/sysutils/uxlaunch/install create mode 100644 packages/sysutils/uxlaunch/url diff --git a/packages/sysutils/uxlaunch/build b/packages/sysutils/uxlaunch/build new file mode 100755 index 0000000000..c6c5b886d3 --- /dev/null +++ b/packages/sysutils/uxlaunch/build @@ -0,0 +1,12 @@ +#!/bin/sh + +. config/options + +$SCRIPTS/build toolchain +$SCRIPTS/build glib +$SCRIPTS/build dbus +$SCRIPTS/build ConsoleKit + +cd $PKG_BUILD + +make CC=$TARGET_CC diff --git a/packages/sysutils/uxlaunch/install b/packages/sysutils/uxlaunch/install new file mode 100755 index 0000000000..bf7a00fdf5 --- /dev/null +++ b/packages/sysutils/uxlaunch/install @@ -0,0 +1,10 @@ +#!/bin/sh + +. config/options + +$SCRIPTS/install glib +$SCRIPTS/install dbus +$SCRIPTS/install ConsoleKit + +mkdir -p $INSTALL/usr/sbin + cp -P $PKG_BUILD/uxlaunch $INSTALL/usr/sbin diff --git a/packages/sysutils/uxlaunch/url b/packages/sysutils/uxlaunch/url new file mode 100644 index 0000000000..d23bb6709c --- /dev/null +++ b/packages/sysutils/uxlaunch/url @@ -0,0 +1 @@ +http://sources.openelec.tv/svn/uxlaunch-0.44-git.tar.bz2 From 675db10aa1af15ca1bfd5cbb5304bb88c6c41b16 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 01:20:11 +0100 Subject: [PATCH 10/84] xorg-server: - install uxlaunch by default --- packages/x11/xserver/xorg-server/install | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index d94cc20f28..e9368cfef9 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -82,3 +82,4 @@ mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/ #Tools $SCRIPTS/install pciutils + $SCRIPTS/install uxlaunch From bc66c11dcbd7cafc210dd2d11dfbeb0ee63a5ba5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 01:27:20 +0100 Subject: [PATCH 11/84] busybox: - cosmetics --- packages/sysutils/busybox/scripts/init | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 7035e6fd08..187e81ee0e 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -4,9 +4,11 @@ . /etc/sysconfig # Starting Splash - [ "$DEBUG" != "yes" -a "$TEXTMODE" != "yes" -a -f /usr/bin/ply-image -a \ - -f /usr/share/splash/Splash.png ] && \ - ply-image /usr/share/splash/Splash.png & + [ "$DEBUG" != "yes" \ + -a "$TEXTMODE" != "yes" \ + -a -f /usr/bin/ply-image \ + -a -f /usr/share/splash/Splash.png \ + ] && ply-image /usr/share/splash/Splash.png & HOSTNAME="openelec" @@ -16,8 +18,13 @@ # make variable directory structure progress "make variable directory structure" - $IONICE mkdir -p /var/log /var/lock /var/media /var/run /var/tmp \ - /var/run/sepermit + $IONICE mkdir -p /var/log \ + /var/lock \ + /var/media \ + /var/run \ + /var/tmp \ + /var/run/sepermit + $IONICE chmod 1777 /var/run /var/tmp # bring lo up, whether we have network card or not From 8b53890f33d883c6a191cccab1891cd77ce0926e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 01:52:06 +0100 Subject: [PATCH 12/84] ConsoleKit: - enable start of ConsoleKit daemon --- packages/sysutils/ConsoleKit/init.d/11_ConsoleKit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/ConsoleKit/init.d/11_ConsoleKit b/packages/sysutils/ConsoleKit/init.d/11_ConsoleKit index 26f8c8a516..7d8f9fb183 100755 --- a/packages/sysutils/ConsoleKit/init.d/11_ConsoleKit +++ b/packages/sysutils/ConsoleKit/init.d/11_ConsoleKit @@ -8,6 +8,6 @@ $IONICE install -m 755 -d /var/log/ConsoleKit $IONICE install -m 755 -d /var/run/ConsoleKit -# console-kit-daemon -# ck-launch-session + console-kit-daemon + ck-launch-session )& From bbfa9f24f6a8d569c2752cd33a47959e664430ab Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 01:54:28 +0100 Subject: [PATCH 13/84] xorg-server: - add init script to preparing start of xorg - remove xorg init script - move loading of nvidia driver to init script for preparing xorg start --- packages/sysutils/busybox/scripts/init | 6 ----- .../xserver/xorg-server/{init.d => }/60_xorg | 0 .../xorg-server/init.d/12_configure-xorg | 27 +++++++++++++++++++ 3 files changed, 27 insertions(+), 6 deletions(-) rename packages/x11/xserver/xorg-server/{init.d => }/60_xorg (100%) create mode 100644 packages/x11/xserver/xorg-server/init.d/12_configure-xorg diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 187e81ee0e..3b16f24ada 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -46,12 +46,6 @@ cp -PR /usr/config/$i $HOME/.config done -# loading NVidia driver - if lspci -n | grep 0300 | grep -q 10de; then - progress "loading NVidia driver" - $IONICE modprobe nvidia - fi - # caching xbmc [ "$XBMC_CACHING" = "yes" ] && cache_xbmc diff --git a/packages/x11/xserver/xorg-server/init.d/60_xorg b/packages/x11/xserver/xorg-server/60_xorg similarity index 100% rename from packages/x11/xserver/xorg-server/init.d/60_xorg rename to packages/x11/xserver/xorg-server/60_xorg diff --git a/packages/x11/xserver/xorg-server/init.d/12_configure-xorg b/packages/x11/xserver/xorg-server/init.d/12_configure-xorg new file mode 100644 index 0000000000..2adc464a53 --- /dev/null +++ b/packages/x11/xserver/xorg-server/init.d/12_configure-xorg @@ -0,0 +1,27 @@ +# configure X.Org video settings +# +# runlevels: openelec, text, debug + +if lspci -n | grep 0300 | grep -q 10de; then + + progress "Found nVidia card, loading NVidia driver" + $IONICE modprobe nvidia & + + progress "Found nVidia card, enabling NVIDIA GLX as requested" + $IONICE mkdir -p /var/lib + $IONICE ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so + $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so + +else + + progress "Not found nVidia card, enabling Mesa GLX as requested" + $IONICE mkdir -p /var/lib + $IONICE ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so + $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so + +fi + +# Make some needed directorys + $IONICE mkdir -p /var/cache/xkb + $IONICE mkdir -m 1777 -p /tmp/.ICE-unix + $IONICE chown root:root /tmp/.ICE-unix From 060f9ad9b99b0f22937746687b731d5aa30fe55f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:24:00 +0100 Subject: [PATCH 14/84] projects/*/options: - add variable for setup hostname --- packages/mediacenter/xbmc/init.d/67_xbmc | 26 ------------------------ projects/ION/options | 3 +++ projects/generic/options | 3 +++ projects/intel/options | 3 +++ 4 files changed, 9 insertions(+), 26 deletions(-) delete mode 100755 packages/mediacenter/xbmc/init.d/67_xbmc diff --git a/packages/mediacenter/xbmc/init.d/67_xbmc b/packages/mediacenter/xbmc/init.d/67_xbmc deleted file mode 100755 index c8b482d7fc..0000000000 --- a/packages/mediacenter/xbmc/init.d/67_xbmc +++ /dev/null @@ -1,26 +0,0 @@ -# starting Mediacenter -# -# runlevels: openelec - -args="--standalone -fs --lircdev $LIRC_OUTPUT" - -progress "starting Mediacenter" - - if test "$XBMC_CACHING" = "yes" ; then - wait_for_xbmc_cache - XBMC_BIN="/var/cache/bin/xbmc.bin" - else - XBMC_BIN="/usr/share/xbmc/xbmc.bin" - fi - - while true; do - - DISPLAY=:0.0 $XBMC_BIN ${args} > /dev/null 2>&1 - RET=$? - echo "Exited with code $RET" - - [ "$RET" == 0 ] && break - [ "$RET" == 64 ] && sync && poweroff - [ "$RET" == 66 ] && sync && reboot - - done diff --git a/projects/ION/options b/projects/ION/options index 908256d935..f2176cde86 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -5,6 +5,9 @@ GREATING3="#######################################################" GREATING4="" +# Hostname for target system (openelec) + HOSTNAME="openelec" + # Root password to integrate in the target system ROOT_PASSWORD="openelec" diff --git a/projects/generic/options b/projects/generic/options index eb63ae951d..e9bd92ef3a 100644 --- a/projects/generic/options +++ b/projects/generic/options @@ -5,6 +5,9 @@ GREATING3="#######################################################" GREATING4="" +# Hostname for target system (openelec) + HOSTNAME="openelec" + # Root password to integrate in the target system ROOT_PASSWORD="openelec" diff --git a/projects/intel/options b/projects/intel/options index e19ac15f89..a7bc803ee3 100644 --- a/projects/intel/options +++ b/projects/intel/options @@ -5,6 +5,9 @@ GREATING3="#######################################################" GREATING4="" +# Hostname for target system (openelec) + HOSTNAME="openelec" + # Root password to integrate in the target system ROOT_PASSWORD="openelec" From c75a368d07e43a99102d99076e73d51097fe1164 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:25:38 +0100 Subject: [PATCH 15/84] xbmc: - rename xbmc startscript to xbmc-session - add start of windowmanager if requested --- packages/mediacenter/xbmc/install | 2 +- packages/mediacenter/xbmc/scripts/xbmc | 18 ------------- .../mediacenter/xbmc/scripts/xbmc-session | 26 +++++++++++++++++++ 3 files changed, 27 insertions(+), 19 deletions(-) delete mode 100755 packages/mediacenter/xbmc/scripts/xbmc create mode 100755 packages/mediacenter/xbmc/scripts/xbmc-session diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install index 65c19f4666..c57d1064cd 100755 --- a/packages/mediacenter/xbmc/install +++ b/packages/mediacenter/xbmc/install @@ -65,7 +65,7 @@ $SCRIPTS/install samba PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/usr/bin - cp -PR $PKG_DIR/scripts/xbmc $INSTALL/usr/bin + cp -PR $PKG_DIR/scripts/xbmc-session $INSTALL/usr/bin mkdir -p $INSTALL/usr/share/xbmc cp -PR $PKG_BUILD/xbmc.bin $INSTALL/usr/share/xbmc diff --git a/packages/mediacenter/xbmc/scripts/xbmc b/packages/mediacenter/xbmc/scripts/xbmc deleted file mode 100755 index e7f74aa442..0000000000 --- a/packages/mediacenter/xbmc/scripts/xbmc +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -. /etc/sysconfig - -export DISPLAY=":0.0" - -/usr/share/xbmc/xbmc.bin \ - --standalone \ - -fs \ - --lircdev $LIRC_OUTPUT \ - $@ - -RET=$? -echo "Exited with code $RET" - -[ "$RET" == 0 ] && initctl emit shutdown REBOOT=no -[ "$RET" == 64 ] && initctl emit shutdown REBOOT=no -[ "$RET" == 66 ] && initctl emit shutdown REBOOT=yes diff --git a/packages/mediacenter/xbmc/scripts/xbmc-session b/packages/mediacenter/xbmc/scripts/xbmc-session new file mode 100755 index 0000000000..40e0603dbf --- /dev/null +++ b/packages/mediacenter/xbmc/scripts/xbmc-session @@ -0,0 +1,26 @@ +#!/bin/sh + +. /etc/sysconfig + +XBMC_ARGS="--standalone -fs --lircdev $LIRC_OUTPUT" + +if test "$XBMC_CACHING" = "yes" ; then + wait_for_xbmc_cache + XBMC_BIN="/var/cache/bin/xbmc.bin" +else + XBMC_BIN="/usr/share/xbmc/xbmc.bin" +fi + +while true; do + + [ $START_WM="yes" ] && $WINDOWMANAGER & + + $XBMC_BIN $XBMC_ARGS $@ > /dev/null 2>&1 + RET=$? + echo "Exited with code $RET" + + [ "$RET" == 0 ] && break + [ "$RET" == 64 ] && sync && poweroff + [ "$RET" == 66 ] && sync && reboot + +done From 780e738d5b7a1c5f899340dbe42a08f88d03ecec Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:26:23 +0100 Subject: [PATCH 16/84] avahi: - sync init script From a76720ae8877b2921c3eff22f81f93ea2f2b7612 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:26:58 +0100 Subject: [PATCH 17/84] connman: - re-add init script --- packages/network/connman/init.d/40_connman | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 packages/network/connman/init.d/40_connman diff --git a/packages/network/connman/init.d/40_connman b/packages/network/connman/init.d/40_connman new file mode 100755 index 0000000000..55d77ab4f9 --- /dev/null +++ b/packages/network/connman/init.d/40_connman @@ -0,0 +1,8 @@ +# start connman network manager +# +# runlevels: openelec, text, debug + +progress "Starting Connection Manager" + $IONICE mkdir -p /var/run + $IONICE touch /var/run/resolv.conf + connmand From 9f467a08d1269a1c1d2344a8f9815c666c427db1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:27:28 +0100 Subject: [PATCH 18/84] dropbear: - start ssh server later --- packages/network/dropbear/init.d/{22_sshd => 41_sshd} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/network/dropbear/init.d/{22_sshd => 41_sshd} (100%) diff --git a/packages/network/dropbear/init.d/22_sshd b/packages/network/dropbear/init.d/41_sshd similarity index 100% rename from packages/network/dropbear/init.d/22_sshd rename to packages/network/dropbear/init.d/41_sshd From 72b761c97a8b6c4ffd5c52b3e412f8b214a5de26 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:27:52 +0100 Subject: [PATCH 19/84] samba: - start samba server later --- packages/network/samba/init.d/{23_samba => 42_samba} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/network/samba/init.d/{23_samba => 42_samba} (100%) diff --git a/packages/network/samba/init.d/23_samba b/packages/network/samba/init.d/42_samba similarity index 100% rename from packages/network/samba/init.d/23_samba rename to packages/network/samba/init.d/42_samba From ca935bf32916f59a37bed36f1d73f9b6fa776a3f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:31:05 +0100 Subject: [PATCH 20/84] busybox: - remove init script to save boottime - add init script for initial networking (move from /sbin/init) - create /etc/hostname for hostname - add init script for debugshell (move from /sbin/init) - remove old init script for debugshell - remove old init script for shutdown - start rescue console on tty1 --- packages/sysutils/busybox/init.d/01_syslogd | 2 +- packages/sysutils/busybox/init.d/02_date | 9 ------ packages/sysutils/busybox/init.d/02_network | 19 ++++++++++++ .../sysutils/busybox/init.d/10_debugshell | 15 +++++++++ packages/sysutils/busybox/init.d/80_debug | 8 ----- packages/sysutils/busybox/init.d/99_shutdown | 9 ------ packages/sysutils/busybox/install | 2 ++ packages/sysutils/busybox/scripts/init | 31 +------------------ 8 files changed, 38 insertions(+), 57 deletions(-) delete mode 100755 packages/sysutils/busybox/init.d/02_date create mode 100755 packages/sysutils/busybox/init.d/02_network create mode 100755 packages/sysutils/busybox/init.d/10_debugshell delete mode 100755 packages/sysutils/busybox/init.d/80_debug delete mode 100755 packages/sysutils/busybox/init.d/99_shutdown diff --git a/packages/sysutils/busybox/init.d/01_syslogd b/packages/sysutils/busybox/init.d/01_syslogd index 9dec128943..e03bb3e5ed 100755 --- a/packages/sysutils/busybox/init.d/01_syslogd +++ b/packages/sysutils/busybox/init.d/01_syslogd @@ -1,5 +1,5 @@ # -# start cron daemon +# start syslog daemon # # runlevels: openelec, text, debug diff --git a/packages/sysutils/busybox/init.d/02_date b/packages/sysutils/busybox/init.d/02_date deleted file mode 100755 index 09c799dd2d..0000000000 --- a/packages/sysutils/busybox/init.d/02_date +++ /dev/null @@ -1,9 +0,0 @@ -# store boot time -# -# runlevels: openelec, text, debug - -( - progress "saving Bootdate" - - /bin/date > /tmp/bootdate -)& diff --git a/packages/sysutils/busybox/init.d/02_network b/packages/sysutils/busybox/init.d/02_network new file mode 100755 index 0000000000..218dd533ee --- /dev/null +++ b/packages/sysutils/busybox/init.d/02_network @@ -0,0 +1,19 @@ +# +# start syslog daemon +# +# runlevels: openelec, text, debug + +HOSTNAME=`cat /etc/hostname` + +export $HOSTNAME + +# bring lo up, whether we have network card or not + progress "starting Loopback Network interface" + ifconfig lo 127.0.0.1 up + +# setup hostname + progress "Setup hostname" + echo $HOSTNAME > /proc/sys/kernel/hostname + +# create /etc/hosts file, useful for gethostbyname(localhost) + echo -e "127.0.0.1\tlocalhost $HOSTNAME" > /var/run/hosts diff --git a/packages/sysutils/busybox/init.d/10_debugshell b/packages/sysutils/busybox/init.d/10_debugshell new file mode 100755 index 0000000000..e4b8f2ba91 --- /dev/null +++ b/packages/sysutils/busybox/init.d/10_debugshell @@ -0,0 +1,15 @@ +# start the ACPI daemon subsystem +# +# runlevels: openelec, text, debug + +TTY="3" + +( + echo "#############################################" + echo "### it seems we are running in Debug mode ###" + echo "### starting debugging shell on console $TTY ###" + echo "### ...... switch with ctrl-alt-f$TTY ...... ###" + echo "#############################################" + exec /bin/sh /dev/tty$TTY 2>&1 +)& + diff --git a/packages/sysutils/busybox/init.d/80_debug b/packages/sysutils/busybox/init.d/80_debug deleted file mode 100755 index f58bbd3b28..0000000000 --- a/packages/sysutils/busybox/init.d/80_debug +++ /dev/null @@ -1,8 +0,0 @@ -# start a debugging shell -# -# runlevels: text, debug - -progress "starting debug shell" - - echo "*** type exit to exit ***" - exec /bin/sh /dev/tty1 2>&1 diff --git a/packages/sysutils/busybox/init.d/99_shutdown b/packages/sysutils/busybox/init.d/99_shutdown deleted file mode 100755 index 6ee6aac763..0000000000 --- a/packages/sysutils/busybox/init.d/99_shutdown +++ /dev/null @@ -1,9 +0,0 @@ -# shutdown the system -# -# runlevels: openelec, text, debug, - -progress "syncing discs" - sync - -progress "shutdown the system" - poweroff diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index e413cb34ce..6317204f73 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -25,6 +25,8 @@ ROOT_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $ROOT_PASSWORD`" ln -sf /var/run/resolv.conf $INSTALL/etc/resolv.conf ln -sf /var/run/hosts $INSTALL/etc/hosts + echo $HOSTNAME > $INSTALL/etc/hostname + echo $GREATING0 > $INSTALL/etc/issue echo $GREATING1 >> $INSTALL/etc/issue echo $GREATING2 >> $INSTALL/etc/issue diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 3b16f24ada..596e920f10 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -10,8 +10,6 @@ -a -f /usr/share/splash/Splash.png \ ] && ply-image /usr/share/splash/Splash.png & - HOSTNAME="openelec" - # mounting needed filesystems progress "mounting needed filesystems" $IONICE mount -n -t ramfs none /var @@ -27,17 +25,6 @@ $IONICE chmod 1777 /var/run /var/tmp -# bring lo up, whether we have network card or not - progress "starting Loopback Network interface" - ifconfig lo 127.0.0.1 up - -# setup hostname - progress "Setup hostname" - echo $HOSTNAME > /proc/sys/kernel/hostname - -# create /etc/hosts file, useful for gethostbyname(localhost) - echo -e "127.0.0.1\tlocalhost $HOSTNAME" > /var/run/hosts - # copying config into storage progress "copying config into storage" mkdir -p $HOME/.config @@ -74,22 +61,6 @@ $IONICE mkdir -p /var/run/dbus/hald-runner hald --verbose=no --daemon=yes --use-syslog -# starting Connman - progress "Starting Connection Manager" - $IONICE mkdir -p /var/run - $IONICE touch /var/run/resolv.conf - connmand - -# starting debugging shell - if test "$DEBUG" = yes; then - echo "#############################################" - echo "### it seems we are running in Debug mode ###" - echo "### starting debugging shell on console 3 ###" - echo "### ...... switch with ctrl-alt-f3 ...... ###" - echo "#############################################" - exec /bin/sh /dev/tty3 2>&1 & - fi - # getting runlevel RUNLEVEL="openelec" if test "$TEXTMODE" = yes; then @@ -115,4 +86,4 @@ echo "### it seems we have an problem ###" echo "### starting emergency shell... ###" echo "###################################" - exec /bin/sh /dev/tty3 2>&1 + exec /bin/sh /dev/tty1 2>&1 From 247f5ebe61de4cee592eb2d631aa3fcf4cc5dcad Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:31:28 +0100 Subject: [PATCH 21/84] lirc: - start lirc later --- packages/sysutils/lirc/init.d/{41_lirc => 21_lirc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/sysutils/lirc/init.d/{41_lirc => 21_lirc} (100%) diff --git a/packages/sysutils/lirc/init.d/41_lirc b/packages/sysutils/lirc/init.d/21_lirc similarity index 100% rename from packages/sysutils/lirc/init.d/41_lirc rename to packages/sysutils/lirc/init.d/21_lirc From 6594c3d1dda2578d365a788483e12d5b6fa02767 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:32:03 +0100 Subject: [PATCH 22/84] uxlaunch: - add init script for starting xorg session --- packages/sysutils/uxlaunch/init.d/60_uxlaunch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 packages/sysutils/uxlaunch/init.d/60_uxlaunch diff --git a/packages/sysutils/uxlaunch/init.d/60_uxlaunch b/packages/sysutils/uxlaunch/init.d/60_uxlaunch new file mode 100644 index 0000000000..30ba2515c4 --- /dev/null +++ b/packages/sysutils/uxlaunch/init.d/60_uxlaunch @@ -0,0 +1,19 @@ +# starting uxlaunch +# +# runlevels: openelec + +progress "starting uxlaunch" + + UX_USER="root" + UX_TTY="1" + + if [ "$START_MRXVT" = yes ]; then + UX_SESSION="/usr/bin/mrxvt-session" + else + UX_SESSION="/usr/bin/xbmc-session" + fi + + UX_ARG="-u $UX_USER -t $UX_TTY -s $UX_SESSION" + [ "$DEBUG" = yes ] && UX_ARG="$UX_ARG -v" + + uxlaunch $UX_ARG > /dev/null 2>&1 \ No newline at end of file From daefe367c6b9910932e291865be8b363ec49b550 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:33:01 +0100 Subject: [PATCH 23/84] xorg-server: - install mrxvt and ratpoison with xorg-server --- packages/testing/install | 2 -- packages/x11/xserver/xorg-server/install | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/testing/install b/packages/testing/install index a327d9b73c..df20ba38a7 100755 --- a/packages/testing/install +++ b/packages/testing/install @@ -5,5 +5,3 @@ # packages needed for development (upcoming features) $SCRIPTS/install dbus-python -$SCRIPTS/install ratpoison -$SCRIPTS/install mrxvt diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index e9368cfef9..d13662159d 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -83,3 +83,5 @@ mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/ #Tools $SCRIPTS/install pciutils $SCRIPTS/install uxlaunch +[ "$DEVTOOLS" = "yes" ] && $SCRIPTS/install ratpoison +[ "$DEVTOOLS" = "yes" ] && $SCRIPTS/install mrxvt From c5fd290ce7cf5a30d072f083c47e9ddcb3334d24 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:33:37 +0100 Subject: [PATCH 24/84] mrxvt: - remove init script --- packages/x11/other/mrxvt/init.d/63_mrxvt | 9 --------- 1 file changed, 9 deletions(-) delete mode 100755 packages/x11/other/mrxvt/init.d/63_mrxvt diff --git a/packages/x11/other/mrxvt/init.d/63_mrxvt b/packages/x11/other/mrxvt/init.d/63_mrxvt deleted file mode 100755 index 67c676ec91..0000000000 --- a/packages/x11/other/mrxvt/init.d/63_mrxvt +++ /dev/null @@ -1,9 +0,0 @@ -# start MRXVT terminal -# -# runlevels: openelec, text, debug - -if test "$START_MRXVT" = "yes"; then - progress "Starting MRXVT terminal" - - mrxvt -fi From ec47ab719a75dfb473d61a36a7fc2bdd5d5738ef Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:34:03 +0100 Subject: [PATCH 25/84] mrxvt: - add startscript for mrxvt session --- packages/x11/other/mrxvt/install | 7 +++++-- packages/x11/other/mrxvt/scripts/mrxvt-session | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100755 packages/x11/other/mrxvt/scripts/mrxvt-session diff --git a/packages/x11/other/mrxvt/install b/packages/x11/other/mrxvt/install index 033e2d6d96..6680b84377 100755 --- a/packages/x11/other/mrxvt/install +++ b/packages/x11/other/mrxvt/install @@ -4,6 +4,9 @@ $SCRIPTS/install libX11 -mkdir -p $INSTALL/usr/bin - cp -PR $PKG_BUILD/src/$1 $INSTALL/usr/bin +PKG_DIR=`find $PACKAGES -type d -name $1` + +mkdir -p $INSTALL/usr/bin + cp -P $PKG_DIR/scripts/$1-session $INSTALL/usr/bin + cp -P $PKG_BUILD/src/$1 $INSTALL/usr/bin diff --git a/packages/x11/other/mrxvt/scripts/mrxvt-session b/packages/x11/other/mrxvt/scripts/mrxvt-session new file mode 100755 index 0000000000..d8a6026cd1 --- /dev/null +++ b/packages/x11/other/mrxvt/scripts/mrxvt-session @@ -0,0 +1,7 @@ +#!/bin/sh + +. /etc/sysconfig + +[ $START_WM="yes" ] && $WINDOWMANAGER & + +mrxvt From 967b79f4752dec4ab09df739de7b3acc5d59af59 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:34:35 +0100 Subject: [PATCH 26/84] ratpoison: - add windowmanager config file --- packages/x11/other/ratpoison/conf.d/ratpoison | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/x11/other/ratpoison/conf.d/ratpoison diff --git a/packages/x11/other/ratpoison/conf.d/ratpoison b/packages/x11/other/ratpoison/conf.d/ratpoison new file mode 100644 index 0000000000..8534c10042 --- /dev/null +++ b/packages/x11/other/ratpoison/conf.d/ratpoison @@ -0,0 +1,8 @@ +################################################################################ +# Windowmanager environment variables. +# +# This file contains non-OpenELEC evironment variables as well as OpenELEC +# evironment variables that are not user defined. +################################################################################ + +WINDOWMANAGER="ratpoison" From ac2604069d38101f063c3e35f5a5fcba076fe558 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:34:54 +0100 Subject: [PATCH 27/84] ratpoison: - remove init script --- packages/x11/other/ratpoison/init.d/62_ratpoison | 9 --------- 1 file changed, 9 deletions(-) delete mode 100755 packages/x11/other/ratpoison/init.d/62_ratpoison diff --git a/packages/x11/other/ratpoison/init.d/62_ratpoison b/packages/x11/other/ratpoison/init.d/62_ratpoison deleted file mode 100755 index f882ee3c58..0000000000 --- a/packages/x11/other/ratpoison/init.d/62_ratpoison +++ /dev/null @@ -1,9 +0,0 @@ -# start Ratpoison Windowmanager -# -# runlevels: openelec, text, debug - -if test "$START_WM" = "yes"; then - progress "Starting Ratpoison Windowmanager" - - ratpoison & -fi From 0cadd140b81cf81f320499722b84c54b0aacc355 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:35:16 +0100 Subject: [PATCH 28/84] xorg-server: - remove init script --- packages/x11/xserver/xorg-server/60_xorg | 37 ------------------------ 1 file changed, 37 deletions(-) delete mode 100644 packages/x11/xserver/xorg-server/60_xorg diff --git a/packages/x11/xserver/xorg-server/60_xorg b/packages/x11/xserver/xorg-server/60_xorg deleted file mode 100644 index de8f1fcd26..0000000000 --- a/packages/x11/xserver/xorg-server/60_xorg +++ /dev/null @@ -1,37 +0,0 @@ -# configure X.Org video settings -# -# runlevels: openelec - -XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf" -XORG_ARGS="-s 0 -noreset -allowMouseOpenFail -nocursor -nolisten tcp" - -#------------------------------------------------------------------------------- -# do not change anything below -#------------------------------------------------------------------------------- - -[ "$DEBUG" = yes ] && XORG_ARGS="$XORG_ARGS -logverbose 6 -verbose 6" - - if lspci -n | grep 0300 | grep -q 10de; then - - [ -f $XORG_NVIDIA_CONF ] && XORG_ARGS="$XORG_ARGS -config $XORG_NVIDIA_CONF" - - progress "Found nVidia card, enabling NVIDIA GLX as requested" - $IONICE mkdir -p /var/lib - $IONICE ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so - $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so - - else - - progress "Not found nVidia card, enabling Mesa GLX as requested" - $IONICE mkdir -p /var/lib - $IONICE ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so - $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so - fi - - mkdir -p /var/cache/xkb - - # Make ICE directory - $IONICE mkdir -m 1777 -p /tmp/.ICE-unix >/dev/null 2>&1 - $IONICE chown root:root /tmp/.ICE-unix - - Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1 & From 7b8f19bfb4bc362713d65447087b36af73a6471e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Mar 2010 17:35:51 +0100 Subject: [PATCH 29/84] Mesa: - fix install if we dont build DRI drivers (pure nvidia build) --- packages/graphics/Mesa/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install index 3b02a82bd2..1ff187384d 100755 --- a/packages/graphics/Mesa/install +++ b/packages/graphics/Mesa/install @@ -18,7 +18,7 @@ mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib/dri - cp -PR $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri + cp -PR $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true # todo: only in devel build mkdir -p $INSTALL/usr/bin From d8cc934beedcc9dc22fc9d0d6cde8950b3ee0c23 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 02:08:45 +0100 Subject: [PATCH 30/84] xbmc: - update to xbmc-28584 --- ...dd_host_and_build_to_configures-0.2.1.diff | 34 +++++++++---------- .../011_xbmc-let_select_XBMCProjectM-0.1.diff | 26 +++++++------- .../patches/012_xbmc-let_select_RSXS-0.1.diff | 16 ++++----- ...d_DESTDIR_support_to_make_install-0.1.diff | 14 ++++---- packages/mediacenter/xbmc/url | 2 +- 5 files changed, 46 insertions(+), 46 deletions(-) diff --git a/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.1.diff b/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.1.diff index 4149bf0129..033babe263 100644 --- a/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.1.diff +++ b/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.1.diff @@ -1,7 +1,7 @@ -diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in ---- xbmc-28425/configure.in 2010-03-06 13:48:42.000000000 +0100 -+++ xbmc-28425.patch/configure.in 2010-03-06 15:45:45.758328458 +0100 -@@ -1153,7 +1153,9 @@ +diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in +--- xbmc-28584/configure.in 2010-03-14 21:06:24.000000000 +0100 ++++ xbmc-28584.patch/configure.in 2010-03-15 00:50:53.680149619 +0100 +@@ -1154,7 +1154,9 @@ cp pyconfig.h Include else ./configure \ @@ -12,7 +12,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in --enable-unicode=ucs4 \ --without-cxx \ --enable-shared \ -@@ -1218,6 +1220,7 @@ +@@ -1219,6 +1221,7 @@ --disable-static \ --disable-ipv6 \ `if test "$use_debug" = "no"; then echo --disable-debug; fi` \ @@ -20,7 +20,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in --disable-muxers \ --enable-muxer=spdif \ --enable-muxer=adts \ -@@ -1234,6 +1237,7 @@ +@@ -1235,6 +1238,7 @@ --enable-postproc \ --enable-gpl \ `if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \ @@ -28,7 +28,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in --enable-libfaad \ --enable-protocol=http \ --enable-pthreads \ -@@ -1253,6 +1257,8 @@ +@@ -1254,6 +1258,8 @@ --disable-win else ./configure \ @@ -37,7 +37,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in --disable-oss \ --disable-solaris-audio \ --disable-al-audio \ -@@ -1270,6 +1276,8 @@ +@@ -1271,6 +1277,8 @@ --with-pic else ./configure \ @@ -46,7 +46,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in --disable-doc \ --enable-static \ --with-pic -@@ -1288,6 +1296,8 @@ +@@ -1289,6 +1297,8 @@ cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread else ./configure2 \ @@ -55,7 +55,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ --enable-static \ -@@ -1313,6 +1323,8 @@ +@@ -1314,6 +1324,8 @@ --cc="$CC" else ./configure2 \ @@ -64,7 +64,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \ --extra-ldflags="-L`pwd`/../libdvdread/obj" \ --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ -@@ -1345,6 +1357,8 @@ +@@ -1346,6 +1358,8 @@ --disable-al-audio else ./configure \ @@ -73,7 +73,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in --with-pic \ --disable-static \ --enable-shared \ -@@ -1380,7 +1394,9 @@ +@@ -1381,7 +1395,9 @@ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 else CFLAGS="$CFLAGS -fPIC" \ @@ -84,7 +84,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in fi ], [$USE_EXTERNAL_LIBASS]) -@@ -1394,6 +1410,8 @@ +@@ -1395,6 +1411,8 @@ --with-pic else ./configure \ @@ -93,7 +93,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in CPPFLAGS="$CPPFLAGS" \ CFLAGS="$CFLAGS -fPIC" \ CXXFLAGS="$CXXFLAGS -fPIC" \ -@@ -1420,6 +1438,8 @@ +@@ -1421,6 +1439,8 @@ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ if test "$host_vendor" != "apple" ; then ./configure \ @@ -102,7 +102,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in CPPFLAGS="$CPPFLAGS" \ CFLAGS="$CFLAGS -fPIC" \ CXXFLAGS="$CXXFLAGS -fPIC" \ -@@ -1450,6 +1470,8 @@ +@@ -1451,6 +1471,8 @@ --disable-skyrocket else ./configure \ @@ -111,7 +111,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in CPPFLAGS="$CPPFLAGS" \ CFLAGS="$CFLAGS -fPIC" \ CXXFLAGS="$CXXFLAGS -fPIC" \ -@@ -1469,9 +1491,11 @@ +@@ -1470,9 +1492,11 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [ if test "$host_vendor" = "apple" ; then @@ -125,7 +125,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in fi ], [0]) -@@ -1480,7 +1504,9 @@ +@@ -1481,7 +1505,9 @@ CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared else diff --git a/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff b/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff index 90379aea4f..3ebd50d15c 100644 --- a/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff +++ b/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff @@ -1,6 +1,6 @@ -diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in ---- xbmc-28425/configure.in 2010-03-06 15:46:30.970324985 +0100 -+++ xbmc-28425.patch/configure.in 2010-03-06 15:46:44.355431403 +0100 +diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in +--- xbmc-28584/configure.in 2010-03-15 00:51:45.481151345 +0100 ++++ xbmc-28584.patch/configure.in 2010-03-15 00:52:15.206151488 +0100 @@ -33,6 +33,8 @@ xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. ==" goom_enabled="== GOOM enabled. ==" @@ -60,7 +60,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in AC_SUBST(USE_EXTERNAL_LIBRARIES) AC_SUBST(USE_EXTERNAL_FFMPEG) AC_SUBST(USE_EXTERNAL_LIBA52) -@@ -1433,7 +1457,7 @@ +@@ -1434,7 +1458,7 @@ -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" . set +x fi @@ -69,9 +69,9 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ if test "$host_vendor" != "apple" ; then -diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in ---- xbmc-28425/Makefile.in 2010-03-06 13:48:42.000000000 +0100 -+++ xbmc-28425.patch/Makefile.in 2010-03-06 15:46:44.356451434 +0100 +diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in +--- xbmc-28584/Makefile.in 2010-03-14 21:06:24.000000000 +0100 ++++ xbmc-28584.patch/Makefile.in 2010-03-15 00:55:14.471274664 +0100 @@ -104,8 +104,10 @@ VIS_DIRS=\ @@ -82,16 +82,16 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in +ifneq (@BUILD_XBMCPROJECTM@,1) +VIS_DIRS+=xbmc/visualizations/XBMCProjectM +endif - ifneq (@BUILD_GOOM@,1) - VIS_DIRS+=xbmc/visualizations/Goom + ifeq ($(findstring osx,$(ARCH)), osx) + VIS_DIRS+=xbmc/visualizations/iTunes endif -@@ -291,7 +293,9 @@ +@@ -294,7 +296,9 @@ visualizations: exports $(MAKE) -C xbmc/visualizations/OpenGLSpectrum $(MAKE) -C xbmc/visualizations/WaveForm +ifneq (@BUILD_XBMCPROJECTM@,1) $(MAKE) -C xbmc/visualizations/XBMCProjectM +endif - ifneq (@BUILD_GOOM@,1) - ifeq ($(or $(findstring powerpc-linux,$(ARCH)),$(findstring powerpc64-linux,$(ARCH))),) - $(MAKE) -C xbmc/visualizations/Goom + ifeq ($(findstring osx,$(ARCH)), osx) + $(MAKE) -C xbmc/visualizations/iTunes + endif diff --git a/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff b/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff index 3f68b2fb88..641ebc938f 100644 --- a/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff +++ b/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff @@ -1,6 +1,6 @@ -diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in ---- xbmc-28425/configure.in 2010-03-06 15:47:49.217295596 +0100 -+++ xbmc-28425.patch/configure.in 2010-03-06 15:48:00.615295765 +0100 +diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in +--- xbmc-28584/configure.in 2010-03-15 00:58:21.345276911 +0100 ++++ xbmc-28584.patch/configure.in 2010-03-15 00:58:38.170152082 +0100 @@ -35,6 +35,8 @@ goom_disabled="== GOOM disabled. ==" xbmcprojectm_enabled="== XBMCProjectM enabled. ==" @@ -60,7 +60,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in AC_SUBST(USE_EXTERNAL_LIBRARIES) AC_SUBST(USE_EXTERNAL_FFMPEG) AC_SUBST(USE_EXTERNAL_LIBA52) -@@ -1511,7 +1535,7 @@ +@@ -1512,7 +1536,7 @@ --disable-lattice \ --disable-skyrocket fi @@ -69,9 +69,9 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [ if test "$host_vendor" = "apple" ; then -diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in ---- xbmc-28425/Makefile.in 2010-03-06 15:47:49.218295582 +0100 -+++ xbmc-28425.patch/Makefile.in 2010-03-06 15:48:45.399294520 +0100 +diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in +--- xbmc-28584/Makefile.in 2010-03-15 00:58:21.346276544 +0100 ++++ xbmc-28584.patch/Makefile.in 2010-03-15 00:58:38.176152470 +0100 @@ -99,8 +99,10 @@ lib/xbmc-dll-symbols \ lib/jsoncpp/jsoncpp/src/lib_json @@ -85,7 +85,7 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in VIS_DIRS=\ xbmc/visualizations/OpenGLSpectrum \ -@@ -302,7 +304,9 @@ +@@ -308,7 +310,9 @@ endif endif screensavers: exports diff --git a/packages/mediacenter/xbmc/patches/xbmc-add_DESTDIR_support_to_make_install-0.1.diff b/packages/mediacenter/xbmc/patches/xbmc-add_DESTDIR_support_to_make_install-0.1.diff index 63f3ff28ca..cb767ce20e 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-add_DESTDIR_support_to_make_install-0.1.diff +++ b/packages/mediacenter/xbmc/patches/xbmc-add_DESTDIR_support_to_make_install-0.1.diff @@ -1,7 +1,7 @@ -diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in ---- xbmc-28425/Makefile.in 2010-03-06 15:49:58.203323655 +0100 -+++ xbmc-28425.patch/Makefile.in 2010-03-06 15:53:21.236294350 +0100 -@@ -480,7 +480,7 @@ +diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in +--- xbmc-28584/Makefile.in 2010-03-15 01:06:53.490151727 +0100 ++++ xbmc-28584.patch/Makefile.in 2010-03-15 01:06:07.685150760 +0100 +@@ -486,7 +486,7 @@ $(MAKE) -C tools/TexturePacker/ install-bin: xbmc.bin # developement convenience target @@ -10,7 +10,7 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in ifeq ($(findstring osx,$(ARCH)), osx) # TODO: add osx install -@@ -488,55 +488,55 @@ +@@ -494,55 +494,55 @@ install: install-binaries install-arch install-datas install-web install-binaries: install-scripts @@ -47,8 +47,8 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in - @echo "Copying system files to $(prefix)/share/xbmc" + @echo "Copying system files to $(DESTDIR)/$(prefix)/share/xbmc" @# Arch independent files -- @find addons language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r" -+ @find addons language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(DESTDIR)/$(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r" +- @find addons language media scripts sounds userdata system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" -exec install -D -m 0644 "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r" ++ @find addons language media scripts sounds userdata system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" -exec install -D -m 0644 "{}" $(DESTDIR)/$(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r" @# Skins - @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r" + @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(DESTDIR)/$(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r" diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url index dfbdad4b4b..734d3e3701 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-28425.tar.bz2 +http://sources.openelec.tv/svn/xbmc-28584.tar.bz2 From 1a83044fd0a7df52b434fef94ee6f84629cf7f8c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 02:09:05 +0100 Subject: [PATCH 31/84] xbmc-theme-Confluence: - update to xbmc-theme-Confluence-28584 --- packages/mediacenter/xbmc-theme-Confluence/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/url b/packages/mediacenter/xbmc-theme-Confluence/url index 2f05ae269a..450de66da9 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/url +++ b/packages/mediacenter/xbmc-theme-Confluence/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-theme-Confluence-28425.tar.bz2 +http://sources.openelec.tv/svn/xbmc-theme-Confluence-28584.tar.bz2 From ed1a2a53046074bd9254649f2562488c7b274e95 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 02:09:49 +0100 Subject: [PATCH 32/84] busybox: - start debugshell in debugmode - cosmetics --- .../sysutils/busybox/init.d/10_debugshell | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/sysutils/busybox/init.d/10_debugshell b/packages/sysutils/busybox/init.d/10_debugshell index e4b8f2ba91..e4ff04ec09 100755 --- a/packages/sysutils/busybox/init.d/10_debugshell +++ b/packages/sysutils/busybox/init.d/10_debugshell @@ -1,15 +1,17 @@ -# start the ACPI daemon subsystem +# start debug shell # -# runlevels: openelec, text, debug +# runlevels: openelec, debug, text -TTY="3" + TTY="3" -( - echo "#############################################" - echo "### it seems we are running in Debug mode ###" - echo "### starting debugging shell on console $TTY ###" - echo "### ...... switch with ctrl-alt-f$TTY ...... ###" - echo "#############################################" - exec /bin/sh /dev/tty$TTY 2>&1 -)& +if [ "$DEBUG"="yes" ]; then + echo "###########################################" + echo "## it seems we are running in Debug mode ##" + echo "## starting debugging shell on console $TTY ##" + echo "## ...... switch with ctrl-alt-f$TTY ...... ##" + echo "###########################################" + + exec /bin/sh /dev/tty$TTY 2>&1 & + +fi From 8129009ebd13b107d32e0ac6599a13a6e20dd74a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 02:11:05 +0100 Subject: [PATCH 33/84] busybox: - add init script to start shell for textmode (move from /sbin/init) - remove unneeded runlevel configure --- packages/sysutils/busybox/init.d/99_shell | 15 +++++++++++++++ packages/sysutils/busybox/scripts/init | 9 --------- 2 files changed, 15 insertions(+), 9 deletions(-) create mode 100755 packages/sysutils/busybox/init.d/99_shell diff --git a/packages/sysutils/busybox/init.d/99_shell b/packages/sysutils/busybox/init.d/99_shell new file mode 100755 index 0000000000..470b942086 --- /dev/null +++ b/packages/sysutils/busybox/init.d/99_shell @@ -0,0 +1,15 @@ +# start text mode shell +# +# runlevels: text + +TTY="1" + +echo "###########################################" +echo "## it seems we are running in Text mode. ##" +echo "## .... starting shell on console $TTY .... ##" +echo "## ...... switch with ctrl-alt-f$TTY ...... ##" +echo "###########################################" + +while true; do + exec /bin/sh /dev/tty$TTY 2>&1 +done diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 596e920f10..4a538b5fdc 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -65,8 +65,6 @@ RUNLEVEL="openelec" if test "$TEXTMODE" = yes; then RUNLEVEL="text" - elif test "$CONFIGURE" = yes; then - RUNLEVEL="configure" fi # starting init scripts for wanted runlevel @@ -80,10 +78,3 @@ test $S_RET -ge $RET && RET=$S_RET fi done - -# if we have an problem we must look where is this problem - echo "###################################" - echo "### it seems we have an problem ###" - echo "### starting emergency shell... ###" - echo "###################################" - exec /bin/sh /dev/tty1 2>&1 From 3c6717e986b74a9a85288517edabbe965d62b3c9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 04:43:34 +0100 Subject: [PATCH 34/84] avahi: - cosmetics: we dont have an runlevel debug --- packages/network/avahi/init.d/21_avahi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/avahi/init.d/21_avahi b/packages/network/avahi/init.d/21_avahi index c0acb0ff21..d3833b8fd0 100755 --- a/packages/network/avahi/init.d/21_avahi +++ b/packages/network/avahi/init.d/21_avahi @@ -1,6 +1,6 @@ # start Avahi Daemon # -# runlevels: openelec, text, debug +# runlevels: openelec, text ( progress "Starting Avahi Daemon" From 3f293e98f657276d997874e3439526cbec188080 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 04:43:53 +0100 Subject: [PATCH 35/84] connman: - cosmetics: we dont have an runlevel debug --- packages/network/connman/init.d/40_connman | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/network/connman/init.d/40_connman b/packages/network/connman/init.d/40_connman index 55d77ab4f9..a4445a458f 100755 --- a/packages/network/connman/init.d/40_connman +++ b/packages/network/connman/init.d/40_connman @@ -1,8 +1,9 @@ # start connman network manager # -# runlevels: openelec, text, debug +# runlevels: openelec, text progress "Starting Connection Manager" + $IONICE mkdir -p /var/run $IONICE touch /var/run/resolv.conf connmand From 9e210b6b330425578e970837f6d2e9639be08f7c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 04:44:35 +0100 Subject: [PATCH 36/84] dropbear: - cosmetics: we dont have an runlevel debug - cosmetics --- packages/network/dropbear/init.d/41_sshd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/network/dropbear/init.d/41_sshd b/packages/network/dropbear/init.d/41_sshd index 055b3cacbf..a4c06f5499 100755 --- a/packages/network/dropbear/init.d/41_sshd +++ b/packages/network/dropbear/init.d/41_sshd @@ -1,6 +1,6 @@ -# start telnet daemon +# start ssh server # -# runlevels: openelec, text, debug +# runlevels: openelec, text ( # Check for the Dropbear RSA key @@ -8,7 +8,7 @@ progress "SSH: generating rsa key" $IONICE mkdir -p /etc/dropbear - /usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null 2>&1 + dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null 2>&1 fi # Check for the Dropbear DSS key @@ -16,14 +16,14 @@ progress "SSH: generating dsa key" $IONICE mkdir -p /etc/dropbear - /usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null 2>&1 + dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null 2>&1 fi progress "Starting SSH Server" $IONICE mkdir -p /var/log - $IONICE touch /var/log/lastlog - $IONICE touch /var/log/wtmp + $IONICE touch /var/log/lastlog + $IONICE touch /var/log/wtmp dropbear -b /etc/issue -P /var/run/dropbear.pid From 209948112dd2d73bf541c7f255d7e8fc50231e86 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 04:44:47 +0100 Subject: [PATCH 37/84] samba: - cosmetics: we dont have an runlevel debug --- packages/network/samba/init.d/42_samba | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/samba/init.d/42_samba b/packages/network/samba/init.d/42_samba index 2fac4acacb..0ce3b0e941 100755 --- a/packages/network/samba/init.d/42_samba +++ b/packages/network/samba/init.d/42_samba @@ -1,6 +1,6 @@ # start Samba Server # -# runlevels: openelec, text, debug +# runlevels: openelec, text ( progress "Starting Samba server" From 3b89c4d26c1bb4099ec9adf3fbc999176cf0509b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 04:45:02 +0100 Subject: [PATCH 38/84] ConsoleKit: - cosmetics: we dont have an runlevel debug --- packages/sysutils/ConsoleKit/init.d/11_ConsoleKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/ConsoleKit/init.d/11_ConsoleKit b/packages/sysutils/ConsoleKit/init.d/11_ConsoleKit index 7d8f9fb183..4db101b8e2 100755 --- a/packages/sysutils/ConsoleKit/init.d/11_ConsoleKit +++ b/packages/sysutils/ConsoleKit/init.d/11_ConsoleKit @@ -1,6 +1,6 @@ # start D-BUS daemon # -# runlevels: openelec, text, debug +# runlevels: openelec, text ( progress "Setup ConsoleKit" From 62dd1e812ce3ae6cf8e716c4eaf701019f97bc65 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 04:45:34 +0100 Subject: [PATCH 39/84] busybox: - cosmetics: we dont have an runlevel debug - cosmetics --- packages/sysutils/busybox/init.d/01_syslogd | 3 +-- packages/sysutils/busybox/init.d/02_network | 2 +- packages/sysutils/busybox/init.d/10_debugshell | 4 ++-- packages/sysutils/busybox/init.d/14_acpid | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/sysutils/busybox/init.d/01_syslogd b/packages/sysutils/busybox/init.d/01_syslogd index e03bb3e5ed..ff2b74060c 100755 --- a/packages/sysutils/busybox/init.d/01_syslogd +++ b/packages/sysutils/busybox/init.d/01_syslogd @@ -1,11 +1,10 @@ # # start syslog daemon # -# runlevels: openelec, text, debug +# runlevels: openelec, text ( progress "Starting Syslog daemon" - mkdir -p /var/log syslogd )& diff --git a/packages/sysutils/busybox/init.d/02_network b/packages/sysutils/busybox/init.d/02_network index 218dd533ee..b7fb72b0eb 100755 --- a/packages/sysutils/busybox/init.d/02_network +++ b/packages/sysutils/busybox/init.d/02_network @@ -1,7 +1,7 @@ # # start syslog daemon # -# runlevels: openelec, text, debug +# runlevels: openelec, text HOSTNAME=`cat /etc/hostname` diff --git a/packages/sysutils/busybox/init.d/10_debugshell b/packages/sysutils/busybox/init.d/10_debugshell index e4ff04ec09..f957b55e99 100755 --- a/packages/sysutils/busybox/init.d/10_debugshell +++ b/packages/sysutils/busybox/init.d/10_debugshell @@ -1,10 +1,10 @@ # start debug shell # -# runlevels: openelec, debug, text +# runlevels: openelec, text TTY="3" -if [ "$DEBUG"="yes" ]; then +if [ "$DEBUG" = "yes" ]; then echo "###########################################" echo "## it seems we are running in Debug mode ##" diff --git a/packages/sysutils/busybox/init.d/14_acpid b/packages/sysutils/busybox/init.d/14_acpid index 963ef9d8ac..bc5fc51180 100755 --- a/packages/sysutils/busybox/init.d/14_acpid +++ b/packages/sysutils/busybox/init.d/14_acpid @@ -1,6 +1,6 @@ # start the ACPI daemon subsystem # -# runlevels: openelec, text, debug +# runlevels: openelec, text ( progress "Starting ACPI daemon" From 7a126388882cd2d45603c15ebbd4a0a51597faff Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 04:46:02 +0100 Subject: [PATCH 40/84] uxlaunch: - cosmetics --- packages/sysutils/uxlaunch/init.d/60_uxlaunch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/uxlaunch/init.d/60_uxlaunch b/packages/sysutils/uxlaunch/init.d/60_uxlaunch index 30ba2515c4..a31dfe9b0e 100644 --- a/packages/sysutils/uxlaunch/init.d/60_uxlaunch +++ b/packages/sysutils/uxlaunch/init.d/60_uxlaunch @@ -7,13 +7,13 @@ progress "starting uxlaunch" UX_USER="root" UX_TTY="1" - if [ "$START_MRXVT" = yes ]; then + if [ "$START_MRXVT" = "yes" ]; then UX_SESSION="/usr/bin/mrxvt-session" else UX_SESSION="/usr/bin/xbmc-session" fi UX_ARG="-u $UX_USER -t $UX_TTY -s $UX_SESSION" - [ "$DEBUG" = yes ] && UX_ARG="$UX_ARG -v" + [ "$DEBUG" = "yes" ] && UX_ARG="$UX_ARG -v" uxlaunch $UX_ARG > /dev/null 2>&1 \ No newline at end of file From e521d554ed8a9db45409d427655d89b2e738e91a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 04:46:16 +0100 Subject: [PATCH 41/84] lirc: - cosmetics: we dont have an runlevel debug --- packages/sysutils/lirc/init.d/21_lirc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/lirc/init.d/21_lirc b/packages/sysutils/lirc/init.d/21_lirc index f7702dede7..91ebd04ff7 100755 --- a/packages/sysutils/lirc/init.d/21_lirc +++ b/packages/sysutils/lirc/init.d/21_lirc @@ -1,6 +1,6 @@ # start the LIRC daemon # -# runlevels: openelec, text, debug +# runlevels: openelec, text ( progress "Starting LIRC daemon" From 5ce2f1c0509f80c8262c5ddb5442978203bfb1f8 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 04:48:30 +0100 Subject: [PATCH 42/84] xbmc: - fix kernel panic if we exit xbmc normally - fix starting of windowmanager - better fastboot support --- packages/mediacenter/xbmc/scripts/xbmc-session | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/mediacenter/xbmc/scripts/xbmc-session b/packages/mediacenter/xbmc/scripts/xbmc-session index 40e0603dbf..dcf8231cf8 100755 --- a/packages/mediacenter/xbmc/scripts/xbmc-session +++ b/packages/mediacenter/xbmc/scripts/xbmc-session @@ -13,13 +13,13 @@ fi while true; do - [ $START_WM="yes" ] && $WINDOWMANAGER & + [ "$START_WM" = "yes" ] && $WINDOWMANAGER & - $XBMC_BIN $XBMC_ARGS $@ > /dev/null 2>&1 + $IONICE $XBMC_BIN $XBMC_ARGS $@ > /dev/null 2>&1 RET=$? echo "Exited with code $RET" - [ "$RET" == 0 ] && break + [ "$RET" == 0 ] && sync && poweroff [ "$RET" == 64 ] && sync && poweroff [ "$RET" == 66 ] && sync && reboot From 45ae0f0917d469dae6fb23da80dadc50a3908857 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 18:29:58 +0100 Subject: [PATCH 43/84] xbmc: - adding init script for caching xbmc.bin (move from /sbin/init) --- packages/mediacenter/xbmc/init.d/09_cache_xbmc | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 packages/mediacenter/xbmc/init.d/09_cache_xbmc diff --git a/packages/mediacenter/xbmc/init.d/09_cache_xbmc b/packages/mediacenter/xbmc/init.d/09_cache_xbmc new file mode 100755 index 0000000000..92869d22a7 --- /dev/null +++ b/packages/mediacenter/xbmc/init.d/09_cache_xbmc @@ -0,0 +1,12 @@ +# +# caching xbmc +# +# runlevels: openelec, text + +if [ "$XBMC_CACHING" = "yes" ]; then + + progress "caching XBMC" + + cache_xbmc + +fi \ No newline at end of file From 0cb69b4e35ba46e212c7e47935832956a796b369 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 18:30:27 +0100 Subject: [PATCH 44/84] avahi: - start avahi later --- packages/network/avahi/init.d/{21_avahi => 24_avahi} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/network/avahi/init.d/{21_avahi => 24_avahi} (100%) diff --git a/packages/network/avahi/init.d/21_avahi b/packages/network/avahi/init.d/24_avahi similarity index 100% rename from packages/network/avahi/init.d/21_avahi rename to packages/network/avahi/init.d/24_avahi From d5c03c14cd1c23fd4948463fe3a73f10b6378197 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 18:31:07 +0100 Subject: [PATCH 45/84] ConsoleKit: - start ConsoleKit daemon later --- .../sysutils/ConsoleKit/init.d/{11_ConsoleKit => 25_ConsoleKit} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/sysutils/ConsoleKit/init.d/{11_ConsoleKit => 25_ConsoleKit} (100%) diff --git a/packages/sysutils/ConsoleKit/init.d/11_ConsoleKit b/packages/sysutils/ConsoleKit/init.d/25_ConsoleKit similarity index 100% rename from packages/sysutils/ConsoleKit/init.d/11_ConsoleKit rename to packages/sysutils/ConsoleKit/init.d/25_ConsoleKit From f290900375fad9f7998001d7f65bd2624c3e48ed Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 18:35:21 +0100 Subject: [PATCH 46/84] busybox: - adding init script for mounting filesystem (move from /sbin/init) - adding init script for making /var directory structure (move from /sbin/init) - adding init script for copying userconfig (move from /sbin/init) - start syslogd later - start networking later - start debugshell later - use getty for debugshell - start acpid daemon later - use getty for textmode shell --- .../busybox/init.d/01_mount_filesystem | 8 +++ .../busybox/init.d/02_make_directorys | 15 +++++ .../sysutils/busybox/init.d/03_userconfig | 13 +++++ .../busybox/init.d/{02_network => 04_network} | 0 .../busybox/init.d/{01_syslogd => 10_syslogd} | 0 .../init.d/{10_debugshell => 21_debugshell} | 3 +- .../busybox/init.d/{14_acpid => 23_acpid} | 0 packages/sysutils/busybox/init.d/99_shell | 3 +- packages/sysutils/busybox/scripts/init | 58 ------------------- 9 files changed, 40 insertions(+), 60 deletions(-) create mode 100755 packages/sysutils/busybox/init.d/01_mount_filesystem create mode 100755 packages/sysutils/busybox/init.d/02_make_directorys create mode 100755 packages/sysutils/busybox/init.d/03_userconfig rename packages/sysutils/busybox/init.d/{02_network => 04_network} (100%) rename packages/sysutils/busybox/init.d/{01_syslogd => 10_syslogd} (100%) rename packages/sysutils/busybox/init.d/{10_debugshell => 21_debugshell} (78%) rename packages/sysutils/busybox/init.d/{14_acpid => 23_acpid} (100%) diff --git a/packages/sysutils/busybox/init.d/01_mount_filesystem b/packages/sysutils/busybox/init.d/01_mount_filesystem new file mode 100755 index 0000000000..2d53d275fa --- /dev/null +++ b/packages/sysutils/busybox/init.d/01_mount_filesystem @@ -0,0 +1,8 @@ +# +# mounting needed filesystems +# +# runlevels: openelec, text + +progress "mounting needed filesystems" + + $IONICE mount -n -t ramfs none /var diff --git a/packages/sysutils/busybox/init.d/02_make_directorys b/packages/sysutils/busybox/init.d/02_make_directorys new file mode 100755 index 0000000000..d289e0dfab --- /dev/null +++ b/packages/sysutils/busybox/init.d/02_make_directorys @@ -0,0 +1,15 @@ +# +# make variable directory structure +# +# runlevels: openelec, text + +progress "make variable directory structure" + $IONICE mkdir -p /var/log \ + /var/lock \ + /var/media \ + /var/run \ + /var/tmp \ + /var/run/sepermit + + $IONICE chmod 1777 /var/run /var/tmp + diff --git a/packages/sysutils/busybox/init.d/03_userconfig b/packages/sysutils/busybox/init.d/03_userconfig new file mode 100755 index 0000000000..e11f33fa18 --- /dev/null +++ b/packages/sysutils/busybox/init.d/03_userconfig @@ -0,0 +1,13 @@ +# +# copying config into storage +# +# runlevels: openelec, text + +progress "copying config into storage" + + $IONICE mkdir -p $HOME/.config + + for i in `ls /usr/config`; do + [ ! -f "$HOME/.config/$i" ] && cp -PR /usr/config/$i $HOME/.config + done + diff --git a/packages/sysutils/busybox/init.d/02_network b/packages/sysutils/busybox/init.d/04_network similarity index 100% rename from packages/sysutils/busybox/init.d/02_network rename to packages/sysutils/busybox/init.d/04_network diff --git a/packages/sysutils/busybox/init.d/01_syslogd b/packages/sysutils/busybox/init.d/10_syslogd similarity index 100% rename from packages/sysutils/busybox/init.d/01_syslogd rename to packages/sysutils/busybox/init.d/10_syslogd diff --git a/packages/sysutils/busybox/init.d/10_debugshell b/packages/sysutils/busybox/init.d/21_debugshell similarity index 78% rename from packages/sysutils/busybox/init.d/10_debugshell rename to packages/sysutils/busybox/init.d/21_debugshell index f957b55e99..df87f538b4 100755 --- a/packages/sysutils/busybox/init.d/10_debugshell +++ b/packages/sysutils/busybox/init.d/21_debugshell @@ -12,6 +12,7 @@ if [ "$DEBUG" = "yes" ]; then echo "## ...... switch with ctrl-alt-f$TTY ...... ##" echo "###########################################" - exec /bin/sh /dev/tty$TTY 2>&1 & +# exec /bin/sh /dev/tty$TTY 2>&1 & + exec /sbin/getty -n -l /bin/sh 38400 tty$TTY & fi diff --git a/packages/sysutils/busybox/init.d/14_acpid b/packages/sysutils/busybox/init.d/23_acpid similarity index 100% rename from packages/sysutils/busybox/init.d/14_acpid rename to packages/sysutils/busybox/init.d/23_acpid diff --git a/packages/sysutils/busybox/init.d/99_shell b/packages/sysutils/busybox/init.d/99_shell index 470b942086..6382da0947 100755 --- a/packages/sysutils/busybox/init.d/99_shell +++ b/packages/sysutils/busybox/init.d/99_shell @@ -11,5 +11,6 @@ echo "## ...... switch with ctrl-alt-f$TTY ...... ##" echo "###########################################" while true; do - exec /bin/sh /dev/tty$TTY 2>&1 +# exec /bin/sh /dev/tty$TTY 2>&1 + exec /sbin/getty -n -l /bin/sh 38400 tty$TTY done diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 4a538b5fdc..57254d6e8e 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -3,64 +3,6 @@ # read config . /etc/sysconfig -# Starting Splash - [ "$DEBUG" != "yes" \ - -a "$TEXTMODE" != "yes" \ - -a -f /usr/bin/ply-image \ - -a -f /usr/share/splash/Splash.png \ - ] && ply-image /usr/share/splash/Splash.png & - -# mounting needed filesystems - progress "mounting needed filesystems" - $IONICE mount -n -t ramfs none /var - -# make variable directory structure - progress "make variable directory structure" - $IONICE mkdir -p /var/log \ - /var/lock \ - /var/media \ - /var/run \ - /var/tmp \ - /var/run/sepermit - - $IONICE chmod 1777 /var/run /var/tmp - -# copying config into storage - progress "copying config into storage" - mkdir -p $HOME/.config - for i in `ls /usr/config`; do - [ ! -f "$HOME/.config/$i" ] && \ - cp -PR /usr/config/$i $HOME/.config - done - -# caching xbmc - [ "$XBMC_CACHING" = "yes" ] && cache_xbmc - -# starting Udev - progress "starting Udev" - echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug - $NICE_20 udevd --daemon - $NICE_20 udevadm monitor 2>&1 >/var/log/udev.log & - $NICE_20 udevadm control --env STARTUP=1 - ( - $NICE_20 udevadm trigger - $NICE_20 udevadm settle --timeout=5 - $NICE_20 udevadm control --env STARTUP= - )& - -# starting dbus - progress "Starting D-BUS" - $IONICE mkdir -p /var/lib/dbus /var/run/dbus - dbus-daemon --system - dbus-uuidgen --ensure - -# starting HAL - progress "Starting Hardware Abstraction Layer" - $IONICE mkdir -p /var/cache/hald - $IONICE mkdir -p /var/run/dbus/hald-local - $IONICE mkdir -p /var/run/dbus/hald-runner - hald --verbose=no --daemon=yes --use-syslog - # getting runlevel RUNLEVEL="openelec" if test "$TEXTMODE" = yes; then From 8b95a212f656bdd52238da18b61fa5e14029d9bf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 18:35:54 +0100 Subject: [PATCH 47/84] dbus: - adding init script for starting dbus daemon (move from /sbin/init) --- packages/sysutils/dbus/init.d/12_dbus | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 packages/sysutils/dbus/init.d/12_dbus diff --git a/packages/sysutils/dbus/init.d/12_dbus b/packages/sysutils/dbus/init.d/12_dbus new file mode 100755 index 0000000000..302d6ae3f4 --- /dev/null +++ b/packages/sysutils/dbus/init.d/12_dbus @@ -0,0 +1,11 @@ +# +# starting dbus +# +# runlevels: openelec, text + +progress "Starting D-BUS" + + $IONICE mkdir -p /var/lib/dbus /var/run/dbus + + dbus-daemon --system + dbus-uuidgen --ensure From ba4382081943fa01f0dfc8f82d00690b3653d355 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 18:36:12 +0100 Subject: [PATCH 48/84] hal: - adding init script for starting hal daemon (move from /sbin/init) --- packages/sysutils/hal/init.d/13_hal | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 packages/sysutils/hal/init.d/13_hal diff --git a/packages/sysutils/hal/init.d/13_hal b/packages/sysutils/hal/init.d/13_hal new file mode 100755 index 0000000000..b3dbffe0be --- /dev/null +++ b/packages/sysutils/hal/init.d/13_hal @@ -0,0 +1,12 @@ +# +# starting HAL +# +# runlevels: openelec, text + +progress "Starting Hardware Abstraction Layer" + + $IONICE mkdir -p /var/cache/hald \ + /var/run/dbus/hald-local \ + /var/run/dbus/hald-runner + + hald --verbose=no --daemon=yes --use-syslog From c3046a0f151972e875674eeccc6700052d47698f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 18:36:29 +0100 Subject: [PATCH 49/84] lirc: - starting lirc later --- packages/sysutils/lirc/init.d/{21_lirc => 32_lirc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/sysutils/lirc/init.d/{21_lirc => 32_lirc} (100%) diff --git a/packages/sysutils/lirc/init.d/21_lirc b/packages/sysutils/lirc/init.d/32_lirc similarity index 100% rename from packages/sysutils/lirc/init.d/21_lirc rename to packages/sysutils/lirc/init.d/32_lirc From 77836a81deabe654e30e855f5227df07e1eb1416 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 18:36:51 +0100 Subject: [PATCH 50/84] plymouth-lite: - adding init script for starting splash (move from /sbin/init) --- packages/sysutils/plymouth-lite/init.d/00_plymouth | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 packages/sysutils/plymouth-lite/init.d/00_plymouth diff --git a/packages/sysutils/plymouth-lite/init.d/00_plymouth b/packages/sysutils/plymouth-lite/init.d/00_plymouth new file mode 100755 index 0000000000..3008c940f4 --- /dev/null +++ b/packages/sysutils/plymouth-lite/init.d/00_plymouth @@ -0,0 +1,11 @@ +# +# starting splash +# +# runlevels: openelec, text + +( + [ "$DEBUG" != "yes" -a "$TEXTMODE" != "yes" \ + -a -f /usr/bin/ply-image -a -f /usr/share/splash/Splash.png \ + ] && ply-image /usr/share/splash/Splash.png +)& + From 42ad6703d02ad698957dc4988267a66fd7f96475 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 18:37:06 +0100 Subject: [PATCH 51/84] udev: - adding init script for starting udev daemon (move from /sbin/init) --- packages/sysutils/udev/init.d/11_udev | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100755 packages/sysutils/udev/init.d/11_udev diff --git a/packages/sysutils/udev/init.d/11_udev b/packages/sysutils/udev/init.d/11_udev new file mode 100755 index 0000000000..c3fe754da2 --- /dev/null +++ b/packages/sysutils/udev/init.d/11_udev @@ -0,0 +1,18 @@ +# +# starting Udev +# +# runlevels: openelec, text + +progress "starting Udev" + + echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug + + $NICE_20 udevd --daemon + $NICE_20 udevadm monitor 2>&1 >/var/log/udev.log & + $NICE_20 udevadm control --env STARTUP=1 + + ( + $NICE_20 udevadm trigger + $NICE_20 udevadm settle --timeout=5 + $NICE_20 udevadm control --env STARTUP= + )& From 25aa8896e470ca6a8af0dde068ede1dd8633d442 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 18:37:30 +0100 Subject: [PATCH 52/84] xorg-server: - remove configfile --- packages/x11/xserver/xorg-server/conf.d/xorg | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 packages/x11/xserver/xorg-server/conf.d/xorg diff --git a/packages/x11/xserver/xorg-server/conf.d/xorg b/packages/x11/xserver/xorg-server/conf.d/xorg deleted file mode 100644 index 2c44a1926f..0000000000 --- a/packages/x11/xserver/xorg-server/conf.d/xorg +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# X.org environment variables. -# -# This file contains non-OpenELEC evironment variables as well as OpenELEC -# evironment variables that are not user defined. -################################################################################ - -#------------------------------------------------------------------------------- -# X environment variables. -#------------------------------------------------------------------------------- -DISPLAY=':0.0' - -export DISPLAY From c3b91e179a0110d3d315b753a210f8ec7461bd06 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 18:38:30 +0100 Subject: [PATCH 53/84] xorg-server: - configure xorg directories sooner --- .../xorg-server/init.d/05_configure_xorg | 19 +++++++++++++ .../xorg-server/init.d/12_configure-xorg | 27 ------------------- 2 files changed, 19 insertions(+), 27 deletions(-) create mode 100755 packages/x11/xserver/xorg-server/init.d/05_configure_xorg delete mode 100644 packages/x11/xserver/xorg-server/init.d/12_configure-xorg diff --git a/packages/x11/xserver/xorg-server/init.d/05_configure_xorg b/packages/x11/xserver/xorg-server/init.d/05_configure_xorg new file mode 100755 index 0000000000..fc0f8efea6 --- /dev/null +++ b/packages/x11/xserver/xorg-server/init.d/05_configure_xorg @@ -0,0 +1,19 @@ +# +# configure xorg directories +# +# runlevels: openelec, text + +progress "creating directories needed for Xorg" + + $IONICE mkdir -p /var/cache/xkb + $IONICE mkdir -p /var/lib + $IONICE mkdir -m 1777 -p /tmp/.ICE-unix + $IONICE chown root:root /tmp/.ICE-unix + + if lspci -n | grep 0300 | grep -q 10de; then + $IONICE ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so + $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so + else + $IONICE ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so + $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so + fi diff --git a/packages/x11/xserver/xorg-server/init.d/12_configure-xorg b/packages/x11/xserver/xorg-server/init.d/12_configure-xorg deleted file mode 100644 index 2adc464a53..0000000000 --- a/packages/x11/xserver/xorg-server/init.d/12_configure-xorg +++ /dev/null @@ -1,27 +0,0 @@ -# configure X.Org video settings -# -# runlevels: openelec, text, debug - -if lspci -n | grep 0300 | grep -q 10de; then - - progress "Found nVidia card, loading NVidia driver" - $IONICE modprobe nvidia & - - progress "Found nVidia card, enabling NVIDIA GLX as requested" - $IONICE mkdir -p /var/lib - $IONICE ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so - $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so - -else - - progress "Not found nVidia card, enabling Mesa GLX as requested" - $IONICE mkdir -p /var/lib - $IONICE ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so - $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so - -fi - -# Make some needed directorys - $IONICE mkdir -p /var/cache/xkb - $IONICE mkdir -m 1777 -p /tmp/.ICE-unix - $IONICE chown root:root /tmp/.ICE-unix From 8a33e34ae0e6e47a67c716b40050b80807be4fca Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 18:39:29 +0100 Subject: [PATCH 54/84] xorg-server: - temporary disable installation of xf86-input-wacom --- packages/x11/xserver/xorg-server/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index d13662159d..42c02b95a3 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -74,7 +74,7 @@ mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/ #Drivers $SCRIPTS/install xf86-input-evdev $SCRIPTS/install xf86-input-synaptics - $SCRIPTS/install xf86-input-wacom +# $SCRIPTS/install xf86-input-wacom for drv in $XORG_DRIVERS; do $SCRIPTS/install xf86-video-$drv From 383fc9af01777522385b7a04ef7e0921bd0238a4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 16 Mar 2010 10:35:53 +0100 Subject: [PATCH 55/84] xorg-server: - update to xorg-server-1.7.5.902 - big patch cleanup --- ...omxorg.diff => 001_fedora_extramodes.diff} | 0 ...xkbcomp-output-for-fast-start-up-v5.3.diff | 336 ------------------ ...ng.patch => 03_fedora_glx_versioning.diff} | 0 ...rast.patch => 04_fedora_glx14-swrast.diff} | 0 .../05_only_call_gamma_set_if_nonnull.diff | 25 ++ ...ont_trap_access_to_timer_and_keyboard.diff | 22 ++ .../patches/100_xserver_exa_force_greedy.diff | 30 -- ...t-after-CreateWellKnownSockets-and-In.diff | 34 ++ .../patches/110_fedora_no_move_damage.diff | 35 -- ...56_exevents_copykeyclass_nullptrcheck.diff | 22 -- .../patches/157_check_null_modes.diff | 14 - .../patches/158_raise_maxclients.diff | 12 - ...16-xfree86-fix-build-with-xv-disabled.diff | 53 +++ .../patches/162_null_crtc_in_rotation.diff | 13 - .../patches/164_trap-aspect-ratios.diff | 61 ---- .../166_nullptr_xinerama_keyrepeat.diff | 30 -- .../patches/167_nullptr_xisbread.diff | 13 - .../patches/169_mipointer_nullptr_checks.diff | 107 ------ ...172_cwgetbackingpicture_nullptr_check.diff | 39 -- .../patches/173_edid_quirk_philips_lcd.diff | 21 -- ...0_fedora_no_synaptics_mouse_synthesis.diff | 16 - .../patches/201_fedora-pci-primary.diff | 91 ----- .../patches/30_typedef-apm-2.6.24.diff | 12 - ...proc-instead-of-sysfs-for-pci-domains.diff | 32 -- .../66_only-switch-vt-when-active.diff | 32 -- ...oppy-heuristic-first-for-initial-mode.diff | 17 + ....patch => xserver-1.5.0-bg-none-root.diff} | 0 .../xserver-1.5.0-projector-fb-size.patch | 32 -- .../patches/xserver-1.5.1-mode-debug.patch | 26 -- .../xserver-1.6.0-less-acpi-brokenness.patch | 31 -- .../patches/xserver-1.7.1-libcrypto.patch | 35 -- ...r-boottime.patch => xserver-boottime.diff} | 0 packages/x11/xserver/xorg-server/url | 2 +- 33 files changed, 152 insertions(+), 1041 deletions(-) rename packages/x11/xserver/xorg-server/patches/{20_extra_modelines_fromxorg.diff => 001_fedora_extramodes.diff} (100%) delete mode 100644 packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff rename packages/x11/xserver/xorg-server/patches/{xserver-1.7.0-glx-versioning.patch => 03_fedora_glx_versioning.diff} (100%) rename packages/x11/xserver/xorg-server/patches/{xserver-1.7.1-glx14-swrast.patch => 04_fedora_glx14-swrast.diff} (100%) create mode 100644 packages/x11/xserver/xorg-server/patches/05_only_call_gamma_set_if_nonnull.diff create mode 100644 packages/x11/xserver/xorg-server/patches/06_dont_trap_access_to_timer_and_keyboard.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/100_xserver_exa_force_greedy.diff create mode 100644 packages/x11/xserver/xorg-server/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/110_fedora_no_move_damage.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/156_exevents_copykeyclass_nullptrcheck.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/157_check_null_modes.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/158_raise_maxclients.diff create mode 100644 packages/x11/xserver/xorg-server/patches/16-xfree86-fix-build-with-xv-disabled.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/162_null_crtc_in_rotation.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/164_trap-aspect-ratios.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/166_nullptr_xinerama_keyrepeat.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/167_nullptr_xisbread.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/169_mipointer_nullptr_checks.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/172_cwgetbackingpicture_nullptr_check.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/173_edid_quirk_philips_lcd.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/180_fedora_no_synaptics_mouse_synthesis.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/201_fedora-pci-primary.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/30_typedef-apm-2.6.24.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/60_use-proc-instead-of-sysfs-for-pci-domains.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/66_only-switch-vt-when-active.diff create mode 100644 packages/x11/xserver/xorg-server/patches/use-sloppy-heuristic-first-for-initial-mode.diff rename packages/x11/xserver/xorg-server/patches/{xserver-1.5.0-bg-none-root.patch => xserver-1.5.0-bg-none-root.diff} (100%) delete mode 100644 packages/x11/xserver/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch delete mode 100644 packages/x11/xserver/xorg-server/patches/xserver-1.5.1-mode-debug.patch delete mode 100644 packages/x11/xserver/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch delete mode 100644 packages/x11/xserver/xorg-server/patches/xserver-1.7.1-libcrypto.patch rename packages/x11/xserver/xorg-server/patches/{xserver-boottime.patch => xserver-boottime.diff} (100%) diff --git a/packages/x11/xserver/xorg-server/patches/20_extra_modelines_fromxorg.diff b/packages/x11/xserver/xorg-server/patches/001_fedora_extramodes.diff similarity index 100% rename from packages/x11/xserver/xorg-server/patches/20_extra_modelines_fromxorg.diff rename to packages/x11/xserver/xorg-server/patches/001_fedora_extramodes.diff diff --git a/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff b/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff deleted file mode 100644 index 0312982178..0000000000 --- a/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff +++ /dev/null @@ -1,336 +0,0 @@ -diff -Naur xorg-server-1.7.99.1/configure xorg-server-1.7.99.1.patch/configure -diff -Naur xorg-server-1.7.99.1/configure.ac xorg-server-1.7.99.1.patch/configure.ac ---- xorg-server-1.7.99.1/configure.ac 2009-10-21 18:06:54.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/configure.ac 2009-10-24 10:51:17.074488205 +0200 -@@ -501,9 +501,9 @@ - AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]), - [ XKBPATH="$withval" ], - [ XKBPATH="${datadir}/X11/xkb" ]) --AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]), -+AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${localstatedir}/cache/xkb)]), - [ XKBOUTPUT="$withval" ], -- [ XKBOUTPUT="compiled" ]) -+ [ XKBOUTPUT="${localstatedir}/cache/xkb" ]) - AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES], - [Keyboard ruleset (default: base/evdev)]), - [ XKB_DFLT_RULES="$withval" ], -@@ -1099,7 +1099,7 @@ - dnl Make sure XKM_OUTPUT_DIR is an absolute path - XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` - if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then -- XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" -+ AC_MSG_ERROR([xkb-output must be an absolute path.]) - fi - - dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed -diff -Naur xorg-server-1.7.99.1/xkb/ddxLoad.c xorg-server-1.7.99.1.patch/xkb/ddxLoad.c ---- xorg-server-1.7.99.1/xkb/ddxLoad.c 2009-10-21 15:46:53.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/xkb/ddxLoad.c 2009-10-24 10:50:23.303364966 +0200 -@@ -30,6 +30,13 @@ - - #include - -+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */ -+# include -+#else /* Use OpenSSL's libcrypto */ -+# include /* buggy openssl/sha.h wants size_t */ -+# include -+#endif -+ - #include - #include - #include -@@ -43,24 +50,13 @@ - #define XKBSRV_NEED_FILE_FUNCS - #include - #include -+#include - #include "xkb.h" - - #if defined(CSRG_BASED) || defined(linux) || defined(__GNU__) - #include - #endif - -- /* -- * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is -- * relative to the top-level XKB configuration directory. -- * Making the server write to a subdirectory of that directory -- * requires some work in the general case (install procedure -- * has to create links to /var or somesuch on many machines), -- * so we just compile into /usr/tmp for now. -- */ --#ifndef XKM_OUTPUT_DIR --#define XKM_OUTPUT_DIR "compiled/" --#endif -- - #define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\"" - #define ERROR_PREFIX "\"> \"" - #define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\"" -@@ -175,6 +171,45 @@ - } - - static Bool -+Sha1Asc(char sha1Asc[SHA_DIGEST_LENGTH*2+1], const char * input) -+{ -+ int i; -+ unsigned char sha1[SHA_DIGEST_LENGTH]; -+ -+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */ -+ SHA1_CTX ctx; -+ -+ SHA1Init (&ctx); -+ SHA1Update (&ctx, input, strlen(input)); -+ SHA1Final (sha1, &ctx); -+#else /* Use OpenSSL's libcrypto */ -+ SHA_CTX ctx; -+ int success; -+ -+ success = SHA1_Init (&ctx); -+ if (! success) -+ return BadAlloc; -+ -+ success = SHA1_Update (&ctx, input, strlen(input)); -+ if (! success) -+ return BadAlloc; -+ -+ success = SHA1_Final (sha1, &ctx); -+ if (! success) -+ return BadAlloc; -+#endif -+ -+ /* convert sha1 to sha1_asc */ -+ for(i=0; i nameRtrnLen) && nameRtrn) { -+ ErrorF("[xkb] nameRtrn too small to hold xkmfile name\n"); -+ return False; -+ } -+ strncpy(nameRtrn, xkmfile, nameRtrnLen); -+ -+ /* if the xkm file already exists, reuse it */ -+ canonicalXkmFileName = Xprintf("%s%s.xkm", xkm_output_dir, xkmfile); -+ if (access(canonicalXkmFileName, R_OK) == 0) { -+ /* yes, we can reuse the old xkm file */ -+ LogMessage(X_INFO, "XKB: reuse xkmfile %s\n", canonicalXkmFileName); -+ result = True; -+ goto _ret; -+ } -+ LogMessage(X_INFO, "XKB: generating xkmfile %s\n", canonicalXkmFileName); -+ -+ /* continue to call xkbcomp to compile the keymap. to avoid race -+ condition, we compile it to a tmpfile then rename it to -+ xkmfile */ -+ - #ifdef WIN32 - strcpy(tmpname, Win32TempDir()); - strcat(tmpname, "\\xkb_XXXXXX"); -@@ -225,19 +318,30 @@ - } - } - -+ if ( (tmpXkmFile = tempnam(xkm_output_dir, NULL)) == NULL ) { -+ ErrorF("[xkb] Can't generate temp xkm file name"); -+ result = False; -+ goto _ret; -+ } -+ - buf = Xprintf("\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" " -- "-em1 %s -emp %s -eml %s \"%s%s.xkm\"", -+ "-em1 %s -emp %s -eml %s \"%s\"", - xkbbindir, xkbbindirsep, - ( (xkbDebugFlags < 2) ? 1 : - ((xkbDebugFlags > 10) ? 10 : (int)xkbDebugFlags) ), -- xkbbasedirflag, xkmfile, -+ xkbbasedirflag, xkbfile, - PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1, -- xkm_output_dir, keymap); -+ tmpXkmFile); - - if (xkbbasedirflag != emptystring) { - xfree(xkbbasedirflag); - } - -+ /* there's a potential race condition between calling tempnam() -+ and invoking xkbcomp to write the result file (potential temp -+ file name conflicts), but since xkbcomp is a standalone -+ program, we have to live with this */ -+ - #ifndef WIN32 - out= Popen(buf,"w"); - #else -@@ -245,31 +349,43 @@ - #endif - - if (out!=NULL) { --#ifdef DEBUG -- if (xkbDebugFlags) { -- ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n"); -- XkbWriteXKBKeymapForNames(stderr,names,xkb,want,need); -+ /* write XKBKeyMapBuf to xkbcomp */ -+ if (EOF==fputs(xkbKeyMapBuf, out)) -+ { -+ ErrorF("[xkb] Sending keymap to xkbcomp failed\n"); -+ result = False; -+ goto _ret; - } --#endif -- XkbWriteXKBKeymapForNames(out,names,xkb,want,need); - #ifndef WIN32 - if (Pclose(out)==0) - #else - if (fclose(out)==0 && System(buf) >= 0) - #endif - { -+ /* xkbcomp success */ - if (xkbDebugFlags) - DebugF("[xkb] xkb executes: %s\n",buf); -- if (nameRtrn) { -- strncpy(nameRtrn,keymap,nameRtrnLen); -- nameRtrn[nameRtrnLen-1]= '\0'; -+ -+ /* if canonicalXkmFileName already exists now, we simply -+ overwrite it, this is OK */ -+ ret = rename(tmpXkmFile, canonicalXkmFileName); -+ if (0 != ret) { -+ ErrorF("[xkb] Can't rename %s to %s, error: %s\n", -+ tmpXkmFile, canonicalXkmFileName, -+ strerror(errno)); -+ -+ /* in case of error, don't unlink tmpXkmFile, leave it -+ for debugging */ -+ -+ result = False; -+ goto _ret; - } -- if (buf != NULL) -- xfree (buf); -- return True; -+ -+ result = True; -+ goto _ret; - } - else -- LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap); -+ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile); - #ifdef WIN32 - /* remove the temporary file */ - unlink(tmpname); -@@ -284,9 +400,17 @@ - } - if (nameRtrn) - nameRtrn[0]= '\0'; -+ result = False; -+ -+_ret: -+ if (tmpXkmFile) -+ free(tmpXkmFile); -+ if (canonicalXkmFileName) -+ xfree(canonicalXkmFileName); - if (buf != NULL) - xfree (buf); -- return False; -+ -+ return result; - } - - static FILE * -@@ -370,7 +494,6 @@ - DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined); - } - fclose(file); -- (void) unlink (fileName); - return (need|want)&(~missing); - } - -diff -Naur xorg-server-1.7.99.1/xkb/README.compiled xorg-server-1.7.99.1.patch/xkb/README.compiled ---- xorg-server-1.7.99.1/xkb/README.compiled 2008-10-13 01:19:06.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/xkb/README.compiled 2009-10-24 10:50:28.069400854 +0200 -@@ -4,10 +4,10 @@ - or some other tool might destroy or replace the files in this directory, - so it is not a safe place to store compiled keymaps for long periods of - time. The default keymap for any server is usually stored in: -- X-default.xkm --where is the display number of the server in question, which makes --it possible for several servers *on the same host* to share the same --directory. -+ server-.xkm -+ -+where is the SHA1 hash of keymap source, so that compiled -+keymap of different keymap sources are stored in different files. - - Unless the X server is modified, sharing this directory between servers on - different hosts could cause problems. diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.7.0-glx-versioning.patch b/packages/x11/xserver/xorg-server/patches/03_fedora_glx_versioning.diff similarity index 100% rename from packages/x11/xserver/xorg-server/patches/xserver-1.7.0-glx-versioning.patch rename to packages/x11/xserver/xorg-server/patches/03_fedora_glx_versioning.diff diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.7.1-glx14-swrast.patch b/packages/x11/xserver/xorg-server/patches/04_fedora_glx14-swrast.diff similarity index 100% rename from packages/x11/xserver/xorg-server/patches/xserver-1.7.1-glx14-swrast.patch rename to packages/x11/xserver/xorg-server/patches/04_fedora_glx14-swrast.diff diff --git a/packages/x11/xserver/xorg-server/patches/05_only_call_gamma_set_if_nonnull.diff b/packages/x11/xserver/xorg-server/patches/05_only_call_gamma_set_if_nonnull.diff new file mode 100644 index 0000000000..b1d00ba6d0 --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/05_only_call_gamma_set_if_nonnull.diff @@ -0,0 +1,25 @@ +Bug#564203 + +From 8ca4233017e9f441303088e7054b6a7c4f171d80 Mon Sep 17 00:00:00 2001 +From: Michael Vogt +Date: Wed, 6 Jan 2010 14:40:34 +0100 +Subject: [PATCH] * hw/xfree86/modes/xf86Crtc.c: + - only call gamma_set if its non NULL + +--- + hw/xfree86/modes/xf86Crtc.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index d015c6a..573fe96 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -354,7 +354,7 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati + } + + /* Only upload when needed, to avoid unneeded delays. */ +- if (!crtc->active) ++ if (!crtc->active && crtc->funcs->gamma_set) + crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green, + crtc->gamma_blue, crtc->gamma_size); + diff --git a/packages/x11/xserver/xorg-server/patches/06_dont_trap_access_to_timer_and_keyboard.diff b/packages/x11/xserver/xorg-server/patches/06_dont_trap_access_to_timer_and_keyboard.diff new file mode 100644 index 0000000000..23d8dc79ad --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/06_dont_trap_access_to_timer_and_keyboard.diff @@ -0,0 +1,22 @@ +[PATCH] Do not trap access to timer and keyboard + +Some VESA BIOSes need to access to them. + +Signed-off-by: Samuel Thibault +--- + hw/xfree86/os-support/hurd/hurd_video.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c +index 4a99db3..e049ceb 100644 +--- a/hw/xfree86/os-support/hurd/hurd_video.c ++++ b/hw/xfree86/os-support/hurd/hurd_video.c +@@ -124,8 +124,6 @@ xf86EnableIO() + FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno)); + return FALSE; + } +- ioperm(0x40,4,0); /* trap access to the timer chip */ +- ioperm(0x60,4,0); /* trap access to the keyboard controller */ + return TRUE; + } + diff --git a/packages/x11/xserver/xorg-server/patches/100_xserver_exa_force_greedy.diff b/packages/x11/xserver/xorg-server/patches/100_xserver_exa_force_greedy.diff deleted file mode 100644 index 24dd77017a..0000000000 --- a/packages/x11/xserver/xorg-server/patches/100_xserver_exa_force_greedy.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- xorg-server.orig/exa/exa.c 2008-10-14 23:24:44.000000000 +0200 -+++ xorg-server/exa/exa.c 2008-10-14 23:25:52.000000000 +0200 -@@ -882,6 +882,11 @@ - dixSetPrivate(&pScreen->devPrivates, exaScreenPrivateKey, pExaScr); - - pExaScr->migration = ExaMigrationAlways; -+ if (pScreenInfo->flags & EXA_MIGRATION_GREEDY) { -+ pExaScr->migration = ExaMigrationGreedy; -+ LogMessage(X_INFO, "EXA(%d): Forcing greedy migration option\n", -+ pScreen->myNum); -+ } - - exaDDXDriverInit(pScreen); - ---- xorg-server.orig/exa/exa.h 2008-10-14 23:24:44.000000000 +0200 -+++ xorg-server/exa/exa.h 2008-10-14 23:25:52.000000000 +0200 -@@ -737,6 +737,13 @@ - #define EXA_TWO_BITBLT_DIRECTIONS (1 << 2) - - /** -+ * EXA_MIGRATION_GREEDY indicates to EXA that the driver prefers to -+ * use the "greedy" migration heuristic. This is to work around -+ * issues with EXA on the Intel 965 chipset. (LP: #177492) -+ */ -+#define EXA_MIGRATION_GREEDY (1 << 3) -+ -+/** - * EXA_HANDLES_PIXMAPS indicates to EXA that the driver can handle - * all pixmap addressing and migration. - */ diff --git a/packages/x11/xserver/xorg-server/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff b/packages/x11/xserver/xorg-server/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff new file mode 100644 index 0000000000..38d8d8dfdf --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff @@ -0,0 +1,34 @@ +From 4ae407a5a308febf63de27a62f8c301c73b37d3e Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Tue, 6 Oct 2009 17:44:33 +0200 +Subject: [PATCH 1/5] Move config_init() after CreateWellKnownSockets() and InitCoreDevices() + +config_init() can now add devices directly instead of scheduling a +timer. + +Signed-off-by: Julien Cristau +Tested-by: Peter Hutterer +--- + dix/main.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +Index: xorg-server/dix/main.c +=================================================================== +--- xorg-server.orig/dix/main.c ++++ xorg-server/dix/main.c +@@ -168,7 +168,6 @@ + InitBlockAndWakeupHandlers(); + /* Perform any operating system dependent initializations you'd like */ + OsInit(); +- config_init(); + if(serverGeneration == 1) + { + CreateWellKnownSockets(); +@@ -256,6 +255,7 @@ + InitCoreDevices(); + InitInput(argc, argv); + InitAndStartDevices(); ++ config_init(); + + dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset); + diff --git a/packages/x11/xserver/xorg-server/patches/110_fedora_no_move_damage.diff b/packages/x11/xserver/xorg-server/patches/110_fedora_no_move_damage.diff deleted file mode 100644 index a1d676677a..0000000000 --- a/packages/x11/xserver/xorg-server/patches/110_fedora_no_move_damage.diff +++ /dev/null @@ -1,35 +0,0 @@ -Disable damage notifications on move for manually redirected windows. -The automatic compositor needs damage notification on move, but a -compositing manager doesn't. - -Index: xorg-server/composite/compwindow.c -=================================================================== ---- xorg-server.orig/composite/compwindow.c 2008-06-18 10:28:16.000000000 +0300 -+++ xorg-server/composite/compwindow.c 2008-06-18 12:06:20.000000000 +0300 -@@ -580,12 +580,15 @@ - } - else - { -+ CompWindowPtr cw = GetCompWindow (pWin); -+ - ptOldOrg.x -= dx; - ptOldOrg.y -= dy; - REGION_TRANSLATE (prgnSrc, prgnSrc, - pWin->drawable.x - ptOldOrg.x, - pWin->drawable.y - ptOldOrg.y); -- DamageRegionAppend(&pWin->drawable, prgnSrc); -+ if (pWin->redirectDraw && cw->update == CompositeRedirectAutomatic) -+ DamageRegionAppend(&pWin->drawable, prgnSrc); - } - cs->CopyWindow = pScreen->CopyWindow; - pScreen->CopyWindow = compCopyWindow; -@@ -664,7 +667,8 @@ - /* - * Report that as damaged so it will be redrawn - */ -- DamageRegionAppend(&pWin->drawable, &damage); -+ if (cw->update == CompositeRedirectAutomatic) -+ DamageRegionAppend(&pWin->drawable, &damage); - REGION_UNINIT (pScreen, &damage); - /* - * Save the new border clip region diff --git a/packages/x11/xserver/xorg-server/patches/156_exevents_copykeyclass_nullptrcheck.diff b/packages/x11/xserver/xorg-server/patches/156_exevents_copykeyclass_nullptrcheck.diff deleted file mode 100644 index d16c2f0384..0000000000 --- a/packages/x11/xserver/xorg-server/patches/156_exevents_copykeyclass_nullptrcheck.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur xorg-server-1.6.99.902.orig/Xi/exevents.c xorg-server-1.6.99.902/Xi/exevents.c ---- xorg-server-1.6.99.902.orig/Xi/exevents.c 2009-09-26 14:12:03.000000000 +0200 -+++ xorg-server-1.6.99.902/Xi/exevents.c 2009-09-26 18:55:30.000000000 +0200 -@@ -195,11 +195,15 @@ - static void - CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master) - { -- KeyClassPtr mk = master->key; -- KeyClassPtr dk = device->key; -+ KeyClassPtr mk, dk; - int i; - -- if (device == master) -+ if (device == master || device == NULL || master == NULL) -+ return; -+ -+ mk = master->key; -+ dk = device->key; -+ if (dk == NULL || mk == NULL) - return; - - mk->sourceid = device->id; diff --git a/packages/x11/xserver/xorg-server/patches/157_check_null_modes.diff b/packages/x11/xserver/xorg-server/patches/157_check_null_modes.diff deleted file mode 100644 index 7bdcb8b5da..0000000000 --- a/packages/x11/xserver/xorg-server/patches/157_check_null_modes.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c -index d855bd1..2af8c00 100644 ---- a/hw/xfree86/common/xf86VidMode.c -+++ b/hw/xfree86/common/xf86VidMode.c -@@ -226,6 +226,9 @@ VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock) - - pScrn = xf86Screens[scrnIndex]; - pVidMode = VMPTR(pScrn->pScreen); -+ if (pScrn->modes == NULL) -+ return FALSE; -+ - pVidMode->First = pScrn->modes; - pVidMode->Next = pVidMode->First->next; - diff --git a/packages/x11/xserver/xorg-server/patches/158_raise_maxclients.diff b/packages/x11/xserver/xorg-server/patches/158_raise_maxclients.diff deleted file mode 100644 index cc30d58b4e..0000000000 --- a/packages/x11/xserver/xorg-server/patches/158_raise_maxclients.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurp patched/include/misc.h working/include/misc.h ---- patched/include/misc.h 2009-02-05 01:09:03.000000000 -0800 -+++ working/include/misc.h 2009-02-05 02:12:57.000000000 -0800 -@@ -86,7 +86,7 @@ extern unsigned long serverGeneration; - #ifndef MAXSCREENS - #define MAXSCREENS 16 - #endif --#define MAXCLIENTS 256 -+#define MAXCLIENTS 512 - #define MAXEXTENSIONS 128 - #define MAXFORMATS 8 - #define MAXDEVICES 20 /* input devices */ diff --git a/packages/x11/xserver/xorg-server/patches/16-xfree86-fix-build-with-xv-disabled.diff b/packages/x11/xserver/xorg-server/patches/16-xfree86-fix-build-with-xv-disabled.diff new file mode 100644 index 0000000000..184301f913 --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/16-xfree86-fix-build-with-xv-disabled.diff @@ -0,0 +1,53 @@ +From fe7575e929d65e8c798104ec2f72b879051694d3 Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Mon, 8 Feb 2010 02:04:33 +0100 +Subject: [PATCH] xfree86: fix build with xv disabled + +--- + hw/xfree86/modes/xf86Crtc.c | 2 ++ + hw/xfree86/modes/xf86Crtc.h | 2 ++ + 2 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 30b49af..62f8737 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -3009,6 +3009,7 @@ xf86_crtc_box_area(BoxPtr box) + return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1); + } + ++#ifdef XV + /* + * Return the crtc covering 'box'. If two crtcs cover a portion of + * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc +@@ -3097,6 +3098,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn, + + return ret; + } ++#endif + + xf86_crtc_notify_proc_ptr + xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new) +diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h +index 9baa956..2fb32c1 100644 +--- a/hw/xfree86/modes/xf86Crtc.h ++++ b/hw/xfree86/modes/xf86Crtc.h +@@ -908,6 +908,7 @@ xf86_hide_cursors (ScrnInfoPtr scrn); + extern _X_EXPORT void + xf86_cursors_fini (ScreenPtr screen); + ++#ifdef XV + /* + * For overlay video, compute the relevant CRTC and + * clip video to that. +@@ -926,6 +927,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn, + RegionPtr reg, + INT32 width, + INT32 height); ++#endif + + extern _X_EXPORT xf86_crtc_notify_proc_ptr + xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new); +-- +1.6.6.1 + diff --git a/packages/x11/xserver/xorg-server/patches/162_null_crtc_in_rotation.diff b/packages/x11/xserver/xorg-server/patches/162_null_crtc_in_rotation.diff deleted file mode 100644 index 2e4a9450d8..0000000000 --- a/packages/x11/xserver/xorg-server/patches/162_null_crtc_in_rotation.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nurp patched/hw/xfree86/modes/xf86RandR12.c working/hw/xfree86/modes/xf86RandR12.c ---- patched/hw/xfree86/modes/xf86RandR12.c 2009-03-02 22:57:18.000000000 -0800 -+++ working/hw/xfree86/modes/xf86RandR12.c 2009-03-02 22:57:24.000000000 -0800 -@@ -944,7 +944,8 @@ xf86RandR12SetRotations (ScreenPtr pScre - for (c = 0; c < config->num_crtc; c++) { - xf86CrtcPtr crtc = config->crtc[c]; - -- RRCrtcSetRotations (crtc->randr_crtc, rotations); -+ if (crtc != NULL) -+ RRCrtcSetRotations (crtc->randr_crtc, rotations); - } - #endif - randrp->supported_rotations = rotations; diff --git a/packages/x11/xserver/xorg-server/patches/164_trap-aspect-ratios.diff b/packages/x11/xserver/xorg-server/patches/164_trap-aspect-ratios.diff deleted file mode 100644 index aa6d5c2f6b..0000000000 --- a/packages/x11/xserver/xorg-server/patches/164_trap-aspect-ratios.diff +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c -index c0e3df9..32288f7 100644 ---- a/hw/xfree86/ddc/interpret_edid.c -+++ b/hw/xfree86/ddc/interpret_edid.c -@@ -51,6 +51,15 @@ static void get_whitepoint_section(Uchar *, struct whitePoints *); - static void get_detailed_timing_section(Uchar*, struct detailed_timings *); - static Bool validate_version(int scrnIndex, struct edid_version *); - -+static Bool -+is_standard_aspect_ratio(int x, int y) -+{ -+ return ((x == 16 && y == 9) || -+ (x == 16 && y == 10) || -+ (x == 4 && y == 3) || -+ (x == 5 && y == 4)); -+} -+ - static void - handle_edid_quirks(xf86MonPtr m) - { -@@ -91,10 +100,7 @@ handle_edid_quirks(xf86MonPtr m) - * try to find the largest detailed timing that matches that aspect - * ratio and use that to fill in the feature section. - */ -- if ((m->features.hsize == 16 && m->features.vsize == 9) || -- (m->features.hsize == 16 && m->features.vsize == 10) || -- (m->features.hsize == 4 && m->features.vsize == 3) || -- (m->features.hsize == 5 && m->features.vsize == 4)) { -+ if (is_standard_aspect_ratio(m->features.hsize, m->features.vsize)) { - int real_hsize = 0, real_vsize = 0; - float target_aspect, timing_aspect; - -@@ -130,6 +136,28 @@ handle_edid_quirks(xf86MonPtr m) - xf86Msg(X_INFO, "Quirked EDID physical size to %dx%d cm\n", - m->features.hsize, m->features.vsize); - } -+ -+ /* -+ * Some monitors do the reverse, putting real size in the global block -+ * and aspect ratios in the detailed timings. Check, but only if we -+ * think we've got a real physical size. -+ */ -+ if (m->features.hsize && m->features.vsize) { -+ for (i = 0; i < 4; i++) { -+ if (m->det_mon[i].type == DT) { -+ struct detailed_timings *timing; -+ timing = &m->det_mon[i].section.d_timings; -+ -+ if (is_standard_aspect_ratio(timing->h_size, timing->v_size)) { -+ timing->h_size = m->features.hsize * 10; -+ timing->v_size = m->features.vsize * 10; -+ xf86Msg(X_INFO, "Quirked timing size to %dx%d mm\n", -+ timing->h_size, timing->v_size); -+ -+ } -+ } -+ } -+ } - } - - xf86MonPtr diff --git a/packages/x11/xserver/xorg-server/patches/166_nullptr_xinerama_keyrepeat.diff b/packages/x11/xserver/xorg-server/patches/166_nullptr_xinerama_keyrepeat.diff deleted file mode 100644 index 75dbf5d458..0000000000 --- a/packages/x11/xserver/xorg-server/patches/166_nullptr_xinerama_keyrepeat.diff +++ /dev/null @@ -1,30 +0,0 @@ -From f0ef98d8d54f5dfa3081b62ff672e0fe992b0a01 Mon Sep 17 00:00:00 2001 -From: Bryce Harrington -Date: Wed, 18 Mar 2009 23:28:51 -0700 -Subject: [PATCH] Check for null pointer dereference to prevent crash - on non-primary Xinerama screens when key repeating. - (LP: #324465) - -Signed-off-by: Bryce Harrington ---- - mi/mipointer.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/mi/mipointer.c b/mi/mipointer.c -index e37316e..fe5947f 100644 ---- a/mi/mipointer.c -+++ b/mi/mipointer.c -@@ -306,6 +306,10 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) - pPointer = MIPOINTER(pDev); - SetupScreen (pScreen); - -+ /* Null pointer causes crash on keyrepeat with Xinerama LP: (#324465) */ -+ if (pPointer == NULL) -+ return; -+ - if (pPointer->pScreen != pScreen) - { - (*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, TRUE); --- -1.6.0.4 - diff --git a/packages/x11/xserver/xorg-server/patches/167_nullptr_xisbread.diff b/packages/x11/xserver/xorg-server/patches/167_nullptr_xisbread.diff deleted file mode 100644 index 38921dd4bf..0000000000 --- a/packages/x11/xserver/xorg-server/patches/167_nullptr_xisbread.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nurp patched/hw/xfree86/common/xisb.c working/hw/xfree86/common/xisb.c ---- patched/hw/xfree86/common/xisb.c 2009-02-02 21:53:58.000000000 +0100 -+++ working/hw/xfree86/common/xisb.c 2009-02-02 21:55:09.000000000 +0100 -@@ -98,6 +98,9 @@ XisbRead (XISBuffer *b) - { - int ret; - -+ if (b == NULL) -+ return -2; -+ - if (b->current >= b->end) - { - if (b->block_duration >= 0) diff --git a/packages/x11/xserver/xorg-server/patches/169_mipointer_nullptr_checks.diff b/packages/x11/xserver/xorg-server/patches/169_mipointer_nullptr_checks.diff deleted file mode 100644 index 6484fe0152..0000000000 --- a/packages/x11/xserver/xorg-server/patches/169_mipointer_nullptr_checks.diff +++ /dev/null @@ -1,107 +0,0 @@ -From 179cec1d2f919d8d8096d6030b0ad9b6285dfd4d Mon Sep 17 00:00:00 2001 -From: Bryce Harrington -Date: Mon, 23 Mar 2009 14:25:18 -0700 -Subject: [PATCH] Check null pointers to not crash on keyrepeat with Xinerama LP: (#324465) - -With -nvidia, when using Xinerama, holding down a key in a text field -on a non-primary screen can cause an X crash. This is caused because -the MIPOINTER(pDev) can return a NULL pointer for a non-null pDev in -some cases, and the mipointer.c code lacks checks for this condition. - -MIPOINTER() is a macro #defined locally to mipointer.c, which calls into -dixLookupPrivate(), a routine which returns NULL in at least some -circumstances - such as if the memory could not be xcalloc'd for -whatever reason. Hopefully upstream can provide a better fix for this, -but for now it seems reasonable to check the return values of this macro -for NULL before usage, as a minimum. - -diff -Naur xorg-server-1.6.99.902.orig/mi/mipointer.c xorg-server-1.6.99.902/mi/mipointer.c ---- xorg-server-1.6.99.902.orig/mi/mipointer.c 2009-09-26 14:12:02.000000000 +0200 -+++ xorg-server-1.6.99.902/mi/mipointer.c 2009-09-26 19:02:00.000000000 +0200 -@@ -139,6 +139,10 @@ - if (DevHasCursor(pDev)) - { - pPointer = MIPOINTER(pDev); -+ if (pPointer == NULL) { -+ ErrorF("miPointerCloseScreen: Invalid input device pointer\n"); -+ return FALSE; -+ } - - if (pScreen == pPointer->pScreen) - pPointer->pScreen = 0; -@@ -191,6 +195,10 @@ - return FALSE; - - pPointer = MIPOINTER(pDev); -+ if (pPointer == NULL) { -+ ErrorF("miPointerDisplayCursor: Invalid input device pointer\n"); -+ return FALSE; -+ } - - pPointer->pCursor = pCursor; - pPointer->pScreen = pScreen; -@@ -204,6 +212,10 @@ - miPointerPtr pPointer; - - pPointer = MIPOINTER(pDev); -+ if (pPointer == NULL) { -+ ErrorF("miPointerConstrainCursor: Invalid input device pointer\n"); -+ return FALSE; -+ } - - pPointer->limits = *pBox; - pPointer->confined = PointerConfinedToScreen(pDev); -@@ -305,6 +317,10 @@ - - SetupScreen (pScreen); - pPointer = MIPOINTER(pDev); -+ if (pPointer == NULL) { -+ ErrorF("miPointerWarpCursor: Invalid input device pointer\n"); -+ return; -+ } - - if (pPointer->pScreen != pScreen) - { -@@ -436,13 +452,17 @@ - ScreenPtr pScreen; - miPointerPtr pPointer; - -- pPointer = MIPOINTER(pDev); -- - pScreen = screenInfo.screens[screen_no]; - pScreenPriv = GetScreenPrivate (pScreen); - (*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, FALSE); - NewCurrentScreen (pDev, pScreen, x, y); - -+ pPointer = MIPOINTER(pDev); -+ if (pPointer == NULL) { -+ ErrorF("miPointerSetScreen: Invalid input device pointer\n"); -+ return; -+ } -+ - pPointer->limits.x2 = pScreen->width; - pPointer->limits.y2 = pScreen->height; - } -@@ -469,6 +489,10 @@ - SetupScreen(pScreen); - - pPointer = MIPOINTER(pDev); -+ if (pPointer == NULL) { -+ ErrorF("miPointerMoved: Invalid input device pointer\n"); -+ return; -+ } - - /* Hack: We mustn't call into ->MoveCursor for anything but the - * VCP, as this may cause a non-HW rendered cursor to be rendered during -@@ -498,6 +522,11 @@ - miPointerPtr pPointer; - - pPointer = MIPOINTER(pDev); -+ if (pPointer == NULL) { -+ ErrorF("miPointerSetPosition: Invalid input device pointer\n"); -+ return; -+ } -+ - pScreen = pPointer->pScreen; - if (!pScreen) - return; /* called before ready */ diff --git a/packages/x11/xserver/xorg-server/patches/172_cwgetbackingpicture_nullptr_check.diff b/packages/x11/xserver/xorg-server/patches/172_cwgetbackingpicture_nullptr_check.diff deleted file mode 100644 index 9a91113aea..0000000000 --- a/packages/x11/xserver/xorg-server/patches/172_cwgetbackingpicture_nullptr_check.diff +++ /dev/null @@ -1,39 +0,0 @@ -From 7813adf66be31d8b0e8df21821e786e688f7fe78 Mon Sep 17 00:00:00 2001 -From: Bryce Harrington -Date: Fri, 27 Mar 2009 19:01:32 -0700 -Subject: [PATCH] cwGetBackingPicture can segfault when minimizing/maximizing firefox with - a flash video playing. This appears to be a race condition in which the - backing picture's data is not always fully defined. - -Signed-off-by: Bryce Harrington ---- - miext/cw/cw_render.c | 13 +++++++++---- - 1 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/miext/cw/cw_render.c b/miext/cw/cw_render.c -index 6e0c727..fe8cba7 100644 ---- a/miext/cw/cw_render.c -+++ b/miext/cw/cw_render.c -@@ -125,10 +125,15 @@ cwGetBackingPicture (PicturePtr pPicture, int *x_off, int *y_off) - WindowPtr pWindow = (WindowPtr) pDrawable; - PixmapPtr pPixmap = getCwPixmap (pWindow); - -- *x_off = pDrawable->x - pPixmap->screen_x; -- *y_off = pDrawable->y - pPixmap->screen_y; -- -- return pPicturePrivate->pBackingPicture; -+ if (pDrawable && pPixmap) { -+ *x_off = pDrawable->x - pPixmap->screen_x; -+ *y_off = pDrawable->y - pPixmap->screen_y; -+ -+ return pPicturePrivate->pBackingPicture; -+ } else { -+ *x_off = *y_off = 0; -+ return pPicture; -+ } - } - else - { --- -1.6.0.4 - diff --git a/packages/x11/xserver/xorg-server/patches/173_edid_quirk_philips_lcd.diff b/packages/x11/xserver/xorg-server/patches/173_edid_quirk_philips_lcd.diff deleted file mode 100644 index ba735bd0bb..0000000000 --- a/packages/x11/xserver/xorg-server/patches/173_edid_quirk_philips_lcd.diff +++ /dev/null @@ -1,21 +0,0 @@ -# -# Ubuntu: https://bugs.launchpad.net/bugs/353074 -# Upstream: http://bugs.freedesktop.org/show_bug.cgi?id=21000 -# - -Index: xorg-server-1.6.0/hw/xfree86/modes/xf86EdidModes.c -=================================================================== ---- xorg-server-1.6.0.orig/hw/xfree86/modes/xf86EdidModes.c 2009-04-01 19:45:23.000000000 +0200 -+++ xorg-server-1.6.0/hw/xfree86/modes/xf86EdidModes.c 2009-04-01 19:45:32.000000000 +0200 -@@ -155,6 +155,11 @@ - DDC->vendor.prod_id == 13600) - return TRUE; - -+ /* Bug #21000: LGPhilipsLCD LP154W01-TLAJ */ -+ if (memcmp (DDC->vendor.name, "LPL", 4) == 0 && -+ DDC->vendor.prod_id == 47360) -+ return TRUE; -+ - return FALSE; - } - diff --git a/packages/x11/xserver/xorg-server/patches/180_fedora_no_synaptics_mouse_synthesis.diff b/packages/x11/xserver/xorg-server/patches/180_fedora_no_synaptics_mouse_synthesis.diff deleted file mode 100644 index ddf3961196..0000000000 --- a/packages/x11/xserver/xorg-server/patches/180_fedora_no_synaptics_mouse_synthesis.diff +++ /dev/null @@ -1,16 +0,0 @@ -From 8663524ce398b56af596ab1e7e96b62ca45b79e9 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 13 Apr 2009 17:49:00 +1000 -Subject: [PATCH] xfree86: don't synthesise a mouse section if synaptics devices are found. - -diff -Naur xorg-server-1.6.99.902.orig/hw/xfree86/common/xf86Config.c xorg-server-1.6.99.902/hw/xfree86/common/xf86Config.c ---- xorg-server-1.6.99.902.orig/hw/xfree86/common/xf86Config.c 2009-09-26 14:12:03.000000000 +0200 -+++ xorg-server-1.6.99.902/hw/xfree86/common/xf86Config.c 2009-09-26 19:05:52.000000000 +0200 -@@ -2406,6 +2406,7 @@ - { - if (strcmp((*dev)->driver, "kbd") == 0 || - strcmp((*dev)->driver, "mouse") == 0 || -+ strcmp((*dev)->driver, "synaptics") == 0 || - strcmp((*dev)->driver, "vmmouse") == 0) - { - IDevPtr *current; diff --git a/packages/x11/xserver/xorg-server/patches/201_fedora-pci-primary.diff b/packages/x11/xserver/xorg-server/patches/201_fedora-pci-primary.diff deleted file mode 100644 index 61ba6db30b..0000000000 --- a/packages/x11/xserver/xorg-server/patches/201_fedora-pci-primary.diff +++ /dev/null @@ -1,91 +0,0 @@ -diff -Naur xorg-server-1.6.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.6.99.902/hw/xfree86/common/xf86pciBus.c ---- xorg-server-1.6.99.902.orig/hw/xfree86/common/xf86pciBus.c 2009-09-26 14:12:03.000000000 +0200 -+++ xorg-server-1.6.99.902/hw/xfree86/common/xf86pciBus.c 2009-09-26 19:11:42.000000000 +0200 -@@ -52,13 +52,7 @@ - /* Bus-specific globals */ - Bool pciSlotClaimed = FALSE; - --#define PCIINFOCLASSES(c) \ -- ( (((c) & 0x00ff0000) == (PCI_CLASS_PREHISTORIC << 16)) \ -- || (((c) & 0x00ff0000) == (PCI_CLASS_DISPLAY << 16)) \ -- || ((((c) & 0x00ffff00) \ -- == ((PCI_CLASS_MULTIMEDIA << 16) | (PCI_SUBCLASS_MULTIMEDIA_VIDEO << 8)))) \ -- || ((((c) & 0x00ffff00) \ -- == ((PCI_CLASS_PROCESSOR << 16) | (PCI_SUBCLASS_PROCESSOR_COPROC << 8)))) ) -+#define PCIINFOCLASSES(c) (((c) & 0x00ffff00) == (PCI_CLASS_DISPLAY << 16)) - - /* - * PCI classes that have messages printed always. The others are only -@@ -85,6 +79,40 @@ - sprintf(buffer, "%d@%d", busnum & 0x00ff, busnum >> 8); - } - -+/* oh god what have i done */ -+static Bool -+looks_like_bios_primary(struct pci_device *info) -+{ -+ unsigned char *bios; -+ unsigned short vendor, device; -+ int offset; -+ Bool ret = FALSE; -+ -+ bios = xf86MapVidMem(-1, VIDMEM_MMIO, 0xc0000, 0x10000); -+ if (!bios) -+ return FALSE; -+ -+ if (bios[0] != 0x55 || bios[1] != 0xAA) -+ goto out; -+ -+ offset = (bios[0x19] << 8) + bios[0x18]; -+ -+ if (bios[offset] != 'P' || -+ bios[offset+1] != 'C' || -+ bios[offset+2] != 'I' || -+ bios[offset+3] != 'R') -+ goto out; -+ -+ vendor = (bios[offset+5] << 8) + bios[offset+4]; -+ device = (bios[offset+7] << 8) + bios[offset+6]; -+ -+ ret = (info->vendor_id == vendor) && (info->device_id == device); -+ -+out: -+ xf86UnMapVidMem(-1, bios, 0x10000); -+ return ret; -+} -+ - /* - * xf86Bus.c interface - */ -@@ -132,17 +160,25 @@ - uint16_t command; - - info = xf86PciVideoInfo[i]; -+ if (!IS_VGA(info->device_class)) -+ continue; -+ - pci_device_cfg_read_u16(info, & command, 4); - -- if ((command & PCI_CMD_MEM_ENABLE) -- && ((num == 1) || IS_VGA(info->device_class))) { -- if (primaryBus.type == BUS_NONE) { -+ if ((command & PCI_CMD_MEM_ENABLE)) { -+ if (num == 1) { - primaryBus.type = BUS_PCI; - primaryBus.id.pci = info; -- } else { -- xf86Msg(X_NOTICE, -+ break; -+ } else if (looks_like_bios_primary(info)) { -+ if (primaryBus.type == BUS_NONE) { -+ primaryBus.type = BUS_PCI; -+ primaryBus.id.pci = info; -+ } else { -+ xf86Msg(X_NOTICE, - "More than one possible primary device found\n"); -- primaryBus.type ^= (BusType)(-1); -+ primaryBus.type ^= (BusType)(-1); -+ } - } - } - } diff --git a/packages/x11/xserver/xorg-server/patches/30_typedef-apm-2.6.24.diff b/packages/x11/xserver/xorg-server/patches/30_typedef-apm-2.6.24.diff deleted file mode 100644 index 96adefd18b..0000000000 --- a/packages/x11/xserver/xorg-server/patches/30_typedef-apm-2.6.24.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xorg-server-1.4.0.90/hw/xfree86/os-support/linux/lnx_apm.c xorg-server-1.4.0.90.edit/hw/xfree86/os-support/linux/lnx_apm.c ---- xorg-server-1.4.0.90/hw/xfree86/os-support/linux/lnx_apm.c 2007-12-14 00:38:23.000000000 +0100 -+++ xorg-server-1.4.0.90.edit/hw/xfree86/os-support/linux/lnx_apm.c 2007-12-14 00:38:18.000000000 +0100 -@@ -35,6 +35,8 @@ - # define APM_SUSPEND_FAILED 0xf001 - #endif - -+typedef unsigned short apm_event_t; -+ - static PMClose lnxAPMOpen(void); - static void lnxCloseAPM(void); - static pointer APMihPtr = NULL; diff --git a/packages/x11/xserver/xorg-server/patches/60_use-proc-instead-of-sysfs-for-pci-domains.diff b/packages/x11/xserver/xorg-server/patches/60_use-proc-instead-of-sysfs-for-pci-domains.diff deleted file mode 100644 index ddc8ece453..0000000000 --- a/packages/x11/xserver/xorg-server/patches/60_use-proc-instead-of-sysfs-for-pci-domains.diff +++ /dev/null @@ -1,32 +0,0 @@ -/* Upstream commit 56f21bda1ce95741c88c423b60bd709eef26eb12 was supposed to - * only avoid multiple scans of the PCI devices, but it actually also added - * an "optimization" based on using sysfs files instead of /proc. However, - * this code is broken, for instance because there are no ioctl handler on - * /sys/bus/pci/devices/*/config files while there some on /proc/bus/pci/* - * - * It breaks the Xserver on architectures that require such ioctls to scan - * the PCI devices and/or deal with PCI domains: - * #422077: xserver-xorg: Fatal server error on sparc: xf86MapPciMem failed - * #422095: xserver-xorg-core: fails to start on powerpc, no devices detected - * - * The following patch forces the server to behave as if we were running on - * a 2.4 kernel while scanning PCI devices, so that the sysfs code is disabled. - * - * Upstream doesn't apply this patch since they want to fix the sysfs-code. - * See https://bugs.freedesktop.org/show_bug.cgi?id=7248 - * - * Thanks to Jim Watson for testing! - */ - -diff -Naur xorg-server-1.5.1.orig/hw/xfree86/os-support/bus/linuxPci.c xorg-server-1.5.1/hw/xfree86/os-support/bus/linuxPci.c ---- xorg-server-1.5.1.orig/hw/xfree86/os-support/bus/linuxPci.c 2008-10-04 18:50:24.000000000 +0200 -+++ xorg-server-1.5.1/hw/xfree86/os-support/bus/linuxPci.c 2008-10-04 18:52:08.000000000 +0200 -@@ -131,7 +131,7 @@ - static int fd = -1,is_write = 0; - char file[64]; - struct stat ignored; -- static int is26 = -1; -+ static int is26 = 0; - - if (dev == NULL) { - return -1; diff --git a/packages/x11/xserver/xorg-server/patches/66_only-switch-vt-when-active.diff b/packages/x11/xserver/xorg-server/patches/66_only-switch-vt-when-active.diff deleted file mode 100644 index d066e6dc29..0000000000 --- a/packages/x11/xserver/xorg-server/patches/66_only-switch-vt-when-active.diff +++ /dev/null @@ -1,32 +0,0 @@ -Index: xorg-server/hw/xfree86/os-support/linux/lnx_init.c -=================================================================== ---- xorg-server.orig/hw/xfree86/os-support/linux/lnx_init.c 2008-06-18 12:06:06.000000000 +0300 -+++ xorg-server/hw/xfree86/os-support/linux/lnx_init.c 2008-06-18 12:06:25.000000000 +0300 -@@ -344,10 +344,25 @@ - - if (VTSwitch) - { -+ struct vt_stat vts; -+ - /* -- * Perform a switch back to the active VT when we were started -+ * Perform a switch back to the active VT when we were started. -+ * We cannot rely on vtSema to determine if the server was the -+ * active VT at the time of shutdown since it has already been -+ * released. Instead, we manually check the current VT and -+ * compare it with the VT we were running on. - */ -- if (activeVT >= 0) { -+ if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts) < 0) -+ { -+ /* If this failed, fall back to old behaviour -+ * of always switching. */ -+ xf86Msg(X_WARNING,"xf86OpenConsole: VT_GETSTATE failed: %s\n", -+ strerror(errno)); -+ vts.v_active = xf86Info.vtno; -+ } -+ -+ if (activeVT >= 0 && vts.v_active == xf86Info.vtno) { - if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, activeVT) < 0) - xf86Msg(X_WARNING, "xf86CloseConsole: VT_ACTIVATE failed: %s\n", - strerror(errno)); diff --git a/packages/x11/xserver/xorg-server/patches/use-sloppy-heuristic-first-for-initial-mode.diff b/packages/x11/xserver/xorg-server/patches/use-sloppy-heuristic-first-for-initial-mode.diff new file mode 100644 index 0000000000..4960634cd1 --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/use-sloppy-heuristic-first-for-initial-mode.diff @@ -0,0 +1,17 @@ +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 84d3cac..673612f 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -2248,10 +2248,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); + else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height)) + xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); +- else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) +- xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n"); + else if (xf86TargetFallback(scrn, config, modes, enabled, width, height)) + xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n"); ++ else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) ++ xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n"); + else + xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n"); + diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.patch b/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.diff similarity index 100% rename from packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.patch rename to packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.diff diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch b/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch deleted file mode 100644 index c6178b879b..0000000000 --- a/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch +++ /dev/null @@ -1,32 +0,0 @@ -From dc5cedd61e00afec33cbfaa7fdfbb6c357074dbd Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= -Date: Thu, 11 Sep 2008 12:51:31 -0400 -Subject: [PATCH] Make room for an external monitor if we have enough video RAM - ---- - hw/xfree86/modes/xf86Crtc.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 4de7e05..9bcf81b 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -987,6 +987,15 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp, - if (crtc_height > height) - height = crtc_height; - } -+ -+ /* Make room for an external monitor if we have enough video ram */ -+ if (scrn->videoRam >= 65536) -+ width += 1920; -+ else if (scrn->videoRam >= 32768) -+ width += 1280; -+ else if (scrn->videoRam >= 16384) -+ width += 1024; -+ - if (config->maxWidth && width > config->maxWidth) width = config->maxWidth; - if (config->maxHeight && height > config->maxHeight) height = config->maxHeight; - if (config->minWidth && width < config->minWidth) width = config->minWidth; --- -1.6.0.1 - diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.5.1-mode-debug.patch b/packages/x11/xserver/xorg-server/patches/xserver-1.5.1-mode-debug.patch deleted file mode 100644 index 11fe5adac9..0000000000 --- a/packages/x11/xserver/xorg-server/patches/xserver-1.5.1-mode-debug.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 079910986a1b8f5042e16ee2ba3ad9ed843b67ca Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 7 Oct 2008 11:09:14 -0400 -Subject: [PATCH] Force ModeDebug on. - ---- - hw/xfree86/modes/xf86Crtc.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 9bcf81b..a953c8a 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -2084,8 +2084,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) - xf86ProcessOptions (scrn->scrnIndex, - scrn->options, - config->options); -- config->debug_modes = xf86ReturnOptValBool (config->options, -- OPTION_MODEDEBUG, FALSE); -+ config->debug_modes = TRUE; - - if (scrn->display->virtualX) - width = scrn->display->virtualX; --- -1.6.0.1 - diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch b/packages/x11/xserver/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch deleted file mode 100644 index cc80e6cef4..0000000000 --- a/packages/x11/xserver/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Wed, 11 Mar 2009 14:02:11 -0400 -Subject: [PATCH] Don't build the ACPI code. - -No good can come of this. ---- - configure.ac | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 72ae67e..04716f8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then - case $host_cpu in - ia64*) - linux_ia64=yes -- linux_acpi="yes" - ;; - alpha*) - linux_alpha=yes - ;; - i*86|amd64*|x86_64*) -- linux_acpi="yes" - ;; - *) - ;; --- -1.6.1.3 - diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.7.1-libcrypto.patch b/packages/x11/xserver/xorg-server/patches/xserver-1.7.1-libcrypto.patch deleted file mode 100644 index c271855a2c..0000000000 --- a/packages/x11/xserver/xorg-server/patches/xserver-1.7.1-libcrypto.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8875112f5c57ec5d575e717c5638fbc919145efb Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Mon, 16 Nov 2009 18:01:26 -0500 -Subject: [PATCH] configure: Only link against libcrypto - -openssl.pc will link you against libssl, which we don't need, and which -brings in another seven libraries we also don't need. This is still -bogus, we're really only trying to get a SHA1 routine, we could link it -statically and be even better off. ---- - configure.ac | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f69f97e..254d33d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1297,14 +1297,8 @@ if test "x$SHA1_LIB" = "x" ; then - fi - - if test "x$SHA1_LIB" = "x" ; then -- PKG_CHECK_EXISTS([OPENSSL], [openssl], [HAVE_OPENSSL_PKC=yes], -- [HAVE_OPENSSL_PKC=no]) -- if test "x$HAVE_OPENSSL_PKC" = xyes; then -- REQUIRED_LIBS="$REQUIRED_LIBS openssl" -- else - AC_CHECK_LIB([crypto], [SHA1_Init], [SHA1_LIB="-lcrypto"], - [AC_MSG_ERROR([OpenSSL must be installed in order to build the X server.])]) -- fi - fi - - PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS]) --- -1.6.5.2 - diff --git a/packages/x11/xserver/xorg-server/patches/xserver-boottime.patch b/packages/x11/xserver/xorg-server/patches/xserver-boottime.diff similarity index 100% rename from packages/x11/xserver/xorg-server/patches/xserver-boottime.patch rename to packages/x11/xserver/xorg-server/patches/xserver-boottime.diff diff --git a/packages/x11/xserver/xorg-server/url b/packages/x11/xserver/xorg-server/url index 69d2bf394e..35be222190 100644 --- a/packages/x11/xserver/xorg-server/url +++ b/packages/x11/xserver/xorg-server/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.5.tar.bz2 +http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.5.902.tar.bz2 \ No newline at end of file From c6fc8f06f92e9f29ee634fd4d577f5d0b4fc9ca7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 16 Mar 2010 11:29:53 +0100 Subject: [PATCH 56/84] linux: - update to linux-2.6.33.1 --- packages/linux/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/url b/packages/linux/url index 71a0fc6150..d1c878e0c7 100644 --- a/packages/linux/url +++ b/packages/linux/url @@ -1 +1 @@ -http://eu.kernel.org/pub/linux/kernel/v2.6/linux-2.6.33.tar.bz2 \ No newline at end of file +http://eu.kernel.org/pub/linux/kernel/v2.6/linux-2.6.33.1.tar.bz2 \ No newline at end of file From 87b774a4d4d307b5eeb46e891e1c2187213e308f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 16 Mar 2010 11:30:17 +0100 Subject: [PATCH 57/84] xf86-video-ati: - update to xf86-video-ati-6.12.192 --- packages/x11/driver/xf86-video-ati/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-ati/url b/packages/x11/driver/xf86-video-ati/url index 376a19832d..358e662d10 100644 --- a/packages/x11/driver/xf86-video-ati/url +++ b/packages/x11/driver/xf86-video-ati/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/driver/xf86-video-ati-6.12.191.tar.bz2 \ No newline at end of file +http://xorg.freedesktop.org/archive/individual/driver/xf86-video-ati-6.12.192.tar.bz2 \ No newline at end of file From 6ba42b0b8a9375e45c068d99c15787a2675c2b06 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 16 Mar 2010 11:30:38 +0100 Subject: [PATCH 58/84] libXt: - update to libXt-1.0.8 --- packages/x11/lib/libXt/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/lib/libXt/url b/packages/x11/lib/libXt/url index eb6c803642..71146099ac 100644 --- a/packages/x11/lib/libXt/url +++ b/packages/x11/lib/libXt/url @@ -1 +1 @@ -http://xorg.freedesktop.org/releases/individual/lib/libXt-1.0.7.tar.bz2 \ No newline at end of file +http://xorg.freedesktop.org/archive/individual/lib/libXt-1.0.8.tar.bz2 \ No newline at end of file From fee652f481034f4798ca8bc395b95fb16ab02a76 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 16 Mar 2010 11:32:45 +0100 Subject: [PATCH 59/84] busybox: - also create /var/run/utmp and /var/log/wtmp and set mode --- packages/sysutils/busybox/init.d/02_make_directorys | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/sysutils/busybox/init.d/02_make_directorys b/packages/sysutils/busybox/init.d/02_make_directorys index d289e0dfab..0a24862cc4 100755 --- a/packages/sysutils/busybox/init.d/02_make_directorys +++ b/packages/sysutils/busybox/init.d/02_make_directorys @@ -13,3 +13,9 @@ progress "make variable directory structure" $IONICE chmod 1777 /var/run /var/tmp + $IONICE touch /var/run/utmp + $IONICE chmod 1777 /var/run/utmp + + $IONICE touch /var/log/wtmp + $IONICE chmod 1777 /var/log/wtmp + From 4651cc3c0d7e47804d4fb90d119fa07cbd4de818 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 16 Mar 2010 11:33:16 +0100 Subject: [PATCH 60/84] busybox: - set user account --- packages/sysutils/busybox/install | 4 ++++ projects/ION/options | 9 +++++++++ projects/generic/options | 9 +++++++++ projects/intel/options | 9 +++++++++ 4 files changed, 31 insertions(+) diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index 6317204f73..af6a354309 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -8,10 +8,14 @@ $SCRIPTS/install Linux-PAM PKG_DIR=`find $PACKAGES -type d -name $1` ROOT_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $ROOT_PASSWORD`" +USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`" add_user root "$ROOT_PWD" 0 0 "Root User" "/storage" "/bin/sh" add_group root 0 + add_user $USER_NAME "$USER_PWD" 1000 1000 "User" "/storage" "/bin/sh" + add_group $USER_GROUP 1000 + cp -PR $BUILD/busybox*/_install-system/* $INSTALL echo "chmod 4755 $INSTALL/bin/busybox" >> $FAKEROOT_SCRIPT diff --git a/projects/ION/options b/projects/ION/options index f2176cde86..76555fab68 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -11,6 +11,15 @@ # Root password to integrate in the target system ROOT_PASSWORD="openelec" +# User to integrate in the target system + USER_NAME="openelec" + +# User group to integrate in the target system + USER_GROUP="openelec" + +# User password to integrate in the target system + USER_PASSWORD="openelec" + # The TARGET_CPU variable controls which processor should be targeted for # generated code. case $TARGET_ARCH in diff --git a/projects/generic/options b/projects/generic/options index e9bd92ef3a..2f065d0f10 100644 --- a/projects/generic/options +++ b/projects/generic/options @@ -11,6 +11,15 @@ # Root password to integrate in the target system ROOT_PASSWORD="openelec" +# User to integrate in the target system + USER_NAME="openelec" + +# User group to integrate in the target system + USER_GROUP="openelec" + +# User password to integrate in the target system + USER_PASSWORD="openelec" + # The TARGET_CPU variable controls which processor should be targeted for # generated code. case $TARGET_ARCH in diff --git a/projects/intel/options b/projects/intel/options index a7bc803ee3..1b9d193486 100644 --- a/projects/intel/options +++ b/projects/intel/options @@ -11,6 +11,15 @@ # Root password to integrate in the target system ROOT_PASSWORD="openelec" +# User to integrate in the target system + USER_NAME="openelec" + +# User group to integrate in the target system + USER_GROUP="openelec" + +# User password to integrate in the target system + USER_PASSWORD="openelec" + # The TARGET_CPU variable controls which processor should be targeted for # generated code. case $TARGET_ARCH in From 2964c0b1d3490bdf310ca6e768b77093546fd39d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 16 Mar 2010 20:19:59 +0100 Subject: [PATCH 61/84] uxlaunch: - move to packages/x11/other --- packages/{sysutils => x11/other}/uxlaunch/build | 0 packages/{sysutils => x11/other}/uxlaunch/init.d/60_uxlaunch | 0 packages/{sysutils => x11/other}/uxlaunch/install | 0 packages/{sysutils => x11/other}/uxlaunch/url | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename packages/{sysutils => x11/other}/uxlaunch/build (100%) rename packages/{sysutils => x11/other}/uxlaunch/init.d/60_uxlaunch (100%) rename packages/{sysutils => x11/other}/uxlaunch/install (100%) rename packages/{sysutils => x11/other}/uxlaunch/url (100%) diff --git a/packages/sysutils/uxlaunch/build b/packages/x11/other/uxlaunch/build similarity index 100% rename from packages/sysutils/uxlaunch/build rename to packages/x11/other/uxlaunch/build diff --git a/packages/sysutils/uxlaunch/init.d/60_uxlaunch b/packages/x11/other/uxlaunch/init.d/60_uxlaunch similarity index 100% rename from packages/sysutils/uxlaunch/init.d/60_uxlaunch rename to packages/x11/other/uxlaunch/init.d/60_uxlaunch diff --git a/packages/sysutils/uxlaunch/install b/packages/x11/other/uxlaunch/install similarity index 100% rename from packages/sysutils/uxlaunch/install rename to packages/x11/other/uxlaunch/install diff --git a/packages/sysutils/uxlaunch/url b/packages/x11/other/uxlaunch/url similarity index 100% rename from packages/sysutils/uxlaunch/url rename to packages/x11/other/uxlaunch/url From e0cd165c913a1c7936c2feb837cd66b4681bcefa Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 17 Mar 2010 11:34:58 +0100 Subject: [PATCH 62/84] busybox: - start debugshell earlyer - start network later - mount filesystem later - make directory structure later - copy userconfig later --- packages/sysutils/busybox/init.d/{21_debugshell => 00_debugshell} | 0 .../busybox/init.d/{01_mount_filesystem => 05_mount_filesystem} | 0 .../busybox/init.d/{02_make_directorys => 06_make_directorys} | 0 packages/sysutils/busybox/init.d/{03_userconfig => 07_userconfig} | 0 packages/sysutils/busybox/init.d/{04_network => 08_network} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename packages/sysutils/busybox/init.d/{21_debugshell => 00_debugshell} (100%) rename packages/sysutils/busybox/init.d/{01_mount_filesystem => 05_mount_filesystem} (100%) rename packages/sysutils/busybox/init.d/{02_make_directorys => 06_make_directorys} (100%) rename packages/sysutils/busybox/init.d/{03_userconfig => 07_userconfig} (100%) rename packages/sysutils/busybox/init.d/{04_network => 08_network} (100%) diff --git a/packages/sysutils/busybox/init.d/21_debugshell b/packages/sysutils/busybox/init.d/00_debugshell similarity index 100% rename from packages/sysutils/busybox/init.d/21_debugshell rename to packages/sysutils/busybox/init.d/00_debugshell diff --git a/packages/sysutils/busybox/init.d/01_mount_filesystem b/packages/sysutils/busybox/init.d/05_mount_filesystem similarity index 100% rename from packages/sysutils/busybox/init.d/01_mount_filesystem rename to packages/sysutils/busybox/init.d/05_mount_filesystem diff --git a/packages/sysutils/busybox/init.d/02_make_directorys b/packages/sysutils/busybox/init.d/06_make_directorys similarity index 100% rename from packages/sysutils/busybox/init.d/02_make_directorys rename to packages/sysutils/busybox/init.d/06_make_directorys diff --git a/packages/sysutils/busybox/init.d/03_userconfig b/packages/sysutils/busybox/init.d/07_userconfig similarity index 100% rename from packages/sysutils/busybox/init.d/03_userconfig rename to packages/sysutils/busybox/init.d/07_userconfig diff --git a/packages/sysutils/busybox/init.d/04_network b/packages/sysutils/busybox/init.d/08_network similarity index 100% rename from packages/sysutils/busybox/init.d/04_network rename to packages/sysutils/busybox/init.d/08_network From c1807eca55a9d3be00d40f65f282cc20f831ecac Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 17 Mar 2010 11:35:40 +0100 Subject: [PATCH 63/84] dbus: - faster start of dbus --- packages/sysutils/dbus/init.d/12_dbus | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/dbus/init.d/12_dbus b/packages/sysutils/dbus/init.d/12_dbus index 302d6ae3f4..4c959aaa9a 100755 --- a/packages/sysutils/dbus/init.d/12_dbus +++ b/packages/sysutils/dbus/init.d/12_dbus @@ -8,4 +8,4 @@ progress "Starting D-BUS" $IONICE mkdir -p /var/lib/dbus /var/run/dbus dbus-daemon --system - dbus-uuidgen --ensure + dbus-uuidgen --ensure & From 846db78665f7abbf70188d49ae484b904aa577d6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 17 Mar 2010 11:35:59 +0100 Subject: [PATCH 64/84] hal: - faster startup --- packages/sysutils/hal/init.d/13_hal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/hal/init.d/13_hal b/packages/sysutils/hal/init.d/13_hal index b3dbffe0be..0b8f925a22 100755 --- a/packages/sysutils/hal/init.d/13_hal +++ b/packages/sysutils/hal/init.d/13_hal @@ -9,4 +9,4 @@ progress "Starting Hardware Abstraction Layer" /var/run/dbus/hald-local \ /var/run/dbus/hald-runner - hald --verbose=no --daemon=yes --use-syslog + hald --verbose=no --daemon=yes --use-syslog & From 24f96595fa215f7fb7af5315f73990dc487291e8 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 17 Mar 2010 11:36:27 +0100 Subject: [PATCH 65/84] libatasmart: - cosmetics --- packages/sysutils/libatasmart/install | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/sysutils/libatasmart/install b/packages/sysutils/libatasmart/install index b47a9e0002..b0102b35c4 100755 --- a/packages/sysutils/libatasmart/install +++ b/packages/sysutils/libatasmart/install @@ -11,4 +11,3 @@ mkdir -p $INSTALL/usr/lib mkdir -p $INSTALL/usr/bin cp -PR $PKG_BUILD/.libs/sktest $INSTALL/usr/bin cp -PR $PKG_BUILD/.libs/skdump $INSTALL/usr/bin - From 577de8f134126e1f2ab157af03b6f67ab3b109f9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 17 Mar 2010 11:37:20 +0100 Subject: [PATCH 66/84] udev: - split init script to udevd, udev-monitor, udev-trigger - start earlyer --- packages/sysutils/udev/init.d/01_udevd | 11 +++++++++++ packages/sysutils/udev/init.d/02_udev-monitor | 11 +++++++++++ packages/sysutils/udev/init.d/03_udev-trigger | 13 +++++++++++++ packages/sysutils/udev/init.d/11_udev | 18 ------------------ 4 files changed, 35 insertions(+), 18 deletions(-) create mode 100755 packages/sysutils/udev/init.d/01_udevd create mode 100755 packages/sysutils/udev/init.d/02_udev-monitor create mode 100755 packages/sysutils/udev/init.d/03_udev-trigger delete mode 100755 packages/sysutils/udev/init.d/11_udev diff --git a/packages/sysutils/udev/init.d/01_udevd b/packages/sysutils/udev/init.d/01_udevd new file mode 100755 index 0000000000..c9cfd479f1 --- /dev/null +++ b/packages/sysutils/udev/init.d/01_udevd @@ -0,0 +1,11 @@ +# +# starting Udev daemon +# +# runlevels: openelec, text + +progress "starting udev daemon" + + echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug + + $NICE_20 udevd --daemon + $NICE_20 udevadm monitor 2>&1 >/dev/udev.log & diff --git a/packages/sysutils/udev/init.d/02_udev-monitor b/packages/sysutils/udev/init.d/02_udev-monitor new file mode 100755 index 0000000000..d08f73e1a1 --- /dev/null +++ b/packages/sysutils/udev/init.d/02_udev-monitor @@ -0,0 +1,11 @@ +# +# monitoring udev events +# +# runlevels: openelec, text + +UDEV_LOGFILE="/dev/.udev.log" + +progress "monitoring udev events" + +# udevadm monitor 2>&1 >$UDEV_LOGFILE & + udevadm monitor -e >$UDEV_LOGFILE & diff --git a/packages/sysutils/udev/init.d/03_udev-trigger b/packages/sysutils/udev/init.d/03_udev-trigger new file mode 100755 index 0000000000..5334be7550 --- /dev/null +++ b/packages/sysutils/udev/init.d/03_udev-trigger @@ -0,0 +1,13 @@ +# +# request events from the kernel +# +# runlevels: openelec, text + +progress "request udev events from the kernel" + + ( +# $NICE_20 udevadm control --env STARTUP=1 + $NICE_20 udevadm trigger + $NICE_20 udevadm settle --timeout=5 +# $NICE_20 udevadm control --env STARTUP= + )& diff --git a/packages/sysutils/udev/init.d/11_udev b/packages/sysutils/udev/init.d/11_udev deleted file mode 100755 index c3fe754da2..0000000000 --- a/packages/sysutils/udev/init.d/11_udev +++ /dev/null @@ -1,18 +0,0 @@ -# -# starting Udev -# -# runlevels: openelec, text - -progress "starting Udev" - - echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug - - $NICE_20 udevd --daemon - $NICE_20 udevadm monitor 2>&1 >/var/log/udev.log & - $NICE_20 udevadm control --env STARTUP=1 - - ( - $NICE_20 udevadm trigger - $NICE_20 udevadm settle --timeout=5 - $NICE_20 udevadm control --env STARTUP= - )& From e89cf004f901b58c6975f5ccc80ab899ea588190 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 17 Mar 2010 11:37:51 +0100 Subject: [PATCH 67/84] xorg-server: - configure xorg later --- .../xorg-server/init.d/{05_configure_xorg => 09_configure_xorg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/x11/xserver/xorg-server/init.d/{05_configure_xorg => 09_configure_xorg} (100%) diff --git a/packages/x11/xserver/xorg-server/init.d/05_configure_xorg b/packages/x11/xserver/xorg-server/init.d/09_configure_xorg similarity index 100% rename from packages/x11/xserver/xorg-server/init.d/05_configure_xorg rename to packages/x11/xserver/xorg-server/init.d/09_configure_xorg From 09464149c41d228da8841480b1b88149092216ae Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 17 Mar 2010 11:38:18 +0100 Subject: [PATCH 68/84] xorg-server: - update to xorg-server-1.7.6 --- packages/x11/xserver/xorg-server/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/xserver/xorg-server/url b/packages/x11/xserver/xorg-server/url index 35be222190..e5feeb612f 100644 --- a/packages/x11/xserver/xorg-server/url +++ b/packages/x11/xserver/xorg-server/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.5.902.tar.bz2 \ No newline at end of file +http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.6.tar.gz From 4d96f8ce012ccb6b4926c9f3de0f4eaa3bf4bc48 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 05:22:11 +0100 Subject: [PATCH 69/84] zlib: - update to zlib-1.2.4 --- packages/compress/zlib/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/compress/zlib/url b/packages/compress/zlib/url index 100019aaa2..7ef9d2fc51 100644 --- a/packages/compress/zlib/url +++ b/packages/compress/zlib/url @@ -1 +1 @@ -http://www.zlib.net/zlib-1.2.3.tar.bz2 +http://www.zlib.net/zlib-1.2.4.tar.bz2 From 7723b20de9011e77e9f20a6b8d768b0e612c9477 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 05:22:30 +0100 Subject: [PATCH 70/84] xbmc: - update to xbmc-28622 --- packages/mediacenter/xbmc/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url index 734d3e3701..364b65c3f6 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-28584.tar.bz2 +http://sources.openelec.tv/svn/xbmc-28622.tar.bz2 From 6878013338c0e006d813d9115c9d904247385333 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 05:22:50 +0100 Subject: [PATCH 71/84] xbmc-theme-Confluence: - update to xbmc-theme-Confluence-28622 --- packages/mediacenter/xbmc-theme-Confluence/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/url b/packages/mediacenter/xbmc-theme-Confluence/url index 450de66da9..e39a20a03a 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/url +++ b/packages/mediacenter/xbmc-theme-Confluence/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-theme-Confluence-28584.tar.bz2 +http://sources.openelec.tv/svn/xbmc-theme-Confluence-28622.tar.bz2 From dd29d8c6a0efc211ad6b2bb57dab4418a77cf10c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 06:20:26 +0100 Subject: [PATCH 72/84] zlib: - remove no more need patch --- .../zlib/patches/10_crosscompile.diff | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 packages/compress/zlib/patches/10_crosscompile.diff diff --git a/packages/compress/zlib/patches/10_crosscompile.diff b/packages/compress/zlib/patches/10_crosscompile.diff deleted file mode 100644 index 180d0fad70..0000000000 --- a/packages/compress/zlib/patches/10_crosscompile.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- zlib-1.2.2.orig/configure Wed Nov 17 15:56:53 2004 -+++ zlib-1.2.2/configure Wed Nov 17 15:57:37 2004 -@@ -75,7 +75,7 @@ - CC="$cc" - SFLAGS=${CFLAGS-"-fPIC -O3"} - CFLAGS="$cflags" -- case `(uname -s || echo unknown) 2>/dev/null` in -+ case `echo Linux` in - Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; - CYGWIN* | Cygwin* | cygwin* | OS/2* ) - EXE='.exe';; -@@ -95,7 +95,7 @@ - else - # find system name and corresponding cc options - CC=${CC-cc} -- case `(uname -sr || echo unknown) 2>/dev/null` in -+ case `echo Linux` in - HP-UX*) SFLAGS=${CFLAGS-"-O +z"} - CFLAGS=${CFLAGS-"-O"} - # LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"} From e0ea2bf441f580801540ce58ba52afffe4ec9d42 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 06:22:03 +0100 Subject: [PATCH 73/84] zlib: - simplyfing build and install script - cosmetics --- packages/compress/zlib/build | 13 +++++-------- packages/compress/zlib/install | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/packages/compress/zlib/build b/packages/compress/zlib/build index 30707e293a..ba821d844a 100755 --- a/packages/compress/zlib/build +++ b/packages/compress/zlib/build @@ -5,14 +5,11 @@ $SCRIPTS/build toolchain cd $PKG_BUILD - -make CC=$TARGET_CC AR="$TARGET_AR rc" RANLIB=$TARGET_RANLIB libz.a -cp -PR libz.a $SYSROOT_PREFIX/usr/lib - -make clean - -./configure --shared --prefix=/usr +./configure --prefix=/usr \ + --libdir=/usr/lib \ + --includedir=/usr/include \ + --shared make -$MAKE prefix=$SYSROOT_PREFIX/usr install +$MAKEINSTALL diff --git a/packages/compress/zlib/install b/packages/compress/zlib/install index 9d079d1749..378acda7bf 100755 --- a/packages/compress/zlib/install +++ b/packages/compress/zlib/install @@ -2,5 +2,5 @@ . config/options -mkdir -p $INSTALL/lib -cp -PR $PKG_BUILD/*.so* $INSTALL/lib +mkdir -p $INSTALL/usr/lib + cp -R $PKG_BUILD/*.so* $INSTALL/usr/lib From aa301f1bc426096d3bf256ea44289a2dbdf3287f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 09:10:48 +0100 Subject: [PATCH 74/84] libcdio: - dont depends on ncurses - cosmetics --- packages/audio/libcdio/build | 1 - packages/audio/libcdio/install | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/audio/libcdio/build b/packages/audio/libcdio/build index 313fef7906..4fb56d65b8 100755 --- a/packages/audio/libcdio/build +++ b/packages/audio/libcdio/build @@ -4,7 +4,6 @@ $SCRIPTS/build toolchain $SCRIPTS/build libiconv -$SCRIPTS/build ncurses cd $PKG_BUILD ./configure --host=$TARGET_NAME \ diff --git a/packages/audio/libcdio/install b/packages/audio/libcdio/install index 79b127170d..845eeba9f5 100755 --- a/packages/audio/libcdio/install +++ b/packages/audio/libcdio/install @@ -3,7 +3,6 @@ . config/options $SCRIPTS/install libiconv -$SCRIPTS/install ncurses mkdir -p $INSTALL/usr/lib - cp -PR $PKG_BUILD/lib/*/.libs/*.so*[.0-9] $INSTALL/usr/lib + cp -P $PKG_BUILD/lib/*/.libs/*.so*[.0-9] $INSTALL/usr/lib From 8d4385031f33809a938f4aed08ebb766bae8fcd9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 09:11:32 +0100 Subject: [PATCH 75/84] gdb: - disable build of text ui - install also gdbserver and gdbreplay --- packages/debug/gdb/build | 4 ++-- packages/debug/gdb/install | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/debug/gdb/build b/packages/debug/gdb/build index 73ad50db13..b66eff3862 100755 --- a/packages/debug/gdb/build +++ b/packages/debug/gdb/build @@ -22,7 +22,7 @@ cd objdir --disable-nls \ --disable-sim \ --without-x \ - --enable-tui \ + --disable-tui \ --disable-libada \ -make \ No newline at end of file +make diff --git a/packages/debug/gdb/install b/packages/debug/gdb/install index ea9e238829..be171c982b 100755 --- a/packages/debug/gdb/install +++ b/packages/debug/gdb/install @@ -7,5 +7,5 @@ $SCRIPTS/install expat mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/objdir/$1/$1 $INSTALL/usr/bin -# cp $PKG_BUILD/objdir/$1/gdbserver/gdbserver $INSTALL/usr/bin -# cp $PKG_BUILD/objdir/$1/gdbserver/gdbreplay $INSTALL/usr/bin + cp $PKG_BUILD/objdir/$1/gdbserver/gdbserver $INSTALL/usr/bin + cp $PKG_BUILD/objdir/$1/gdbserver/gdbreplay $INSTALL/usr/bin From e5d5d63418a4ecc87473be1601445922e17a3fd0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 14:16:28 +0100 Subject: [PATCH 76/84] Linux-PAM: - cosmetics --- packages/security/Linux-PAM/install | 38 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/security/Linux-PAM/install b/packages/security/Linux-PAM/install index 49a9bc5c42..2ce7d104d7 100755 --- a/packages/security/Linux-PAM/install +++ b/packages/security/Linux-PAM/install @@ -7,38 +7,38 @@ $SCRIPTS/install gettext PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/etc - cp -PR $PKG_BUILD/modules/pam_env/environment $INSTALL/etc -# cp -PR $PKG_BUILD/data/pam.conf $INSTALL/etc + cp -P $PKG_BUILD/modules/pam_env/environment $INSTALL/etc +# cp -P $PKG_BUILD/data/pam.conf $INSTALL/etc mkdir -p $INSTALL/etc/pam.d - cp -PR $PKG_DIR/config/* $INSTALL/etc/pam.d + cp -P $PKG_DIR/config/* $INSTALL/etc/pam.d mkdir -p $INSTALL/etc/security - cp -PR $PKG_BUILD/modules/pam_access/access.conf $INSTALL/etc/security - cp -PR $PKG_BUILD/modules/pam_group/group.conf $INSTALL/etc/security - cp -PR $PKG_BUILD/modules/pam_limits/limits.conf $INSTALL/etc/security - cp -PR $PKG_BUILD/modules/pam_env/pam_env.conf $INSTALL/etc/security - cp -PR $PKG_BUILD/modules/pam_time/time.conf $INSTALL/etc/security + cp -P $PKG_BUILD/modules/pam_access/access.conf $INSTALL/etc/security + cp -P $PKG_BUILD/modules/pam_group/group.conf $INSTALL/etc/security + cp -P $PKG_BUILD/modules/pam_limits/limits.conf $INSTALL/etc/security + cp -P $PKG_BUILD/modules/pam_env/pam_env.conf $INSTALL/etc/security + cp -P $PKG_BUILD/modules/pam_time/time.conf $INSTALL/etc/security mkdir -p $INSTALL/lib/security - cp -PR $PKG_BUILD/modules/pam_mkhomedir/.libs/mkhomedir_helper $INSTALL/lib/security -# cp -PR $PKG_BUILD/modules/pam_tally/pam_tally $INSTALL/lib/security - cp -PR $PKG_BUILD/modules/pam_tally2/.libs/pam_tally2 $INSTALL/lib/security - cp -PR $PKG_BUILD/modules/pam_unix/unix_chkpwd $INSTALL/lib/security + cp -P $PKG_BUILD/modules/pam_mkhomedir/.libs/mkhomedir_helper $INSTALL/lib/security +# cp -P $PKG_BUILD/modules/pam_tally/pam_tally $INSTALL/lib/security + cp -P $PKG_BUILD/modules/pam_tally2/.libs/pam_tally2 $INSTALL/lib/security + cp -P $PKG_BUILD/modules/pam_unix/unix_chkpwd $INSTALL/lib/security echo "chmod 4755 $INSTALL/lib/security/unix_chkpwd" >> $FAKEROOT_SCRIPT - cp -PR $PKG_BUILD/modules/pam_unix/unix_update $INSTALL/lib/security + cp -P $PKG_BUILD/modules/pam_unix/unix_update $INSTALL/lib/security mkdir -p $INSTALL/usr/lib - cp -PR $PKG_BUILD/libpam/.libs/*.so* $INSTALL/usr/lib - cp -PR $PKG_BUILD/libpam_misc/.libs/*.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/libpam/.libs/*.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/libpam_misc/.libs/*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libpam_misc.so*T - cp -PR $PKG_BUILD/libpamc/.libs/*.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/libpamc/.libs/*.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib/security - cp -PR $PKG_BUILD/modules/*/.libs/*.so $INSTALL/usr/lib/security + cp -P $PKG_BUILD/modules/*/.libs/*.so $INSTALL/usr/lib/security mkdir -p $INSTALL/usr/lib/security/pam_filter - cp -PR $PKG_BUILD/modules/pam_filter/upperLOWER/.libs/upperLOWER $INSTALL/usr/lib/security/pam_filter + cp -P $PKG_BUILD/modules/pam_filter/upperLOWER/.libs/upperLOWER $INSTALL/usr/lib/security/pam_filter mkdir -p $INSTALL/sbin - cp -PR $PKG_BUILD/modules/pam_tally/pam_tally $INSTALL/sbin + cp -P $PKG_BUILD/modules/pam_tally/pam_tally $INSTALL/sbin From 5b92be28681a7ffe40fe11214c77366166c294e8 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 14:16:46 +0100 Subject: [PATCH 77/84] polkit: - cosmetics --- packages/security/polkit/install | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/security/polkit/install b/packages/security/polkit/install index 2b63309e09..9cf4d05d27 100755 --- a/packages/security/polkit/install +++ b/packages/security/polkit/install @@ -18,41 +18,41 @@ $SCRIPTS/install expat $SCRIPTS/install Linux-PAM mkdir -p $INSTALL/etc/dbus-1/system.d - cp -PR $PKG_BUILD/data/org.freedesktop.PolicyKit1.conf $INSTALL/etc/dbus-1/system.d + cp -P $PKG_BUILD/data/org.freedesktop.PolicyKit1.conf $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/etc/pam.d - cp -PR $PKG_BUILD/data/polkit-1 $INSTALL/etc/pam.d + cp -P $PKG_BUILD/data/polkit-1 $INSTALL/etc/pam.d mkdir -p $INSTALL/etc/polkit-1/localauthority.conf.d - cp -PR $PKG_BUILD/src/polkitbackend/50-localauthority.conf $INSTALL/etc/polkit-1/localauthority.conf.d + cp -P $PKG_BUILD/src/polkitbackend/50-localauthority.conf $INSTALL/etc/polkit-1/localauthority.conf.d mkdir -p $INSTALL/etc/polkit-1/nullbackend.conf.d - cp -PR $PKG_BUILD/src/nullbackend/50-nullbackend.conf $INSTALL/etc/polkit-1/nullbackend.conf.d + cp -P $PKG_BUILD/src/nullbackend/50-nullbackend.conf $INSTALL/etc/polkit-1/nullbackend.conf.d mkdir -p $INSTALL/usr/bin - cp -PR $PKG_BUILD/src/programs/.libs/pkaction $INSTALL/usr/bin - cp -PR $PKG_BUILD/src/programs/.libs/pkcheck $INSTALL/usr/bin - cp -PR $PKG_BUILD/src/programs/.libs/pkexec $INSTALL/usr/bin + cp -P $PKG_BUILD/src/programs/.libs/pkaction $INSTALL/usr/bin + cp -P $PKG_BUILD/src/programs/.libs/pkcheck $INSTALL/usr/bin + cp -P $PKG_BUILD/src/programs/.libs/pkexec $INSTALL/usr/bin echo "chmod 4755 $INSTALL/usr/bin/pkexec" >> $FAKEROOT_SCRIPT mkdir -p $INSTALL/usr/lib - cp -PR $PKG_BUILD/src/polkitagent/.libs/libpolkit-agent-1.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/src/polkitagent/.libs/libpolkit-agent-1.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libpolkit-agent-1.so*T - cp -PR $PKG_BUILD/src/polkitbackend/.libs/libpolkit-backend-1.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/src/polkitbackend/.libs/libpolkit-backend-1.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libpolkit-backend-1.so*T - cp -PR $PKG_BUILD/src/polkit/.libs/libpolkit-gobject-1.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/src/polkit/.libs/libpolkit-gobject-1.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib/polkit-1/extensions - cp -PR $PKG_BUILD/src/nullbackend/.libs/*.so $INSTALL/usr/lib/polkit-1/extensions - cp -PR $PKG_BUILD/src/programs/.libs/*.so $INSTALL/usr/lib/polkit-1/extensions + cp -P $PKG_BUILD/src/nullbackend/.libs/*.so $INSTALL/usr/lib/polkit-1/extensions + cp -P $PKG_BUILD/src/programs/.libs/*.so $INSTALL/usr/lib/polkit-1/extensions mkdir -p $INSTALL/usr/lib/polkit-1 - cp -PR $PKG_BUILD/src/polkitagent/.libs/polkit-agent-helper-1 $INSTALL/usr/lib/polkit-1 + cp -P $PKG_BUILD/src/polkitagent/.libs/polkit-agent-helper-1 $INSTALL/usr/lib/polkit-1 echo "chmod 4755 $INSTALL/usr/lib/polkit-1/polkit-agent-helper-1" >> $FAKEROOT_SCRIPT - cp -PR $PKG_BUILD/src/polkitd/.libs/polkitd $INSTALL/usr/lib/polkit-1 + cp -P $PKG_BUILD/src/polkitd/.libs/polkitd $INSTALL/usr/lib/polkit-1 mkdir -p $INSTALL/usr/share/dbus-1/system-services - cp -PR $PKG_BUILD/data/org.freedesktop.PolicyKit1.service $INSTALL/usr/share/dbus-1/system-services + cp -P $PKG_BUILD/data/org.freedesktop.PolicyKit1.service $INSTALL/usr/share/dbus-1/system-services mkdir -p $INSTALL/usr/share/polkit-1/actions - cp -PR $PKG_BUILD/actions/org.freedesktop.policykit.policy $INSTALL/usr/share/polkit-1/actions + cp -P $PKG_BUILD/actions/org.freedesktop.policykit.policy $INSTALL/usr/share/polkit-1/actions From 9c7198f494064ed12b4d7ba8ce1d4696fb5c3a6a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 14:17:12 +0100 Subject: [PATCH 78/84] ConsoleKit: - cosmetics --- packages/sysutils/ConsoleKit/install | 43 ++++++++++++++-------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/packages/sysutils/ConsoleKit/install b/packages/sysutils/ConsoleKit/install index 22cad875cc..8102aec26e 100755 --- a/packages/sysutils/ConsoleKit/install +++ b/packages/sysutils/ConsoleKit/install @@ -10,46 +10,47 @@ $SCRIPTS/install polkit mkdir -p $INSTALL/etc/ConsoleKit/run-seat.d mkdir -p $INSTALL/etc/ConsoleKit/run-session.d mkdir -p $INSTALL/etc/ConsoleKit/seats.d - cp -PR $PKG_BUILD/data/00-primary.seat $INSTALL/etc/ConsoleKit/seats.d + cp -P $PKG_BUILD/data/00-primary.seat $INSTALL/etc/ConsoleKit/seats.d mkdir -p $INSTALL/etc/dbus-1/system.d - cp -PR $PKG_BUILD/data/ConsoleKit.conf $INSTALL/etc/dbus-1/system.d + cp -P $PKG_BUILD/data/ConsoleKit.conf $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/lib/security - cp -PR $PKG_BUILD/pam-ck-connector/.libs/*.so $INSTALL/lib/security + cp -P $PKG_BUILD/pam-ck-connector/.libs/*.so $INSTALL/lib/security mkdir -p $INSTALL/sbin - cp -PR $PKG_BUILD/tools/ck-log-system-restart $INSTALL/sbin - cp -PR $PKG_BUILD/tools/ck-log-system-start $INSTALL/sbin - cp -PR $PKG_BUILD/tools/ck-log-system-stop $INSTALL/sbin - cp -PR $PKG_BUILD/src/console-kit-daemon $INSTALL/sbin + cp -P $PKG_BUILD/tools/ck-log-system-restart $INSTALL/sbin + cp -P $PKG_BUILD/tools/ck-log-system-start $INSTALL/sbin + cp -P $PKG_BUILD/tools/ck-log-system-stop $INSTALL/sbin + cp -P $PKG_BUILD/src/console-kit-daemon $INSTALL/sbin mkdir -p $INSTALL/usr/bin - cp -PR $PKG_BUILD/tools/.libs/ck-launch-session $INSTALL/usr/bin - cp -PR $PKG_BUILD/tools/ck-list-sessions $INSTALL/usr/bin - cp -PR $PKG_BUILD/tools/ck-history $INSTALL/usr/bin + cp -P $PKG_BUILD/tools/.libs/ck-launch-session $INSTALL/usr/bin + cp -P $PKG_BUILD/tools/ck-list-sessions $INSTALL/usr/bin + cp -P $PKG_BUILD/tools/ck-history $INSTALL/usr/bin mkdir -p $INSTALL/usr/lib - cp -PR $PKG_BUILD/libck-connector/.libs/*.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/libck-connector/.libs/*.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib/ConsoleKit - cp -PR $PKG_BUILD/tools/ck-collect-session-info $INSTALL/usr/lib/ConsoleKit - cp -PR $PKG_BUILD/tools/ck-get-x11-display-device $INSTALL/usr/lib/ConsoleKit - cp -PR $PKG_BUILD/tools/ck-get-x11-server-pid $INSTALL/usr/lib/ConsoleKit + cp -P $PKG_BUILD/tools/ck-collect-session-info $INSTALL/usr/lib/ConsoleKit + cp -P $PKG_BUILD/tools/ck-get-x11-display-device $INSTALL/usr/lib/ConsoleKit + cp -P $PKG_BUILD/tools/ck-get-x11-server-pid $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 -PR $PKG_BUILD/tools/linux/ck-system-restart $INSTALL/usr/lib/ConsoleKit/scripts - cp -PR $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 mkdir -p $INSTALL/usr/share/dbus-1/interfaces - cp -PR $PKG_BUILD/src/org.freedesktop.ConsoleKit.Manager.xml $INSTALL/usr/share/dbus-1/interfaces - cp -PR $PKG_BUILD/src/org.freedesktop.ConsoleKit.Seat.xml $INSTALL/usr/share/dbus-1/interfaces - cp -PR $PKG_BUILD/src/org.freedesktop.ConsoleKit.Session.xml $INSTALL/usr/share/dbus-1/interfaces + cp -P $PKG_BUILD/src/org.freedesktop.ConsoleKit.Manager.xml $INSTALL/usr/share/dbus-1/interfaces + cp -P $PKG_BUILD/src/org.freedesktop.ConsoleKit.Seat.xml $INSTALL/usr/share/dbus-1/interfaces + cp -P $PKG_BUILD/src/org.freedesktop.ConsoleKit.Session.xml $INSTALL/usr/share/dbus-1/interfaces mkdir -p $INSTALL/usr/share/dbus-1/system-services - cp -PR $PKG_BUILD/data/org.freedesktop.ConsoleKit.service $INSTALL/usr/share/dbus-1/system-services + cp -P $PKG_BUILD/data/org.freedesktop.ConsoleKit.service $INSTALL/usr/share/dbus-1/system-services mkdir -p $INSTALL/usr/share/polkit-1/actions - cp -PR $PKG_BUILD/data/org.freedesktop.consolekit.policy $INSTALL/usr/share/polkit-1/actions + cp -P $PKG_BUILD/data/org.freedesktop.consolekit.policy $INSTALL/usr/share/polkit-1/actions + From 83968993f213a9ce4a2c9732434a66cc92c9583b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 14:18:01 +0100 Subject: [PATCH 79/84] xorg-server: - fix installation if DEVTOOLS=no --- packages/x11/xserver/xorg-server/install | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index 42c02b95a3..6b3509cf37 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -83,5 +83,8 @@ mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/ #Tools $SCRIPTS/install pciutils $SCRIPTS/install uxlaunch -[ "$DEVTOOLS" = "yes" ] && $SCRIPTS/install ratpoison -[ "$DEVTOOLS" = "yes" ] && $SCRIPTS/install mrxvt + + if [ "$DEVTOOLS" = yes ]; then + $SCRIPTS/install ratpoison + $SCRIPTS/install mrxvt + fi From 7f1cedbbe2a35d59be717d66e1d98e3346991c3d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 14:36:46 +0100 Subject: [PATCH 80/84] Mesa: - install glxdemo, glxgears, glxinfo only with DEVTOOLS=yes - cosmetics --- packages/graphics/Mesa/install | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install index 1ff187384d..d8bd307281 100755 --- a/packages/graphics/Mesa/install +++ b/packages/graphics/Mesa/install @@ -12,14 +12,17 @@ $SCRIPTS/install libxcb $SCRIPTS/install libX11 mkdir -p $INSTALL/usr/lib - cp -PR $PKG_BUILD/lib/libGL.so.1.2 $INSTALL/usr/lib/libGL_mesa.so.1 # rename for cooperate with nvidia drivers + cp -P $PKG_BUILD/lib/libGL.so.1.2 $INSTALL/usr/lib/libGL_mesa.so.1 # rename for cooperate with nvidia drivers ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1 - cp -PR $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib/dri - cp -PR $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true + cp -P $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true -# todo: only in devel build -mkdir -p $INSTALL/usr/bin - cp -PR $PKG_BUILD/progs/xdemos/{glxdemo,glxgears,glxinfo} $INSTALL/usr/bin +if [ "$DEVTOOLS" = yes ]; then + mkdir -p $INSTALL/usr/bin + cp -P $PKG_BUILD/progs/xdemos/glxdemo $INSTALL/usr/bin + cp -P $PKG_BUILD/progs/xdemos/glxgears $INSTALL/usr/bin + cp -P $PKG_BUILD/progs/xdemos/glxinfo $INSTALL/usr/bin +fi \ No newline at end of file From 43b4835fbefa3d325905777d1675c13aad4dd676 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 14:37:20 +0100 Subject: [PATCH 81/84] libatasmart: - install sktest, skdump only with DEVTOOLS=yes --- packages/sysutils/libatasmart/install | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/sysutils/libatasmart/install b/packages/sysutils/libatasmart/install index b0102b35c4..a6b87b2485 100755 --- a/packages/sysutils/libatasmart/install +++ b/packages/sysutils/libatasmart/install @@ -5,9 +5,10 @@ $SCRIPTS/install udev mkdir -p $INSTALL/usr/lib - cp -PR $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib -#DEVTOOLS -mkdir -p $INSTALL/usr/bin - cp -PR $PKG_BUILD/.libs/sktest $INSTALL/usr/bin - cp -PR $PKG_BUILD/.libs/skdump $INSTALL/usr/bin +if [ "$DEVTOOLS" = yes ]; then + mkdir -p $INSTALL/usr/bin + cp -P $PKG_BUILD/.libs/sktest $INSTALL/usr/bin + cp -P $PKG_BUILD/.libs/skdump $INSTALL/usr/bin +fi \ No newline at end of file From 9fa4c74bd059a39ab13c0549f3ac30b4c21b35ca Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 23:42:45 +0100 Subject: [PATCH 82/84] uxlaunch: - update to uxlaunch-0.46 --- packages/x11/other/uxlaunch/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/other/uxlaunch/url b/packages/x11/other/uxlaunch/url index d23bb6709c..6876470c93 100644 --- a/packages/x11/other/uxlaunch/url +++ b/packages/x11/other/uxlaunch/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/uxlaunch-0.44-git.tar.bz2 +http://git.moblin.org/cgit.cgi/uxlaunch/snapshot/uxlaunch-0.46.tar.bz2 \ No newline at end of file From a10a1276854591e5b821623e65880779c722700a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 23:43:18 +0100 Subject: [PATCH 83/84] xf86-video-ati: - build only on i386 and x86_64 arch --- packages/x11/driver/xf86-video-ati/arch | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 packages/x11/driver/xf86-video-ati/arch diff --git a/packages/x11/driver/xf86-video-ati/arch b/packages/x11/driver/xf86-video-ati/arch new file mode 100644 index 0000000000..7414689203 --- /dev/null +++ b/packages/x11/driver/xf86-video-ati/arch @@ -0,0 +1,2 @@ +i386 +x86_64 From e5eccc3e4079c251bdc540e7328a52b13ec97157 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 18 Mar 2010 23:43:44 +0100 Subject: [PATCH 84/84] xf86-video-intel: - update to xf86-video-intel-2.10.902 --- packages/x11/driver/xf86-video-intel/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-intel/url b/packages/x11/driver/xf86-video-intel/url index 4d395a3ed3..71230b399a 100644 --- a/packages/x11/driver/xf86-video-intel/url +++ b/packages/x11/driver/xf86-video-intel/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-2.10.901.tar.bz2 \ No newline at end of file +http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-2.10.902.tar.bz2