From f8af0e6544939a549e9f1499b60494dbe2aa909c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 5 May 2010 21:45:00 +0200 Subject: [PATCH 01/12] new package: - add transmission bittorent daemon --- packages/image/install | 3 ++ packages/network/transmission/build | 31 +++++++++++++ .../transmission/config/transmission.conf | 26 +++++++++++ .../transmission/init.d/43_transmission | 43 +++++++++++++++++++ packages/network/transmission/install | 24 +++++++++++ packages/network/transmission/url | 1 + projects/ION/options | 3 ++ projects/generic/options | 3 ++ projects/intel/options | 3 ++ 9 files changed, 137 insertions(+) create mode 100644 packages/network/transmission/build create mode 100644 packages/network/transmission/config/transmission.conf create mode 100644 packages/network/transmission/init.d/43_transmission create mode 100644 packages/network/transmission/install create mode 100644 packages/network/transmission/url diff --git a/packages/image/install b/packages/image/install index ef78007ecd..499c3f864a 100755 --- a/packages/image/install +++ b/packages/image/install @@ -67,6 +67,9 @@ case "$2" in # Network support [ "$NETWORK" = yes ] && $SCRIPTS/install network +# Transmission BitTorrent support + [ "$TRANSMISSION" = yes ] && $SCRIPTS/install transmission + # Graphic support [ ! "$DISPLAYSERVER" = no ] && $SCRIPTS/install $DISPLAYSERVER diff --git a/packages/network/transmission/build b/packages/network/transmission/build new file mode 100644 index 0000000000..bca83f05c9 --- /dev/null +++ b/packages/network/transmission/build @@ -0,0 +1,31 @@ +#!/bin/sh + +. config/options + +$SCRIPTS/build toolchain +$SCRIPTS/build zlib +$SCRIPTS/build openssl +$SCRIPTS/build curl + +cd $PKG_BUILD + +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-debug \ + --disable-static \ + --enable-shared \ + --enable-largefile \ + --disable-gtk \ + --disable-libnotify \ + --disable-libappindicator \ + --disable-libcanberra \ + --disable-gconf2 \ + --disable-nls \ + --enable-cli \ + --disable-mac \ + --enable-daemon \ + +make diff --git a/packages/network/transmission/config/transmission.conf b/packages/network/transmission/config/transmission.conf new file mode 100644 index 0000000000..b42588e335 --- /dev/null +++ b/packages/network/transmission/config/transmission.conf @@ -0,0 +1,26 @@ +# Setup Transmission BitTorrent daemon + +# start transmission at boot ( yes / no ) + TRANSMISSION_START="no" + +# Allow RPC access to a comma-delimited whitelist of IP addresses. +# Wildcards can be specified in an address by using '*'. Default: +# "127.0.0.1" Example: "127.0.0.*,192.168.1.*" + TRANSMISSION_IP="127.0.0.1,192.168.0.*" + +# use authentification for the web frontend ( yes / no ) + TRANSMISSION_AUTH="yes" + +# username for logging to the webfrontend + TRANSMISSION_USER="openelec" + +# password for logging to the webfrontend + TRANSMISSION_PWD="openelec" + +# incoming dir for not completed files (relative to downloaddir / +# "none" for disabling incoming dir) + TRANSMISSION_INCDIR="incoming" + +# watch dir for .torrent files (relative to downloaddir / +# "none" for disabling watch dir) + TRANSMISSION_WATCHDIR="watch" diff --git a/packages/network/transmission/init.d/43_transmission b/packages/network/transmission/init.d/43_transmission new file mode 100644 index 0000000000..aa02d5def5 --- /dev/null +++ b/packages/network/transmission/init.d/43_transmission @@ -0,0 +1,43 @@ +# start transmission bt daemon +# +# runlevels: openelec, textmode + +[ -f /storage/.config/transmission.conf ] && . /storage/.config/transmission.conf || exit 0 + +( + if [ "$TRANSMISSION_START" = "yes" ]; then + + progress "Starting Transmission BT daemon" + + TRANSMISSION_ARG="$TRANSMISSION_ARG -w /storage/downloads" + TRANSMISSION_ARG="$TRANSMISSION_ARG -e /var/log/transmission.log" + TRANSMISSION_ARG="$TRANSMISSION_ARG -g /storage/.cache/transmission" + TRANSMISSION_ARG="$TRANSMISSION_ARG -a $TRANSMISSION_IP" + + if [ "$TRANSMISSION_AUTH" = "yes" ]; then + TRANSMISSION_ARG="$TRANSMISSION_ARG -t" + TRANSMISSION_ARG="$TRANSMISSION_ARG -u $TRANSMISSION_USER" + TRANSMISSION_ARG="$TRANSMISSION_ARG -v $TRANSMISSION_PWD" + else + TRANSMISSION_ARG="$TRANSMISSION_ARG -T" + fi + + if [ "$TRANSMISSION_INCDIR" = "none" ]; then + TRANSMISSION_ARG="$TRANSMISSION_ARG --no-incomplete-dir" + else + TRANSMISSION_ARG="$TRANSMISSION_ARG --incomplete-dir \ + /storage/downloads/$TRANSMISSION_INCDIR" + $IONICE mkdir -p /storage/downloads/$TRANSMISSION_INCDIR + fi + + if [ "$TRANSMISSION_WATCHDIR" = "none" ]; then + TRANSMISSION_ARG="$TRANSMISSION_ARG --no-watch-dir" + else + TRANSMISSION_ARG="$TRANSMISSION_ARG --watch-dir \ + /storage/downloads/$TRANSMISSION_WATCHDIR" + $IONICE mkdir -p /storage/downloads/$TRANSMISSION_WATCHDIR + fi + + transmission-daemon $TRANSMISSION_ARG + fi +)& \ No newline at end of file diff --git a/packages/network/transmission/install b/packages/network/transmission/install new file mode 100644 index 0000000000..03aaad243e --- /dev/null +++ b/packages/network/transmission/install @@ -0,0 +1,24 @@ +#!/bin/sh + +. config/options + +$SCRIPTS/build zlib +$SCRIPTS/build openssl +$SCRIPTS/build curl + +PKG_DIR=`find $PACKAGES -type d -name $1` + +mkdir -p $INSTALL/usr/sbin + cp $PKG_BUILD/daemon/transmission-daemon $INSTALL/usr/sbin + cp $PKG_BUILD/daemon/transmission-remote $INSTALL/usr/sbin + +mkdir -p $INSTALL/usr/bin + cp $PKG_BUILD/cli/transmissioncli $INSTALL/usr/bin + +mkdir -p $INSTALL/usr/share/transmission/web + cp -R $PKG_BUILD/web/* $INSTALL/usr/share/transmission/web + find $INSTALL/usr/share/transmission/web -name "Makefile*" -exec rm -rf {} ";" + rm -rf $INSTALL/usr/share/transmission/web/LICENSE + +mkdir -p $INSTALL/usr/config + cp $PKG_DIR/config/transmission.conf $INSTALL/usr/config \ No newline at end of file diff --git a/packages/network/transmission/url b/packages/network/transmission/url new file mode 100644 index 0000000000..3b77ff5833 --- /dev/null +++ b/packages/network/transmission/url @@ -0,0 +1 @@ +http://mirrors.m0k.org/transmission/files/transmission-1.93.tar.bz2 \ No newline at end of file diff --git a/projects/ION/options b/projects/ION/options index 90aa5c90fb..081c8cfc81 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -71,6 +71,9 @@ # build and install Samba Server (yes / no) SAMBA_SERVER="yes" +# build and install Transmission BitTorrent daemon (yes / no) + TRANSMISSION="yes" + # todo (need for vdr?) SERVICES="yes" diff --git a/projects/generic/options b/projects/generic/options index 9445078e59..9c32b7efbf 100644 --- a/projects/generic/options +++ b/projects/generic/options @@ -71,6 +71,9 @@ # build and install Samba Server (yes / no) SAMBA_SERVER="yes" +# build and install Transmission BitTorrent daemon (yes / no) + TRANSMISSION="yes" + # todo (need for vdr?) SERVICES="yes" diff --git a/projects/intel/options b/projects/intel/options index a2f9a43a21..ccba140b6f 100644 --- a/projects/intel/options +++ b/projects/intel/options @@ -71,6 +71,9 @@ # build and install Samba Server (yes / no) SAMBA_SERVER="yes" +# build and install Transmission BitTorrent daemon (yes / no) + TRANSMISSION="yes" + # todo (need for vdr?) SERVICES="yes" From eea35d47b1d61f82bf5f247b3942b3c45a56f370 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 6 May 2010 00:23:33 +0200 Subject: [PATCH 02/12] xbmc: - update to xbmc-29818 --- 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 306975395f..2d2f808d42 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-29759.tar.bz2 +http://sources.openelec.tv/svn/xbmc-29818.tar.bz2 From bfb405965da5350badef613ee80c5571c7f49963 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 6 May 2010 00:23:51 +0200 Subject: [PATCH 03/12] xbmc-theme-Confluence: - update to xbmc-theme-Confluence-29818 --- 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 c4a759a223..fc60dd88b9 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-29759.tar.bz2 +http://sources.openelec.tv/svn/xbmc-theme-Confluence-29818.tar.bz2 From 86ef8ae6818f483b0c656830b8ab35a7c4f7f0b2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 6 May 2010 00:24:13 +0200 Subject: [PATCH 04/12] xbmc-theme-PM3-HD: - update to xbmc-theme-PM3-HD-29818 --- packages/mediacenter/xbmc-theme-PM3-HD/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-theme-PM3-HD/url b/packages/mediacenter/xbmc-theme-PM3-HD/url index 00fb3566c4..15cf6f9d5f 100644 --- a/packages/mediacenter/xbmc-theme-PM3-HD/url +++ b/packages/mediacenter/xbmc-theme-PM3-HD/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-theme-PM3-HD-29759.tar.bz2 +http://sources.openelec.tv/svn/xbmc-theme-PM3-HD-29818.tar.bz2 From 96aa512a4dcc0954bfc43d9c0ab5900b8ff21c80 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 6 May 2010 00:24:58 +0200 Subject: [PATCH 05/12] transmission: - dont build and install transmissioncli and transmission-remote --- packages/network/transmission/build | 2 +- packages/network/transmission/install | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) mode change 100644 => 100755 packages/network/transmission/build mode change 100644 => 100755 packages/network/transmission/install diff --git a/packages/network/transmission/build b/packages/network/transmission/build old mode 100644 new mode 100755 index bca83f05c9..f5d9252226 --- a/packages/network/transmission/build +++ b/packages/network/transmission/build @@ -24,7 +24,7 @@ cd $PKG_BUILD --disable-libcanberra \ --disable-gconf2 \ --disable-nls \ - --enable-cli \ + --disable-cli \ --disable-mac \ --enable-daemon \ diff --git a/packages/network/transmission/install b/packages/network/transmission/install old mode 100644 new mode 100755 index 03aaad243e..8be2bf7b95 --- a/packages/network/transmission/install +++ b/packages/network/transmission/install @@ -10,10 +10,6 @@ PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/usr/sbin cp $PKG_BUILD/daemon/transmission-daemon $INSTALL/usr/sbin - cp $PKG_BUILD/daemon/transmission-remote $INSTALL/usr/sbin - -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/cli/transmissioncli $INSTALL/usr/bin mkdir -p $INSTALL/usr/share/transmission/web cp -R $PKG_BUILD/web/* $INSTALL/usr/share/transmission/web From 60910917e4fe32aaacd810b821bfea00c8393c87 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 6 May 2010 00:25:20 +0200 Subject: [PATCH 06/12] autoupdate: - fix locking --- packages/sysutils/autoupdate/scripts/autoupdate.devel | 8 +++----- packages/sysutils/autoupdate/scripts/autoupdate.release | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/packages/sysutils/autoupdate/scripts/autoupdate.devel b/packages/sysutils/autoupdate/scripts/autoupdate.devel index e5a128b163..6686975359 100755 --- a/packages/sysutils/autoupdate/scripts/autoupdate.devel +++ b/packages/sysutils/autoupdate/scripts/autoupdate.devel @@ -6,8 +6,6 @@ if [ ! -f /var/lock/update.lock ]; then if [ "$AUTOUPDATE" = "manually" -o "$AUTOUPDATE" = "auto" ]; then - # locking autoupdate - touch /var/lock/update.lock # sleep a bit, maybe we have a lot of work ;-) usleep 30000000 @@ -42,14 +40,14 @@ if [ ! -f /var/lock/update.lock ]; then # show a message if a new version is avaible send_message "New update avaible: r$NEW_VERSION - please update manually" - # remove locking - rm -rf /var/lock/update.lock - elif [ "$AUTOUPDATE" = "auto" ]; then # show a message if a new version is avaible send_message "New update avaible: r$NEW_VERSION - downloading and extract the new version..." + # locking autoupdate + touch /var/lock/update.lock + # downloading the new version wget -c $UPDATEURL/$NEW_IMAGE.tar.bz2 -P /tmp diff --git a/packages/sysutils/autoupdate/scripts/autoupdate.release b/packages/sysutils/autoupdate/scripts/autoupdate.release index 3d1f5cdfdf..0216872fdf 100755 --- a/packages/sysutils/autoupdate/scripts/autoupdate.release +++ b/packages/sysutils/autoupdate/scripts/autoupdate.release @@ -6,8 +6,6 @@ if [ ! -f /var/lock/update.lock ]; then if [ "$AUTOUPDATE" = "manually" -o "$AUTOUPDATE" = "auto" ]; then - # locking autoupdate - touch /var/lock/update.lock # sleep a bit, maybe we have a lot of work ;-) usleep 30000000 @@ -49,14 +47,14 @@ if [ ! -f /var/lock/update.lock ]; then # show a message if a new version is avaible send_message "New update avaible: $NEW_VERSION - please update manually" - # remove locking - rm -rf /var/lock/update.lock - elif [ "$AUTOUPDATE" = "auto" ]; then # show a message if a new version is avaible send_message "New update avaible: $NEW_VERSION - downloading and extract the new version..." + # locking autoupdate + touch /var/lock/update.lock + # downloading the new version wget -c $UPDATEURL/$NEW_IMAGE.tar.bz2 -P /tmp From e3cd3c8753ed9f29bbb5e76a7b42a14dd1b89720 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 6 May 2010 00:26:10 +0200 Subject: [PATCH 07/12] xf86-video-nvidia: - update to NVIDIA-Linux-x86-195.36.24 - update to NVIDIA-Linux-x86_64-195.36.24 --- packages/x11/driver/xf86-video-nvidia/url | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/x11/driver/xf86-video-nvidia/url b/packages/x11/driver/xf86-video-nvidia/url index 9daaa44db8..adb112d0a8 100644 --- a/packages/x11/driver/xf86-video-nvidia/url +++ b/packages/x11/driver/xf86-video-nvidia/url @@ -1,2 +1,2 @@ -ftp://download.nvidia.com/XFree86/Linux-x86/195.36.15/NVIDIA-Linux-x86-195.36.15-pkg0.run -ftp://download.nvidia.com/XFree86/Linux-x86_64/195.36.15/NVIDIA-Linux-x86_64-195.36.15-pkg0.run +ftp://download.nvidia.com/XFree86/Linux-x86/195.36.24/NVIDIA-Linux-x86-195.36.24-pkg0.run +ftp://download.nvidia.com/XFree86/Linux-x86_64/195.36.24/NVIDIA-Linux-x86_64-195.36.24-pkg0.run From 4c12e3dec02d2d5df8e2751e9fca187600e098ca Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 6 May 2010 01:05:33 +0200 Subject: [PATCH 08/12] xorg-server: - update to xorg-server-1.7.7 --- 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 44f6c589ee..f25610e0d0 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.6.902.tar.bz2 \ No newline at end of file +http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.7.tar.bz2 \ No newline at end of file From 393da7acb23ec49aa965e73133581cc1142e1d9d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 7 May 2010 02:52:01 +0200 Subject: [PATCH 09/12] e2fsprogs: - remove some unneeded config options --- packages/sysutils/e2fsprogs/build | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/sysutils/e2fsprogs/build b/packages/sysutils/e2fsprogs/build index b590895a7d..ecd4b0308f 100755 --- a/packages/sysutils/e2fsprogs/build +++ b/packages/sysutils/e2fsprogs/build @@ -8,8 +8,6 @@ cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ - --enable-shared \ - --disable-static \ --disable-libuuid \ --disable-libblkid \ --disable-debugfs \ From 59d2aa87f0390677651e534deea05fde386ef9dd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 7 May 2010 21:32:08 +0200 Subject: [PATCH 10/12] xbmc: - update to xbmc-29890 --- 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 2d2f808d42..2051c6e482 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-29818.tar.bz2 +http://sources.openelec.tv/svn/xbmc-29890.tar.bz2 From d84bbd131b3c1f3a3da68d486d6aa591d7057ce4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 7 May 2010 21:32:27 +0200 Subject: [PATCH 11/12] xbmc-theme-Confluence: - update to xbmc-theme-Confluence-29890 --- 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 fc60dd88b9..fade2f3c6f 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-29818.tar.bz2 +http://sources.openelec.tv/svn/xbmc-theme-Confluence-29890.tar.bz2 From cbde3ef16958438f0a3ded6f1b0f82e763d0aa10 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 7 May 2010 21:32:45 +0200 Subject: [PATCH 12/12] xbmc-theme-PM3-HD: - update to xbmc-theme-PM3-HD-29890 --- packages/mediacenter/xbmc-theme-PM3-HD/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-theme-PM3-HD/url b/packages/mediacenter/xbmc-theme-PM3-HD/url index 15cf6f9d5f..d9c23c30c2 100644 --- a/packages/mediacenter/xbmc-theme-PM3-HD/url +++ b/packages/mediacenter/xbmc-theme-PM3-HD/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-theme-PM3-HD-29818.tar.bz2 +http://sources.openelec.tv/svn/xbmc-theme-PM3-HD-29890.tar.bz2