diff --git a/config/arch.arm b/config/arch.arm index a688f8f80b..3ebf7cad91 100644 --- a/config/arch.arm +++ b/config/arch.arm @@ -37,6 +37,6 @@ esac # setup ARCH specific *FLAGS - TARGET_CFLAGS="-fPIC -march=$TARGET_SUBARCH -mtune=$TARGET_CPU -mabi=aapcs-linux" + TARGET_CFLAGS="-march=$TARGET_SUBARCH -mtune=$TARGET_CPU -mabi=aapcs-linux" [ -n "$TARGET_FPU" ] && TARGET_CFLAGS="$TARGET_CFLAGS -mfpu=$TARGET_FPU" TARGET_LDFLAGS="-fPIC -march=$TARGET_SUBARCH -mtune=$TARGET_CPU" diff --git a/config/arch.x86_64 b/config/arch.x86_64 index e0d6b2ae0f..fa237258a2 100644 --- a/config/arch.x86_64 +++ b/config/arch.x86_64 @@ -7,5 +7,5 @@ TARGET_SUBARCH=x86_64 # setup ARCH specific *FLAGS - TARGET_CFLAGS="-fPIC -march=$TARGET_CPU -m64" - TARGET_LDFLAGS="-fPIC -march=$TARGET_CPU -m64" + TARGET_CFLAGS="-march=$TARGET_CPU -m64" + TARGET_LDFLAGS="-march=$TARGET_CPU -m64" diff --git a/config/optimize b/config/optimize index 733e7e5e02..725634d5e1 100644 --- a/config/optimize +++ b/config/optimize @@ -101,12 +101,3 @@ HOST_LIBDIR="$ROOT/$TOOLCHAIN/lib" # default dirs HOST_LIBDIR="$HOST_LIBDIR /lib /usr/lib" HOST_INCDIR="$ROOT/$TOOLCHAIN/include /usr/include" - -# use -fPIC when necessary - case "`uname -m`" in - x86_64|ppc64|arm|armeb|armel) - HOST_CFLAGS="$HOST_CFLAGS -fPIC" - HOST_CXXFLAGS="$HOST_CXXFLAGS -fPIC" - HOST_LDFLAGS="$HOST_LDFLAGS -fPIC" - ;; - esac diff --git a/packages/audio/lame/meta b/packages/audio/lame/meta index cea02ca26a..e333efb47d 100644 --- a/packages/audio/lame/meta +++ b/packages/audio/lame/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="lame" -PKG_VERSION="3.99.2" +PKG_VERSION="3.99.3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" diff --git a/packages/audio/lame/patches/lame-3.99.2-am_path_gtk.patch b/packages/audio/lame/patches/lame-3.99.3-am_path_gtk.patch similarity index 100% rename from packages/audio/lame/patches/lame-3.99.2-am_path_gtk.patch rename to packages/audio/lame/patches/lame-3.99.3-am_path_gtk.patch diff --git a/packages/audio/libcdio/install b/packages/audio/libcdio/install index 4b0c06ac82..05a1188854 100755 --- a/packages/audio/libcdio/install +++ b/packages/audio/libcdio/install @@ -23,4 +23,5 @@ . config/options $1 mkdir -p $INSTALL/usr/lib + cp -P $PKG_BUILD/lib/*/.libs/*.so $INSTALL/usr/lib cp -P $PKG_BUILD/lib/*/.libs/*.so*[.0-9] $INSTALL/usr/lib diff --git a/packages/compress/zlib-host/build b/packages/compress/zlib-host/build index 5a31f9905e..b3c5175dff 100755 --- a/packages/compress/zlib-host/build +++ b/packages/compress/zlib-host/build @@ -24,6 +24,9 @@ $SCRIPTS/unpack zlib +# dont build parallel + MAKEFLAGS=-j1 + setup_toolchain host cd $BUILD/zlib-* diff --git a/packages/devel/eggdbus-host/build b/packages/devel/eggdbus-host/build index 05d64e1a8f..ff4a5a287f 100755 --- a/packages/devel/eggdbus-host/build +++ b/packages/devel/eggdbus-host/build @@ -24,6 +24,9 @@ $SCRIPTS/unpack eggdbus +# dont build parallel + MAKEFLAGS=-j1 + EGGDBUS_DIR=`ls -d $BUILD/eggdbus-[0-9]*` setup_toolchain host diff --git a/packages/devel/eggdbus/build b/packages/devel/eggdbus/build index e8b466950d..86e68e8eff 100755 --- a/packages/devel/eggdbus/build +++ b/packages/devel/eggdbus/build @@ -22,6 +22,9 @@ . config/options $1 +# dont build parallel + MAKEFLAGS=-j1 + cd $PKG_BUILD mkdir -p .build-target diff --git a/packages/devel/libcec/meta b/packages/devel/libcec/meta index e9e64b6af2..f654b03904 100644 --- a/packages/devel/libcec/meta +++ b/packages/devel/libcec/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libcec" -PKG_VERSION="2491aac" +PKG_VERSION="8b86fb7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/devel/llvm/build b/packages/devel/llvm/build index b31ec67c27..4e17d01409 100755 --- a/packages/devel/llvm/build +++ b/packages/devel/llvm/build @@ -36,7 +36,6 @@ LLVM_DIR=`ls -d $BUILD/llvm-[0-9]*` cd $LLVM_DIR mkdir -p .build-target && cd .build-target - ../configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ @@ -57,11 +56,13 @@ mkdir -p .build-target && cd .build-target --enable-embed-stdcxx \ --enable-timestamps \ --enable-targets=$LLVM_ARCH \ + --disable-libffi \ + --disable-ltdl-install \ -TBLGEN="$ROOT/$TOOLCHAIN/bin/tblgen" \ -TCLSH="$ROOT/$TOOLCHAIN/bin/tclsh" \ +LLVM_TBLGEN="$ROOT/$TOOLCHAIN/bin/llvm-tblgen" \ make -TBLGEN="$ROOT/$TOOLCHAIN/bin/tblgen" \ -TCLSH="$ROOT/$TOOLCHAIN/bin/tclsh" \ +LLVM_TBLGEN="$ROOT/$TOOLCHAIN/bin/llvm-tblgen" \ $MAKEINSTALL + +#TCLSH="$ROOT/$TOOLCHAIN/bin/tclsh" \ diff --git a/packages/devel/llvm/meta b/packages/devel/llvm/meta index 7a9b830624..5179578b0e 100644 --- a/packages/devel/llvm/meta +++ b/packages/devel/llvm/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="llvm" -PKG_VERSION="2.9" +PKG_VERSION="3.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://llvm.org/" -PKG_URL="http://llvm.org/releases/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tgz" +PKG_URL="http://llvm.org/releases/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain llvm-host" PKG_PRIORITY="optional" diff --git a/packages/devel/llvm/patches/llvm-2.9-cross.patch b/packages/devel/llvm/patches/llvm-3.0-cross.patch similarity index 52% rename from packages/devel/llvm/patches/llvm-2.9-cross.patch rename to packages/devel/llvm/patches/llvm-3.0-cross.patch index d258bff854..197553bac4 100644 --- a/packages/devel/llvm/patches/llvm-2.9-cross.patch +++ b/packages/devel/llvm/patches/llvm-3.0-cross.patch @@ -1,7 +1,7 @@ -diff -Naur llvm-2.9-old/autoconf/configure.ac llvm-2.9-new/autoconf/configure.ac ---- llvm-2.9-old/autoconf/configure.ac 2011-03-25 00:56:32.000000000 -0700 -+++ llvm-2.9-new/autoconf/configure.ac 2011-05-05 13:33:38.000000000 -0700 -@@ -384,6 +384,10 @@ +diff -Naur llvm-3.0.src/autoconf/configure.ac llvm-3.0.src.patch/autoconf/configure.ac +--- llvm-3.0.src/autoconf/configure.ac 2011-10-16 04:52:56.000000000 +0200 ++++ llvm-3.0.src.patch/autoconf/configure.ac 2011-12-03 12:57:33.324415172 +0100 +@@ -393,6 +393,10 @@ AC_CHECK_PROG(BUILD_CXX, c++, c++, , , /usr/ucb/c++) fi fi @@ -12,9 +12,9 @@ diff -Naur llvm-2.9-old/autoconf/configure.ac llvm-2.9-new/autoconf/configure.ac else AC_SUBST(LLVM_CROSS_COMPILING, [0]) fi -diff -Naur llvm-2.9-old/autoconf/m4/build_exeext.m4 llvm-2.9-new/autoconf/m4/build_exeext.m4 ---- llvm-2.9-old/autoconf/m4/build_exeext.m4 2008-09-26 10:27:58.000000000 -0700 -+++ llvm-2.9-new/autoconf/m4/build_exeext.m4 2011-05-05 12:29:10.000000000 -0700 +diff -Naur llvm-3.0.src/autoconf/m4/build_exeext.m4 llvm-3.0.src.patch/autoconf/m4/build_exeext.m4 +--- llvm-3.0.src/autoconf/m4/build_exeext.m4 2008-09-26 19:27:58.000000000 +0200 ++++ llvm-3.0.src.patch/autoconf/m4/build_exeext.m4 2011-12-03 12:57:33.327415229 +0100 @@ -18,7 +18,7 @@ fi fi @@ -24,10 +24,10 @@ diff -Naur llvm-2.9-old/autoconf/m4/build_exeext.m4 llvm-2.9-new/autoconf/m4/bui rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_build_exeext= -diff -Naur llvm-2.9-old/Makefile llvm-2.9-new/Makefile ---- llvm-2.9-old/Makefile 2010-11-29 10:16:10.000000000 -0800 -+++ llvm-2.9-new/Makefile 2011-05-05 13:35:06.000000000 -0700 -@@ -104,37 +104,6 @@ +diff -Naur llvm-3.0.src/Makefile llvm-3.0.src.patch/Makefile +--- llvm-3.0.src/Makefile 2011-10-08 02:27:38.000000000 +0200 ++++ llvm-3.0.src.patch/Makefile 2011-12-03 13:00:42.692055438 +0100 +@@ -104,38 +104,6 @@ DIRS := $(filter-out unittests, $(DIRS)) endif @@ -45,7 +45,8 @@ diff -Naur llvm-2.9-old/Makefile llvm-2.9-new/Makefile - unset CFLAGS ; \ - unset CXXFLAGS ; \ - $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \ -- --host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE); \ +- --host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \ +- --disable-polly ; \ - cd .. ; \ - fi; \ - (unset SDKROOT; \ @@ -65,9 +66,9 @@ diff -Naur llvm-2.9-old/Makefile llvm-2.9-new/Makefile # Include the main makefile machinery. include $(LLVM_SRC_ROOT)/Makefile.rules -diff -Naur llvm-2.9-old/Makefile.config.in llvm-2.9-new/Makefile.config.in ---- llvm-2.9-old/Makefile.config.in 2010-12-28 19:59:14.000000000 -0800 -+++ llvm-2.9-new/Makefile.config.in 2011-05-05 12:25:34.000000000 -0700 +diff -Naur llvm-3.0.src/Makefile.config.in llvm-3.0.src.patch/Makefile.config.in +--- llvm-3.0.src/Makefile.config.in 2011-10-13 19:27:34.000000000 +0200 ++++ llvm-3.0.src.patch/Makefile.config.in 2011-12-03 12:57:33.962427436 +0100 @@ -113,6 +113,10 @@ # call if we're cross-compiling). BUILD_CC=@BUILD_CC@ @@ -79,27 +80,30 @@ diff -Naur llvm-2.9-old/Makefile.config.in llvm-2.9-new/Makefile.config.in # Triple for configuring build tools when cross-compiling BUILD_TRIPLE=@build@ -diff -Naur llvm-2.9-old/Makefile.rules llvm-2.9-new/Makefile.rules ---- llvm-2.9-old/Makefile.rules 2011-03-24 23:26:58.000000000 -0700 -+++ llvm-2.9-new/Makefile.rules 2011-05-05 12:24:42.000000000 -0700 -@@ -647,15 +647,15 @@ - $(CPP.BaseFlags) +diff -Naur llvm-3.0.src/Makefile.rules llvm-3.0.src.patch/Makefile.rules +--- llvm-3.0.src/Makefile.rules 2011-10-11 14:51:44.000000000 +0200 ++++ llvm-3.0.src.patch/Makefile.rules 2011-12-03 12:59:37.459801461 +0100 +@@ -641,18 +641,18 @@ ifeq ($(BUILD_COMPONENT), 1) -- Compile.C = $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \ -+ Compile.C = $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) \ + Compile.C = $(Compile.Wrapper) \ +- $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \ ++ $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) \ $(TargetCommonOpts) $(CompileCommonOpts) -c -- Compile.CXX = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \ -+ Compile.CXX = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \ + Compile.CXX = $(Compile.Wrapper) \ +- $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \ ++ $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \ $(CPPFLAGS) \ $(TargetCommonOpts) $(CompileCommonOpts) -c -- Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(CPPFLAGS) $(TargetCommonOpts) \ -+ Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(BUILD_CPPFLAGS) $(TargetCommonOpts) \ + Preprocess.CXX= $(Compile.Wrapper) \ +- $(BUILD_CXX) $(CPP.Flags) $(CPPFLAGS) $(TargetCommonOpts) \ ++ $(BUILD_CXX) $(CPP.Flags) $(BUILD_CPPFLAGS) $(TargetCommonOpts) \ $(CompileCommonOpts) $(CXX.Flags) -E -- Link = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \ + Link = $(Compile.Wrapper) \ +- $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \ - $(LD.Flags) $(LDFLAGS) \ -+ Link = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \ ++ $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \ + $(LD.Flags) $(BUILD_LDFLAGS) \ $(TargetCommonOpts) $(CompileCommonOpts) $(Strip) else - Compile.C = $(CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \ + Compile.C = $(Compile.Wrapper) \ diff --git a/packages/devel/llvm/rename b/packages/devel/llvm/rename new file mode 100755 index 0000000000..542e124c11 --- /dev/null +++ b/packages/devel/llvm/rename @@ -0,0 +1,25 @@ +#!/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 + +mv $BUILD/$PKG_NAME-$PKG_VERSION.src $BUILD/$PKG_NAME-$PKG_VERSION diff --git a/packages/graphics/libdrm/meta b/packages/graphics/libdrm/meta index e840b32fd6..a75c7ffc70 100644 --- a/packages/graphics/libdrm/meta +++ b/packages/graphics/libdrm/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libdrm" -PKG_VERSION="2.4.27" +PKG_VERSION="2.4.28" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/connman/build b/packages/network/connman/build index 1015f250fb..9d5e3ce511 100755 --- a/packages/network/connman/build +++ b/packages/network/connman/build @@ -42,9 +42,10 @@ cd $PKG_BUILD --disable-hh2serial-gps \ --disable-ofono \ --disable-openconnect \ - --disable-portal \ --disable-openvpn \ --disable-vpnc \ + --disable-l2tp \ + --disable-pptp \ --enable-loopback=builtin \ --disable-pacrunner \ --disable-google \ @@ -54,6 +55,7 @@ cd $PKG_BUILD --enable-ntpd=builtin \ --with-ntpd="/usr/sbin/ntpd" \ --disable-nmcompat \ + --disable-tist \ --disable-polkit \ --enable-client \ --disable-tools \ diff --git a/packages/network/connman/meta b/packages/network/connman/meta index 5b29edb1bb..4b9a439b86 100644 --- a/packages/network/connman/meta +++ b/packages/network/connman/meta @@ -19,15 +19,14 @@ ################################################################################ PKG_NAME="connman" -PKG_VERSION="0.77" +PKG_VERSION="0.78" PKG_REV="1" 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="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_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="glib dbus udev iptables wpa_supplicant ntp" PKG_BUILD_DEPENDS="toolchain glib dbus udev iptables" PKG_PRIORITY="optional" diff --git a/packages/network/libnfs/meta b/packages/network/libnfs/meta index 576c4981ba..5d9256a580 100644 --- a/packages/network/libnfs/meta +++ b/packages/network/libnfs/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libnfs" -PKG_VERSION="14a062e" +PKG_VERSION="d7ec001" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/openssh/init.d/51_sshd b/packages/network/openssh/init.d/51_sshd index abff4202df..16e255775c 100644 --- a/packages/network/openssh/init.d/51_sshd +++ b/packages/network/openssh/init.d/51_sshd @@ -31,7 +31,7 @@ SSHD="/usr/sbin/sshd" # Check for the SSH1 RSA key - if [ ! -f $RSA1_KEY ] ; then + if [ ! -s $RSA1_KEY ] ; then progress "SSH: generating SSH1 RSA key" mkdir -p /storage/.cache/ssh @@ -40,7 +40,7 @@ fi # Check for the SSH2 RSA key - if [ ! -f $RSA2_KEY ] ; then + if [ ! -s $RSA2_KEY ] ; then progress "SSH: generating SSH2 RSA key" mkdir -p /storage/.cache/ssh @@ -49,7 +49,7 @@ fi # Check for the SSH2 DSA key - if [ ! -f $DSA2_KEY ] ; then + if [ ! -s $DSA2_KEY ] ; then progress "SSH: generating SSH2 DSA key" mkdir -p /storage/.cache/ssh diff --git a/packages/sysutils/e2fsprogs/meta b/packages/sysutils/e2fsprogs/meta index 3014c7b284..fa288269b5 100644 --- a/packages/sysutils/e2fsprogs/meta +++ b/packages/sysutils/e2fsprogs/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="e2fsprogs" -PKG_VERSION="1.41.14" +PKG_VERSION="1.42" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/udev/build b/packages/sysutils/udev/build index 1c503aaee6..229a8f710f 100755 --- a/packages/sysutils/udev/build +++ b/packages/sysutils/udev/build @@ -43,14 +43,14 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \ --disable-gtk-doc-pdf \ --disable-debug \ --disable-logging \ - --disable-rule_generator \ + --enable-rule_generator \ --enable-hwdb \ --disable-udev_acl \ --enable-gudev \ --disable-introspection \ --disable-keymap \ --disable-floppy \ - --disable-edd \ + --enable-edd \ --without-selinux \ --without-systemdsystemunitdir \ --with-firmware-path="/storage/.config/firmware:/usr/lib/firmware" \ diff --git a/packages/sysutils/udev/install b/packages/sysutils/udev/install index 340da9e3dc..8fe7921a0b 100755 --- a/packages/sysutils/udev/install +++ b/packages/sysutils/udev/install @@ -42,10 +42,15 @@ mkdir -p $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libgudev*.*T mkdir -p $INSTALL/usr/lib/udev - for i in accelerometer ata_id cdrom_id collect firmware mtd_probe scsi_id usb-db v4l_id; do + for i in accelerometer ata_id cdrom_id collect edd_id firmware mtd_probe scsi_id usb-db v4l_id; do cp $PKG_BUILD/extras/$i/$i $INSTALL/usr/lib/udev done cp $PKG_BUILD/extras/usb-db/pci-db $INSTALL/usr/lib/udev + cp $PKG_BUILD/extras/rule_generator/rule_generator.functions $INSTALL/usr/lib/udev + cp $PKG_BUILD/extras/rule_generator/write_cd_rules $INSTALL/usr/lib/udev + cp $PKG_BUILD/extras/rule_generator/write_net_rules $INSTALL/usr/lib/udev + chmod +x $INSTALL/usr/lib/udev/write_cd_rules + chmod +x $INSTALL/usr/lib/udev/write_net_rules mkdir -p $INSTALL/usr/lib/udev/rules.d cp $PKG_BUILD/extras/firmware/50-firmware.rules $INSTALL/usr/lib/udev/rules.d @@ -58,7 +63,11 @@ mkdir -p $INSTALL/usr/lib/udev/rules.d cp $PKG_BUILD/rules/rules.d/60-persistent-storage.rules $INSTALL/usr/lib/udev/rules.d cp $PKG_BUILD/extras/v4l_id/60-persistent-v4l.rules $INSTALL/usr/lib/udev/rules.d cp $PKG_BUILD/extras/accelerometer/61-accelerometer.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/extras/edd_id/61-persistent-storage-edd.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/extras/rule_generator/75-cd-aliases-generator.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/extras/rule_generator/75-persistent-net-generator.rules $INSTALL/usr/lib/udev/rules.d cp $PKG_BUILD/rules/rules.d/75-net-description.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/rules/rules.d/75-tty-description.rules $INSTALL/usr/lib/udev/rules.d cp $PKG_BUILD/extras/mtd_probe/75-probe_mtd.rules $INSTALL/usr/lib/udev/rules.d cp $PKG_BUILD/rules/rules.d/78-sound-card.rules $INSTALL/usr/lib/udev/rules.d cp $PKG_BUILD/rules/rules.d/80-drivers.rules $INSTALL/usr/lib/udev/rules.d diff --git a/packages/sysutils/udev/patches/udev-175-002-rules_generator_path.patch b/packages/sysutils/udev/patches/udev-175-002-rules_generator_path.patch new file mode 100644 index 0000000000..427b87f1bf --- /dev/null +++ b/packages/sysutils/udev/patches/udev-175-002-rules_generator_path.patch @@ -0,0 +1,46 @@ +diff -Naur udev-175/extras/rule_generator/rule_generator.functions udev-175.patch/extras/rule_generator/rule_generator.functions +--- udev-175/extras/rule_generator/rule_generator.functions 2011-03-23 02:15:12.000000000 +0100 ++++ udev-175.patch/extras/rule_generator/rule_generator.functions 2011-12-04 17:11:56.380258048 +0100 +@@ -15,10 +15,10 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + +-PATH='/sbin:/bin' ++PATH='/usr/sbin:/usr/bin:/sbin:/bin' + # + +-PATH='/sbin:/bin' ++PATH='/usr/sbin:/usr/bin:/sbin:/bin' + + # Read a single line from file $1 in the $DEVPATH directory. + # The function must not return an error even if the file does not exist. +diff -Naur udev-175/extras/rule_generator/write_cd_rules udev-175.patch/extras/rule_generator/write_cd_rules +--- udev-175/extras/rule_generator/write_cd_rules 2010-06-25 11:37:36.000000000 +0200 ++++ udev-175.patch/extras/rule_generator/write_cd_rules 2011-12-04 17:11:04.704237462 +0100 +@@ -27,9 +27,9 @@ + fi + fi + +-RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules" ++RULES_FILE="/run/udev/rules.d/70-persistent-cd.rules" + +-. /lib/udev/rule_generator.functions ++. /usr/lib/udev/rule_generator.functions + + find_next_available() { + raw_find_next_available "$(find_all_rules 'SYMLINK\+=' "$1")" +diff -Naur udev-175/extras/rule_generator/write_net_rules udev-175.patch/extras/rule_generator/write_net_rules +--- udev-175/extras/rule_generator/write_net_rules 2010-08-11 10:30:57.000000000 +0200 ++++ udev-175.patch/extras/rule_generator/write_net_rules 2011-12-04 17:11:22.696592805 +0100 +@@ -38,9 +38,9 @@ + fi + fi + +-RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' ++RULES_FILE='/run/udev/rules.d/70-persistent-net.rules' + +-. /lib/udev/rule_generator.functions ++. /usr/lib/udev/rule_generator.functions + + interface_name_taken() { + local value="$(find_all_rules 'NAME=' $INTERFACE)" diff --git a/packages/toolchain/devel/fakeroot/meta b/packages/toolchain/devel/fakeroot/meta index b347aac6fe..fd7e8f13a0 100644 --- a/packages/toolchain/devel/fakeroot/meta +++ b/packages/toolchain/devel/fakeroot/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="fakeroot" -PKG_VERSION="1.18.1" +PKG_VERSION="1.18.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL3" diff --git a/packages/devel/libffi-host/build b/packages/toolchain/devel/libffi-host/build similarity index 100% rename from packages/devel/libffi-host/build rename to packages/toolchain/devel/libffi-host/build diff --git a/packages/devel/libffi-host/meta b/packages/toolchain/devel/libffi-host/meta similarity index 100% rename from packages/devel/libffi-host/meta rename to packages/toolchain/devel/libffi-host/meta diff --git a/packages/devel/llvm-host/build b/packages/toolchain/lang/llvm-host/build similarity index 96% rename from packages/devel/llvm-host/build rename to packages/toolchain/lang/llvm-host/build index 0d25e7cbbb..cc2c33f4ac 100755 --- a/packages/devel/llvm-host/build +++ b/packages/toolchain/lang/llvm-host/build @@ -42,7 +42,6 @@ cd autoconf cd .. mkdir -p .build-host && cd .build-host - ../configure --host=$HOST_NAME \ --build=$HOST_NAME \ --prefix=$ROOT/$TOOLCHAIN \ @@ -63,6 +62,8 @@ mkdir -p .build-host && cd .build-host --enable-embed-stdcxx \ --enable-timestamps \ --enable-targets=$ARCH \ + --disable-libffi \ + --enable-ltdl-install \ make -make install \ No newline at end of file +make install diff --git a/packages/devel/llvm-host/meta b/packages/toolchain/lang/llvm-host/meta similarity index 97% rename from packages/devel/llvm-host/meta rename to packages/toolchain/lang/llvm-host/meta index 236dc4b165..ca2c149552 100644 --- a/packages/devel/llvm-host/meta +++ b/packages/toolchain/lang/llvm-host/meta @@ -26,7 +26,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://llvm.org/" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache" +PKG_BUILD_DEPENDS="ccache gcc-final libffi-host" PKG_PRIORITY="optional" PKG_SECTION="toolchain/lang" PKG_SHORTDESC="llvm: Low Level Virtual Machine" diff --git a/packages/x11/driver/xf86-video-nvidia/meta b/packages/x11/driver/xf86-video-nvidia/meta index 3241929148..12e6e8414a 100644 --- a/packages/x11/driver/xf86-video-nvidia/meta +++ b/packages/x11/driver/xf86-video-nvidia/meta @@ -24,10 +24,10 @@ PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="nonfree" PKG_SITE="http://www.nvidia.com/" -[ "$TARGET_ARCH" = "i386" ] && PKG_URL="ftp://download.nvidia.com/XFree86/Linux-x86/$PKG_VERSION/NVIDIA-Linux-x86-$PKG_VERSION.run" -[ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="ftp://download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run" -# [ "$TARGET_ARCH" = "i386" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86/$PKG_VERSION/NVIDIA-Linux-x86-$PKG_VERSION.run" -# [ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run" +#[ "$TARGET_ARCH" = "i386" ] && PKG_URL="ftp://download.nvidia.com/XFree86/Linux-x86/$PKG_VERSION/NVIDIA-Linux-x86-$PKG_VERSION.run" +#[ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="ftp://download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run" +[ "$TARGET_ARCH" = "i386" ] && PKG_URL="http://download.nvidia.com/XFree86/Linux-x86/$PKG_VERSION/NVIDIA-Linux-x86-$PKG_VERSION.run" +[ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run" PKG_DEPENDS="linux libXinerama" PKG_BUILD_DEPENDS="toolchain util-macros linux xorg-server" PKG_PRIORITY="optional" diff --git a/packages/x11/lib/libfontenc/build b/packages/x11/lib/libfontenc/build index b92cccf4bf..1568e46a4f 100755 --- a/packages/x11/lib/libfontenc/build +++ b/packages/x11/lib/libfontenc/build @@ -22,6 +22,11 @@ . config/options $1 +if [ "$TARGET_ARCH" = x86_64 -o "$TARGET_ARCH" = arm ]; then + CFLAGS="$CFLAGS -fPIC" + LDFLAGS="$LDFLAGS -fPIC" +fi + cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/scripts/unpack b/scripts/unpack index e4a18879f1..ab00848f2e 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -66,6 +66,8 @@ if [ -n "$PKG_URL" ]; then $SCRIPTS/extract $1 "$1*.7z" $BUILD fi +[ -f "$PKG_DIR/rename" ] && $PKG_DIR/rename $@ >&$VERBOSE_OUT + if [ -d "$PKG_DIR/sources" ]; then [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION} cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION} diff --git a/tools/mkpkg/mkpkg_libcec-master b/tools/mkpkg/mkpkg_libcec-master new file mode 100755 index 0000000000..b728485c8a --- /dev/null +++ b/tools/mkpkg/mkpkg_libcec-master @@ -0,0 +1,43 @@ +#!/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 +################################################################################ + +echo "getting sources..." + if [ ! -d libcec-master.git ]; then + git clone git://github.com/Pulse-Eight/libcec.git -b master libcec-master.git + fi + + cd libcec-master.git + git pull + GIT_REV=`git log -n1 --format=%h` + cd .. + +echo "copying sources..." + rm -rf libcec-$GIT_REV + cp -R libcec-master.git libcec-$GIT_REV + +echo "cleaning sources..." + rm -rf libcec-$GIT_REV/.git + +echo "packing sources..." + tar cvJf libcec-$GIT_REV.tar.xz libcec-$GIT_REV + +echo "remove temporary sourcedir..." + rm -rf libcec-$GIT_REV