From 35e8e0dc378fc96ec1016ef81b6ca627786cccfe Mon Sep 17 00:00:00 2001 From: William Rodriguez Date: Wed, 5 Oct 2011 20:28:13 -0500 Subject: [PATCH 1/6] url updates --- packages/network/bluez/meta | 3 ++- packages/network/connman/meta | 3 ++- packages/sysutils/udev/meta | 3 ++- packages/sysutils/usbutils/meta | 3 ++- packages/sysutils/util-linux/meta | 3 ++- packages/toolchain/devel/binutils/meta | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/network/bluez/meta b/packages/network/bluez/meta index f965dfcce7..6071ab0b4a 100644 --- a/packages/network/bluez/meta +++ b/packages/network/bluez/meta @@ -25,7 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.bluez.org/" #PKG_URL="http://www.kernel.org/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2" +#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="alsa-lib libusb-compat dbus glib" PKG_BUILD_DEPENDS="toolchain alsa-lib libusb-compat dbus glib" PKG_PRIORITY="optional" diff --git a/packages/network/connman/meta b/packages/network/connman/meta index 795c037924..e383e4c3b3 100644 --- a/packages/network/connman/meta +++ b/packages/network/connman/meta @@ -25,7 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.connman.net" #PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/network/connman//$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2" +#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/network/connman//$PKG_NAME-$PKG_VERSION.tar.bz2" #PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="glib dbus udev iptables wpa_supplicant ntp netstatus" PKG_BUILD_DEPENDS="toolchain glib dbus udev iptables" diff --git a/packages/sysutils/udev/meta b/packages/sysutils/udev/meta index d6907c7f9d..ae102e74f2 100644 --- a/packages/sysutils/udev/meta +++ b/packages/sysutils/udev/meta @@ -25,7 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" #PKG_URL="http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2" +#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="glib pciutils usbutils libusb-compat" PKG_BUILD_DEPENDS="toolchain glib pciutils usbutils libusb-compat" PKG_PRIORITY="optional" diff --git a/packages/sysutils/usbutils/meta b/packages/sysutils/usbutils/meta index b3e4da2478..1ae5e0e889 100644 --- a/packages/sysutils/usbutils/meta +++ b/packages/sysutils/usbutils/meta @@ -25,7 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.linux-usb.org/" #PKG_URL="http://www.kernel.org/pub/linux/utils/usb/usbutils/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/usb/usbutils/$PKG_NAME-$PKG_VERSION.tar.bz2" +#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/usb/usbutils/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/usb/usbutils/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="zlib libusb-compat" PKG_BUILD_DEPENDS="toolchain zlib libusb-compat" PKG_PRIORITY="optional" diff --git a/packages/sysutils/util-linux/meta b/packages/sysutils/util-linux/meta index 3e92f08ca1..545039e829 100644 --- a/packages/sysutils/util-linux/meta +++ b/packages/sysutils/util-linux/meta @@ -25,7 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://userweb.kernel.org/~kzak/util-linux-ng/" #PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.20/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/util-linux/v2.20/$PKG_NAME-$PKG_VERSION.tar.bz2" +#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/util-linux/v2.20/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/util-linux/v2.20/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" diff --git a/packages/toolchain/devel/binutils/meta b/packages/toolchain/devel/binutils/meta index b69d6435a3..32c7de3622 100644 --- a/packages/toolchain/devel/binutils/meta +++ b/packages/toolchain/devel/binutils/meta @@ -24,7 +24,8 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/binutils/binutils.html" -PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2" +#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2" #PKG_URL="http://ftp.gnu.org/gnu/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2" #PKG_URL="ftp://ftp.kernel.org/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" From bea1488240d3251653b4fa4de51c8a370cc6ce22 Mon Sep 17 00:00:00 2001 From: William Rodriguez Date: Wed, 5 Oct 2011 22:10:52 -0500 Subject: [PATCH 2/6] url updates for kbb and syslinux --- packages/sysutils/kbd/meta | 3 ++- packages/tools/syslinux/meta | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/kbd/meta b/packages/sysutils/kbd/meta index 3e43312bc9..479be1711a 100644 --- a/packages/sysutils/kbd/meta +++ b/packages/sysutils/kbd/meta @@ -25,7 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="ftp://devel.altlinux.org/legion/kbd/" #PKG_URL="http://www.kernel.org/pub/linux/utils/kbd/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/kbd/$PKG_NAME-$PKG_VERSION.tar.bz2" +#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/kbd/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/kbd/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" diff --git a/packages/tools/syslinux/meta b/packages/tools/syslinux/meta index cf1ca4bfc5..6f47ea56c0 100644 --- a/packages/tools/syslinux/meta +++ b/packages/tools/syslinux/meta @@ -25,7 +25,8 @@ PKG_ARCH="i386 x86_64" PKG_LICENSE="GPL" PKG_SITE="http://syslinux.zytor.com/" #PKG_URL="http://www.kernel.org/pub/linux/utils/boot/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/boot/syslinux/$PKG_NAME-$PKG_VERSION.tar.bz2" +#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/boot/syslinux/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/boot/syslinux/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" From 7bc50b4959949318a54355dfedbcc3b82658b1ae Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 6 Oct 2011 21:12:09 +0200 Subject: [PATCH 3/6] new package: add package 'gettext' Signed-off-by: Stephan Raue --- .../toolchain/devel/autotools/autoconf/meta | 2 +- .../toolchain/devel/autotools/gettext/build | 38 +++++++++++++++++++ .../toolchain/devel/autotools/gettext/meta | 36 ++++++++++++++++++ .../gettext-0.18.1.1-non_interactive.patch | 18 +++++++++ 4 files changed, 93 insertions(+), 1 deletion(-) create mode 100755 packages/toolchain/devel/autotools/gettext/build create mode 100644 packages/toolchain/devel/autotools/gettext/meta create mode 100644 packages/toolchain/devel/autotools/gettext/patches/gettext-0.18.1.1-non_interactive.patch diff --git a/packages/toolchain/devel/autotools/autoconf/meta b/packages/toolchain/devel/autotools/autoconf/meta index 7ac89b1cdf..4e42810efa 100644 --- a/packages/toolchain/devel/autotools/autoconf/meta +++ b/packages/toolchain/devel/autotools/autoconf/meta @@ -26,7 +26,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://sources.redhat.com/autoconf/" PKG_URL="http://ftp.gnu.org/gnu/autoconf/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache m4 libtool-host" +PKG_BUILD_DEPENDS="ccache m4 gettext libtool-host" PKG_PRIORITY="optional" PKG_SECTION="toolchain/devel" PKG_SHORTDESC="autoconf: A GNU tool for automatically configuring source code" diff --git a/packages/toolchain/devel/autotools/gettext/build b/packages/toolchain/devel/autotools/gettext/build new file mode 100755 index 0000000000..365d30daed --- /dev/null +++ b/packages/toolchain/devel/autotools/gettext/build @@ -0,0 +1,38 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +setup_toolchain host + +cd $PKG_BUILD +./configure --host=$HOST_NAME \ + --build=$HOST_NAME \ + --target=$TARGET_NAME \ + --prefix=$ROOT/$TOOLCHAIN \ + --enable-shared \ + --disable-static \ + --disable-rpath \ + --with-gnu-ld + +make +make install diff --git a/packages/toolchain/devel/autotools/gettext/meta b/packages/toolchain/devel/autotools/gettext/meta new file mode 100644 index 0000000000..ea26fd830c --- /dev/null +++ b/packages/toolchain/devel/autotools/gettext/meta @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="gettext" +PKG_VERSION="0.18.1.1" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://www.gnu.org/s/gettext/" +PKG_URL="http://ftp.gnu.org/pub/gnu/gettext/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="ccache" +PKG_PRIORITY="optional" +PKG_SECTION="toolchain/devel" +PKG_SHORTDESC="gettext: A program internationalization library and tools" +PKG_LONGDESC="This is the GNU gettext package. It is interesting for authors or maintainers of other packages or programs which they want to see internationalized. As one step the handling of messages in different languages should be implemented. For this task GNU gettext provides the needed tools and library functions." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/toolchain/devel/autotools/gettext/patches/gettext-0.18.1.1-non_interactive.patch b/packages/toolchain/devel/autotools/gettext/patches/gettext-0.18.1.1-non_interactive.patch new file mode 100644 index 0000000000..86ca2db57f --- /dev/null +++ b/packages/toolchain/devel/autotools/gettext/patches/gettext-0.18.1.1-non_interactive.patch @@ -0,0 +1,18 @@ +diff -Naur gettext-0.18.1.1-old/gettext-tools/misc/gettextize.in gettext-0.18.1.1-new/gettext-tools/misc/gettextize.in +--- gettext-0.18.1.1-old/gettext-tools/misc/gettextize.in 2010-06-06 05:49:57.000000000 -0700 ++++ gettext-0.18.1.1-new/gettext-tools/misc/gettextize.in 2010-08-18 06:52:51.000000000 -0700 +@@ -1272,10 +1272,10 @@ + 5) count="five paragraphs";; + *) count="$count paragraphs";; + esac +- echo "Press Return to acknowledge the previous $count." +- # Read from /dev/tty, not stdin, so that gettextize cannot be abused by +- # non-interactive tools. +- read dummy < /dev/tty ++# echo "Press Return to acknowledge the previous $count." ++# # Read from /dev/tty, not stdin, so that gettextize cannot be abused by ++# # non-interactive tools. ++# read dummy < /dev/tty + fi + + exit 0 From 72c0a6b974a98392002f0e9bb0a4ac1a31227847 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 6 Oct 2011 21:13:02 +0200 Subject: [PATCH 4/6] config/functions: cleanup Signed-off-by: Stephan Raue --- config/functions | 52 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/config/functions b/config/functions index 8bf9a821c8..5f5b8339a1 100644 --- a/config/functions +++ b/config/functions @@ -115,22 +115,44 @@ add_group() { } do_autoreconf() { - if [ -e $ROOT/$TOOLCHAIN/bin/autoreconf ] && - [ -e $ROOT/$TOOLCHAIN/bin/autoconf ] && - [ -e $ROOT/$TOOLCHAIN/bin/automake ] && - [ -e $ROOT/$TOOLCHAIN/bin/libtoolize ] && - [ -e $ROOT/$TOOLCHAIN/bin/intltoolize ]; then - export LIBTOOL=$ROOT/$TOOLCHAIN/bin/libtool - export LIBTOOLIZE=$ROOT/$TOOLCHAIN/bin/libtoolize - export AUTOMAKE=$ROOT/$TOOLCHAIN/bin/automake - export ACLOCAL_DIR=$SYSROOT_PREFIX/usr/share/aclocal - export ACLOCAL="$ROOT/$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR" - export AUTOCONF=$ROOT/$TOOLCHAIN/bin/autoconf - export AUTOHEADER=$ROOT/$TOOLCHAIN/bin/autoheader - export AUTORECONF="$ROOT/$TOOLCHAIN/bin/autoreconf -v -f -i -I $ACLOCAL_DIR" + export ACLOCAL_DIR=$SYSROOT_PREFIX/usr/share/aclocal - mkdir -p $ACLOCAL_DIR - autoreconf --force --install -I $ACLOCAL_DIR $@ + if [ -e $ROOT/$TOOLCHAIN/bin/autoconf ]; then + export AUTOCONF=$ROOT/$TOOLCHAIN/bin/autoconf + fi + + if [ -e $ROOT/$TOOLCHAIN/bin/automake ]; then + export AUTOMAKE=$ROOT/$TOOLCHAIN/bin/automake + fi + + if [ -e $ROOT/$TOOLCHAIN/bin/autopoint ]; then + export AUTOPOINT=$ROOT/$TOOLCHAIN/bin/autopoint + fi + + if [ -e $ROOT/$TOOLCHAIN/bin/libtoolize ]; then + export LIBTOOLIZE=$ROOT/$TOOLCHAIN/bin/libtoolize + fi + + if [ -e $ROOT/$TOOLCHAIN/bin/intltoolize ]; then + export INTLTOOLIZE=$ROOT/$TOOLCHAIN/bin/intltoolize + fi + + if [ -e $ROOT/$TOOLCHAIN/bin/aclocal ]; then + export ACLOCAL="$ROOT/$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR" + fi + + if [ -e $ROOT/$TOOLCHAIN/bin/autoheader ]; then + export AUTOHEADER=$ROOT/$TOOLCHAIN/bin/autoheader + fi + + if [ -e $ROOT/$TOOLCHAIN/bin/libtool ]; then + export LIBTOOL=$ROOT/$TOOLCHAIN/bin/libtool + fi + + if [ -e $ROOT/$TOOLCHAIN/bin/autoreconf -a -e $INTLTOOLIZE ]; then + mkdir -p $ACLOCAL_DIR + export AUTORECONF="$ROOT/$TOOLCHAIN/bin/autoreconf --verbose --force --install -I $ACLOCAL_DIR" + $AUTORECONF $@ fi } From 84ef11182aa39807f6fc2d8fbc451b190908696c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 6 Oct 2011 22:34:54 +0200 Subject: [PATCH 5/6] libgpg-error: run gettextize before configure Signed-off-by: Stephan Raue --- packages/security/libgpg-error/build | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/security/libgpg-error/build b/packages/security/libgpg-error/build index e579adc84c..5e5aea22bf 100755 --- a/packages/security/libgpg-error/build +++ b/packages/security/libgpg-error/build @@ -23,6 +23,7 @@ . config/options $1 cd $PKG_BUILD +gettextize -f ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ From 8f719d8b0f0e03aac24ef738e48c13810cf45b11 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 6 Oct 2011 22:35:46 +0200 Subject: [PATCH 6/6] samba: optimze samba config file, thanks to ShadowX Signed-off-by: Stephan Raue --- packages/network/samba/config/smb.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/network/samba/config/smb.conf b/packages/network/samba/config/smb.conf index f301ecc96e..426dbba108 100644 --- a/packages/network/samba/config/smb.conf +++ b/packages/network/samba/config/smb.conf @@ -28,7 +28,8 @@ netbios name = openelec security = share guest account = root - socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 + socket options = TCP_NODELAY IPTOS_LOWDELAY SO_RCVBUF=65536 SO_SNDBUF=65536 + mangled names = no wins support = yes syslog only = yes name resolve order = lmhosts wins bcast host