VERSION: set version to 0.99.5 (RC-5)

Signed-off-by: Stephan Raue <stephan@openelec.tv>

README

@@ -1,8 +1,8 @@
 http://www.OpenELEC.tv
 
-The Open Embedded Linux Enterainment Center – OpenELEC.tv
+OpenELEC - Open Embedded Linux Enterainment Center
 
-OpenELEC.tv runs XBMC, a complete media center solution (xbmc.org).
+OpenELEC runs XBMC, a complete media center solution (xbmc.org).
 The base system has been designed and built from the ground up to be as
 efficient as possible – consuming only a tiny footprint, cutting edge
 hardware support and a set-top box experience.
@@ -52,4 +52,4 @@ freenode.
 
 Happy XBMC'ing
 
-OpenELEC.tv Development Team
+OpenELEC Development Team

VERSION

@@ -1 +1 @@
-0.99.2
+0.99.5

config/arch.arm

@@ -0,0 +1,42 @@
+# determines TARGET_CPU, if not forced by user
+  if [ -z "$TARGET_CPU" ]; then
+    TARGET_CPU=cortex-a8
+  fi
+
+# TARGET_CPU:
+# arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
+# arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
+# arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t
+# arm720t arm740t strongarm strongarm110 strongarm1100
+# strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t
+# arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi
+# arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e
+# arm1136j-s arm1136jf-s mpcore mpcorenovfp arm1156t2-s
+# arm1176jz-s arm1176jzf-s cortex-a8 cortex-a9 cortex-r4
+# cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312.
+
+# TARGET_FPU:
+# This specifies what floating point hardware (or hardware emulation) is
+# available on the target. Permissible names are:
+# fpa fpe2 fpe3 maverick vfp vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16
+# vfpv3xd vfpv3xd-fp16 neon neon-fp16 vfpv4 vfpv4-d16 fpv4-sp-d16
+# neon-vfpv4.
+
+# determine architecture's family
+  case $TARGET_CPU in
+    cortex-a8)
+      TARGET_SUBARCH=armv7-a
+      TARGET_ABI=eabi
+      TARGET_FPU="neon"
+      ;;
+    cortex-a9)
+      TARGET_SUBARCH=armv7-a
+      TARGET_ABI=eabi
+      TARGET_FPU="neon"
+      ;;
+  esac
+
+# setup ARCH specific *FLAGS
+  TARGET_CFLAGS="-fPIC -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"

config/arch.i386

@@ -0,0 +1,11 @@
+# determines TARGET_CPU, if not forced by user
+  if [ -z "$TARGET_CPU" ]; then
+    TARGET_CPU=i686
+  fi
+
+# determine architecture's family
+  TARGET_SUBARCH=i686
+
+# setup ARCH specific *FLAGS
+  TARGET_CFLAGS="-march=$TARGET_CPU -m32"
+  TARGET_LDFLAGS="-march=$TARGET_CPU -m32"

config/arch.x86_64

@@ -0,0 +1,11 @@
+# determines TARGET_CPU, if not forced by user
+  if [ -z "$TARGET_CPU" ]; then
+    TARGET_CPU=core2
+  fi
+
+# determine architecture's family
+  TARGET_SUBARCH=x86_64
+
+# setup ARCH specific *FLAGS
+  TARGET_CFLAGS="-fPIC -march=$TARGET_CPU -m64"
+  TARGET_LDFLAGS="-fPIC -march=$TARGET_CPU -m64"

config/functions

@@ -154,8 +154,3 @@ strip_linker_plugin() {
   # strip out usage from linker plugin
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||"`
 }
-
-strip_kmod() {
-  [ -z $1 ] && echo "usage strip_kmod <dir>" && exit 1
-  find $1 -type f -name '*.ko' | xargs -r $STRIP --strip-debug
-}

config/optimize

@@ -26,3 +26,31 @@ LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
 LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
 LD_OPTIM="$LD_OPTIM -Wl,--as-needed"
 
+if [ "$DEBUG" = yes ]; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -ggdb"
+  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -ggdb"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -ggdb"
+else
+  TARGET_CFLAGS="$TARGET_CFLAGS -fomit-frame-pointer"
+  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fomit-frame-pointer"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -s"
+fi
+
+TARGET_CPPFLAGS=
+TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
+TARGET_CXXFLAGS="$TARGET_CFLAGS"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $GCC_OPTIM $LD_OPTIM"
+
+HOST_CPPFLAGS=""
+HOST_CFLAGS="-O2 -Wall -pipe -I$ROOT/$TOOLCHAIN/include"
+HOST_CXXFLAGS="$HOST_CFLAGS"
+HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
+
+# 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

config/options

@@ -6,7 +6,7 @@ else
   PROJECT="$PROJECT"
 fi
 
-# determines TARGET_ARCH, if not forced by user (i386 / x86_64 / powerpc)
+# determines TARGET_ARCH, if not forced by user (i386 / x86_64 / arm)
 # default is i386
 if [ -z "$ARCH" ]; then
   TARGET_ARCH="i386"
@@ -63,7 +63,6 @@ fi
 # set jpeg library depending on ARCH
   if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then
     LIBJPEG="libjpeg-turbo"
-#    LIBJPEG="jpeg"
   else
     LIBJPEG="jpeg"
   fi
@@ -89,6 +88,7 @@ get_graphicdrivers() {
     [ "$drv" = "r600" ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
     [ "$drv" = "radeon" ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
     [ "$drv" = "nouveau" ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
+    [ "$drv" = "omapfb" ] && MESA_DRIVERS="$MESA_DRIVERS,swrast"
 
     if [ "$drv" = "i915" -o "$drv" = "i965" ]; then
       XORG_DRIVERS="$XORG_DRIVERS intel"
@@ -107,6 +107,10 @@ get_graphicdrivers() {
       XINERAMA_SUPPORT="yes"
     fi
 
+    if [ "$drv" = "omapfb" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS ompafb"
+    fi
+
     if [ "$drv" = "vmware" ]; then
       XINERAMA_SUPPORT="yes"
     fi

config/path

@@ -1,30 +1,6 @@
 set -e
 
-# determine architecture's family
-case $TARGET_ARCH in
-  i386)
-    TARGET_FAMILY=i686
-    ;;
-
-  x86_64)
-    TARGET_FAMILY=x86_64
-    ;;
-esac
-
-# determines TARGET_CPU, if not forced by user
-if [ -z "$TARGET_CPU" ]; then
-  case $TARGET_ARCH in
-    i386)
-      TARGET_CPU=i686
-      ;;
-
-    x86_64)
-      TARGET_CPU=i686
-      ;;
-  esac
-fi
-
-# setup initial directorys
+# setup initial directorys (relative to root)
   CONFIG=config
   SCRIPTS=scripts
   PACKAGES=packages
@@ -33,8 +9,11 @@ fi
   TARGET=target
   ADDONS=addons
 
+# include ARCH specific options
+  . config/arch.$TARGET_ARCH
+
 HOST_NAME=`$SCRIPTS/configtools/config.guess`
-TARGET_NAME=$TARGET_FAMILY-openelec-linux-gnu
+TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI}
 
 BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION
 TARGET_IMG=$ROOT/$TARGET
@@ -95,8 +74,6 @@ XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 TOOLCHAIN_LANGUAGES=c
 [ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++
 
-. config/optimize
-
 TARGET_CC=${TARGET_PREFIX}gcc
 TARGET_CXX=${TARGET_PREFIX}g++
 TARGET_LD=${TARGET_PREFIX}ld
@@ -107,38 +84,12 @@ TARGET_RANLIB=${TARGET_PREFIX}ranlib
 TARGET_OBJCOPY=${TARGET_PREFIX}objcopy
 TARGET_STRIP=${TARGET_PREFIX}strip
 
-TARGET_CPPFLAGS=
-TARGET_CFLAGS="-Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
-TARGET_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$GCC_OPTIM $LD_OPTIM"
-
-case $TARGET_ARCH in
-    i386)
-     TARGET_CFLAGS="$TARGET_CFLAGS -march=$TARGET_CPU -m32"
-     TARGET_CXXFLAGS="$TARGET_CXXFLAGS -march=$TARGET_CPU -m32"
-     TARGET_LDFLAGS="$TARGET_LDFLAGS -march=$TARGET_CPU -m32"
-     ;;
-    x86_64)
-     TARGET_CFLAGS="$TARGET_CFLAGS -fPIC -march=$TARGET_CPU -m64"
-     TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fPIC -march=$TARGET_CPU -m64"
-     TARGET_LDFLAGS="$TARGET_LDFLAGS -fPIC -march=$TARGET_CPU -m64"
-     ;;
-esac
+. config/optimize
 
 TARGET_PKG_CONFIG_PATH=""
 TARGET_PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
 TARGET_PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
 
-if [ "$DEBUG" = yes ]; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -ggdb"
-  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -ggdb"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -ggdb"
-else
-  TARGET_CFLAGS="$TARGET_CFLAGS -fomit-frame-pointer"
-  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fomit-frame-pointer"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -s"
-fi
-
 HOST_AWK=gawk
 HOST_CC=$ROOT/$TOOLCHAIN/bin/host-gcc
 HOST_CXX=$ROOT/$TOOLCHAIN/bin/host-g++
@@ -150,20 +101,6 @@ HOST_RANLIB=ranlib
 HOST_OBJCOPY=objcopy
 HOST_STRIP=strip
 
-HOST_CPPFLAGS=""
-HOST_CFLAGS="-O2 -Wall -pipe -I$ROOT/$TOOLCHAIN/include"
-HOST_CXXFLAGS="$HOST_CFLAGS"
-HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
-
-# 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
-
 HOST_PKG_CONFIG_PATH=""
 HOST_PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig"
 HOST_PKG_CONFIG_SYSROOT_DIR=""

packages/audio/flac/build

@@ -23,14 +23,12 @@
 . config/options $1
 
 cd $PKG_BUILD
-do_autoreconf -I m4
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
             --disable-static \
             --enable-shared \
             --disable-rpath \
-            --with-gnu-ld \
             --disable-altivec \
             --disable-doxygen-docs \
             --disable-thorough-tests \

packages/audio/flac/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://flac.sourceforge.net/"
-PKG_URL="$SOURCEFORGE_SRC/flac/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://downloads.xiph.org/releases/flac/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="libiconv libogg"
 PKG_BUILD_DEPENDS="toolchain libiconv libogg"
 PKG_PRIORITY="optional"
@@ -33,4 +33,4 @@ PKG_SHORTDESC="flac: An Free Lossless Audio Codec"
 PKG_LONGDESC="Grossly oversimplified, FLAC is similar to MP3, but lossless, meaning that audio is compressed in FLAC without throwing away any information. This is similar to how Zip works, except with FLAC you will get much better compression because it is designed specifically for audio."
 PKG_IS_ADDON="no"
 
-PKG_AUTORECONF="no"
+PKG_AUTORECONF="yes"

packages/audio/flac/patches/flac-1.2.1-configure.patch

@@ -0,0 +1,24 @@
+diff -Naur flac-1.2.1-old/configure.in flac-1.2.1-new/configure.in
+--- flac-1.2.1-old/configure.in	2007-09-13 08:48:42.000000000 -0700
++++ flac-1.2.1-new/configure.in	2010-08-17 20:51:01.000000000 -0700
+@@ -21,6 +21,8 @@
+ AC_INIT(src/flac/main.c)
+ AM_INIT_AUTOMAKE(flac, 1.2.1)
+ 
++AC_CONFIG_MACRO_DIR([m4])
++
+ # Don't automagically regenerate autoconf/automake generated files unless
+ # explicitly requested.  Eases autobuilding -mdz
+ AM_MAINTAINER_MODE
+diff -Naur flac-1.2.1-old/Makefile.am flac-1.2.1-new/Makefile.am
+--- flac-1.2.1-old/Makefile.am	2007-09-16 12:29:29.000000000 -0700
++++ flac-1.2.1-new/Makefile.am	2010-08-17 20:51:27.000000000 -0700
+@@ -30,6 +30,8 @@
+ 
+ AUTOMAKE_OPTIONS = foreign 1.7
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ SUBDIRS = doc include m4 man src examples test build obj
+ 
+ DISTCLEANFILES = libtool-disable-static

packages/audio/lame/build

@@ -0,0 +1,56 @@
+#!/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
+
+# dont build parallel
+  MAKEFLAGS=-j1
+
+cd $PKG_BUILD
+GTK_CONFIG='no' \
+ac_cv_c_stack_direction=-1 \
+alex_cv_ieee854_float80=no \
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --disable-static \
+            --enable-shared \
+            --enable-nasm \
+            --disable-cpml \
+            --disable-gtktest \
+            --disable-efence \
+            --disable-analyzer-hooks \
+            --enable-decoder \
+            --enable-decode-layer1 \
+            --enable-decode-layer2 \
+            --disable-frontend \
+            --disable-mp3x \
+            --disable-mp3rtp \
+            --disable-brhist \
+            --disable-all-float \
+            --enable-expopt=no \
+            --enable-debug=no \
+            --with-gnu-ld \
+            --with-fileio=lame
+
+make
+$MAKEINSTALL

packages/audio/lame/install

@@ -23,4 +23,4 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libtalloc.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/libmp3lame/.libs/libmp3lame.so* $INSTALL/usr/lib

packages/audio/lame/meta

@@ -18,19 +18,19 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="ipw2100-fw"
-PKG_VERSION="1.3"
+PKG_NAME="lame"
+PKG_VERSION="3.98.4"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="Free-to-use"
-PKG_SITE="http://ipw2100.sourceforge.net/"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_LICENSE="LGPL"
+PKG_SITE="http://lame.sourceforge.net/"
+PKG_URL="$SOURCEFORGE_SRC/lame/lame/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="ipw2100-fw: Intel PRO/Wireless 2100 Driver for Linux"
-PKG_LONGDESC="This project was created by Intel to enable support for the Intel PRO/Wireless 2100 Network Connection mini PCI adapter. This project (IPW2100) is intended to be a community effort as much as is possible given some working constraints (mainly, no HW documentation is available)."
+PKG_SECTION="audio"
+PKG_SHORTDESC="lame: LAME Ain't an Mp3 Encoder"
+PKG_LONGDESC="LAME originally stood for LAME Ain't an Mp3 Encoder. The goal of the LAME project is to use the open source model to improve the psycho acoustics, noise shaping and speed of MP3. Another goal of the LAME project is to use these improvements for the basis of a patent free audio compression codec for the GNU project."
 PKG_IS_ADDON="no"
 
-PKG_AUTORECONF="no"
+PKG_AUTORECONF="yes"

packages/audio/lame/patches/lame-3.98.4-am_path_gtk.patch

@@ -0,0 +1,242 @@
+diff -Naur lame-3.98.4/configure.in lame-3.98.4.patch/configure.in
+--- lame-3.98.4/configure.in	2010-03-22 21:40:17.000000000 +0100
++++ lame-3.98.4.patch/configure.in	2011-03-25 12:11:44.982662225 +0100
+@@ -21,6 +21,8 @@
+ AC_INIT([lame],[3.98.4],[lame-dev@lists.sf.net])
+ AC_CONFIG_SRCDIR([libmp3lame/lame.c])
+ 
++AC_CONFIG_MACRO_DIR([m4])
++
+ dnl check system
+ AC_CANONICAL_HOST
+ 
+@@ -385,7 +387,7 @@
+ 
+ dnl configure use of features
+ 
+-AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
++AM_PATH_GTK_2_0(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
+ 
+ dnl ElectricFence malloc debugging
+ AC_MSG_CHECKING(use of ElectricFence malloc debugging)
+diff -Naur lame-3.98.4/m4/gtk-2.0.m4 lame-3.98.4.patch/m4/gtk-2.0.m4
+--- lame-3.98.4/m4/gtk-2.0.m4	1970-01-01 01:00:00.000000000 +0100
++++ lame-3.98.4.patch/m4/gtk-2.0.m4	2010-12-22 03:34:53.000000000 +0100
+@@ -0,0 +1,196 @@
++# Configure paths for GTK+
++# Owen Taylor     1997-2001
++
++dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
++dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
++dnl pass to pkg-config
++dnl
++AC_DEFUN([AM_PATH_GTK_2_0],
++[dnl 
++dnl Get the cflags and libraries from pkg-config
++dnl
++AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
++		    , enable_gtktest=yes)
++
++  pkg_config_args=gtk+-2.0
++  for module in . $4
++  do
++      case "$module" in
++         gthread) 
++             pkg_config_args="$pkg_config_args gthread-2.0"
++         ;;
++      esac
++  done
++
++  no_gtk=""
++
++  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++
++  if test x$PKG_CONFIG != xno ; then
++    if pkg-config --atleast-pkgconfig-version 0.7 ; then
++      :
++    else
++      echo "*** pkg-config too old; version 0.7 or better required."
++      no_gtk=yes
++      PKG_CONFIG=no
++    fi
++  else
++    no_gtk=yes
++  fi
++
++  min_gtk_version=ifelse([$1], ,2.0.0,$1)
++  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
++
++  if test x$PKG_CONFIG != xno ; then
++    ## don't try to run the test against uninstalled libtool libs
++    if $PKG_CONFIG --uninstalled $pkg_config_args; then
++	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
++	  enable_gtktest=no
++    fi
++
++    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
++	  :
++    else
++	  no_gtk=yes
++    fi
++  fi
++
++  if test x"$no_gtk" = x ; then
++    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
++    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
++    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++    if test "x$enable_gtktest" = "xyes" ; then
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $GTK_CFLAGS"
++      LIBS="$GTK_LIBS $LIBS"
++dnl
++dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
++dnl checks the results of pkg-config to some extent)
++dnl
++      rm -f conf.gtktest
++      AC_TRY_RUN([
++#include <gtk/gtk.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++int 
++main ()
++{
++  int major, minor, micro;
++  char *tmp_version;
++
++  fclose (fopen ("conf.gtktest", "w"));
++
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = g_strdup("$min_gtk_version");
++  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++     printf("%s, bad version string\n", "$min_gtk_version");
++     exit(1);
++   }
++
++  if ((gtk_major_version != $gtk_config_major_version) ||
++      (gtk_minor_version != $gtk_config_minor_version) ||
++      (gtk_micro_version != $gtk_config_micro_version))
++    {
++      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
++             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
++             gtk_major_version, gtk_minor_version, gtk_micro_version);
++      printf ("*** was found! If pkg-config was correct, then it is best\n");
++      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
++      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
++      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
++      printf("*** required on your system.\n");
++      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
++      printf("*** to point to the correct configuration files\n");
++    } 
++  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
++	   (gtk_minor_version != GTK_MINOR_VERSION) ||
++           (gtk_micro_version != GTK_MICRO_VERSION))
++    {
++      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
++	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
++      printf("*** library (version %d.%d.%d)\n",
++	     gtk_major_version, gtk_minor_version, gtk_micro_version);
++    }
++  else
++    {
++      if ((gtk_major_version > major) ||
++        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
++        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
++      {
++        return 0;
++       }
++     else
++      {
++        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
++               gtk_major_version, gtk_minor_version, gtk_micro_version);
++        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
++	       major, minor, micro);
++        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
++        printf("***\n");
++        printf("*** If you have already installed a sufficiently new version, this error\n");
++        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
++        printf("*** being found. The easiest way to fix this is to remove the old version\n");
++        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
++        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
++        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++        printf("*** so that the correct libraries are found at run-time))\n");
++      }
++    }
++  return 1;
++}
++],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++       CFLAGS="$ac_save_CFLAGS"
++       LIBS="$ac_save_LIBS"
++     fi
++  fi
++  if test "x$no_gtk" = x ; then
++     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
++     ifelse([$2], , :, [$2])     
++  else
++     AC_MSG_RESULT(no)
++     if test "$PKG_CONFIG" = "no" ; then
++       echo "*** A new enough version of pkg-config was not found."
++       echo "*** See http://pkgconfig.sourceforge.net"
++     else
++       if test -f conf.gtktest ; then
++        :
++       else
++          echo "*** Could not run GTK+ test program, checking why..."
++	  ac_save_CFLAGS="$CFLAGS"
++	  ac_save_LIBS="$LIBS"
++          CFLAGS="$CFLAGS $GTK_CFLAGS"
++          LIBS="$LIBS $GTK_LIBS"
++          AC_TRY_LINK([
++#include <gtk/gtk.h>
++#include <stdio.h>
++],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
++        [ echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
++          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++	  echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
++        [ echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
++          CFLAGS="$ac_save_CFLAGS"
++          LIBS="$ac_save_LIBS"
++       fi
++     fi
++     GTK_CFLAGS=""
++     GTK_LIBS=""
++     ifelse([$3], , :, [$3])
++  fi
++  AC_SUBST(GTK_CFLAGS)
++  AC_SUBST(GTK_LIBS)
++  rm -f conf.gtktest
++])
+diff -Naur lame-3.98.4/Makefile.am lame-3.98.4.patch/Makefile.am
+--- lame-3.98.4/Makefile.am	2010-02-26 23:33:06.000000000 +0100
++++ lame-3.98.4.patch/Makefile.am	2011-03-25 12:15:37.951078720 +0100
+@@ -2,6 +2,8 @@
+ 
+ include $(top_srcdir)/Makefile.am.global
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ .PHONY: test
+ 
+ SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM \
+diff -Naur lame-3.98.4/Makefile.am.global lame-3.98.4.patch/Makefile.am.global
+--- lame-3.98.4/Makefile.am.global	2006-06-03 15:07:36.000000000 +0200
++++ lame-3.98.4.patch/Makefile.am.global	2011-03-25 12:15:25.020333213 +0100
+@@ -3,5 +3,4 @@
+ # global section for every Makefile.am
+ 
+ AUTOMAKE_OPTIONS = 1.9 foreign $(top_srcdir)/ansi2knr
+-
+ # end global section

packages/audio/libvorbis/build

@@ -32,5 +32,4 @@ cd $PKG_BUILD
             --with-ogg=$SYSROOT_PREFIX/usr
 
 make
-
 $MAKEINSTALL

packages/databases/mysql/build

@@ -22,6 +22,9 @@
 
 . config/options $1
 
+# mysql fails to build with LTO support
+  strip_lto
+
 cd $PKG_BUILD
 ac_cv_c_stack_direction=-1 \
 ac_cv_sys_restartable_syscalls=yes \
@@ -43,8 +46,6 @@ ac_cv_sys_restartable_syscalls=yes \
             --with-big-tables \
             --with-mysqld-user=mysqld \
             --with-extra-charsets=all \
-            --with-charset=utf8 \
-            --with-collation=utf8_unicode_ci \
             --with-pthread \
             --with-named-thread-libs=-lpthread \
             --enable-thread-safe-client \

packages/databases/mysql/install

@@ -23,4 +23,7 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/libmysql/.libs/libmysqlclient.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/libmysql/.libs/libmysqlclient.so* $INSTALL/usr/lib
+
+mkdir -p $INSTALL/usr/share/mysql/charsets
+  cp -R $PKG_BUILD/sql/share/charsets/*.xml $INSTALL/usr/share/mysql/charsets

packages/databases/sqlite/build

@@ -37,7 +37,6 @@ cd $PKG_BUILD
             --enable-dynamic-extensions \
             --with-gnu-ld
 
-
 make
 
 $STRIP .libs/sqlite3

packages/debug/gdb/build

@@ -22,6 +22,8 @@
 
 . config/options $1
 
+strip_lto
+
 export bash_cv_have_mbstate_t=set
 
 export CC_FOR_BUILD="$HOST_CC"
@@ -38,5 +40,6 @@ mkdir -p objdir && cd objdir
              --without-x \
              --disable-tui \
              --disable-libada \
+             --disable-werror \
 
 make

packages/debug/w_scan/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="w_scan"
-PKG_VERSION="20110206"
+PKG_VERSION="20110306"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/debug/w_scan/patches/w_scan-20110206-001-remove_videodev_include-0.1.patch

@@ -1,11 +0,0 @@
-diff -Naur w_scan-20110206/countries.c w_scan-20110206.patch/countries.c
---- w_scan-20110206/countries.c	2011-02-05 20:03:50.000000000 +0100
-+++ w_scan-20110206.patch/countries.c	2011-02-21 23:21:51.194553010 +0100
-@@ -31,7 +31,6 @@
- #include <string.h>
- #include <unistd.h>
- #include <stdlib.h>
--#include <linux/videodev.h>
- #include <linux/dvb/frontend.h>
- 
- #ifdef VDRVERSNUM

packages/devel/boost/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="boost"
-PKG_VERSION="1_45_0"
+PKG_VERSION="1_46_0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/devel/glib/build

@@ -52,7 +52,7 @@ glib_cv_stack_grows='no' \
              --disable-dtrace \
              --disable-systemtap \
              --disable-gcov \
-             --with-libiconv=gnu \
+             --with-libiconv \
              --enable-Bsymbolic \
              --disable-rebuilds \
              --disable-gtk-doc \

packages/devel/glib/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="glib"
-PKG_VERSION="2.28.1"
+PKG_VERSION="2.28.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/devel/glib/patches/glib-2.28.1-linux_magic_h.patch

@@ -1,24 +0,0 @@
-diff -Naur glib-2.28.1-old/configure.ac glib-2.28.1-new/configure.ac
---- glib-2.28.1-old/configure.ac	2011-02-17 20:33:11.000000000 -0800
-+++ glib-2.28.1-new/configure.ac	2011-02-18 09:19:32.000000000 -0800
-@@ -858,6 +858,7 @@
- AC_CHECK_HEADERS([sys/vfs.h sys/mount.h sys/vmount.h sys/statfs.h sys/statvfs.h])
- AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h sys/sysctl.h fstab.h])
- AC_CHECK_HEADERS([sys/uio.h sys/mkdev.h])
-+AC_CHECK_HEADERS([linux/magic.h])
- 
- # check for structure fields
- AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec])
-diff -Naur glib-2.28.1-old/glib/gfileutils.c glib-2.28.1-new/glib/gfileutils.c
---- glib-2.28.1-old/glib/gfileutils.c	2011-02-11 07:23:12.000000000 -0800
-+++ glib-2.28.1-new/glib/gfileutils.c	2011-02-18 09:19:32.000000000 -0800
-@@ -54,7 +54,9 @@
- #include "glibintl.h"
- 
- #ifdef __linux__ /* for btrfs check */
-+#ifdef HAVE_LINUX_MAGIC_H
- #include <linux/magic.h>
-+#endif
- #include <sys/vfs.h>
- #endif
- 

packages/devel/ncurses/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="ncurses"
-PKG_VERSION="5.7"
+PKG_VERSION="5.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"

packages/graphics/Mesa/meta

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="Mesa"
-PKG_VERSION="7.10"
+PKG_VERSION="7.10.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libXdamage libdrm talloc expat libXext libXfixes libXxf86vm libxcb libX11"
-PKG_BUILD_DEPENDS="toolchain Python makedepend libxml2-host talloc expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
+PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libXxf86vm libxcb libX11"
+PKG_BUILD_DEPENDS="toolchain Python makedepend libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"
 PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API"
@@ -36,6 +36,6 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 if [ "$MESA_MASTER" = "yes" ]; then
-  PKG_VERSION="20110110"
+  PKG_VERSION="ee8d182"
   PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 fi

packages/graphics/Mesa/patches/Mesa-7.10.1-__atom.patch

@@ -0,0 +1,15 @@
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/r200/r200_cmdbuf.c Mesa-7.10.1-new/src/mesa/drivers/dri/r200/r200_cmdbuf.c
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/r200/r200_cmdbuf.c	2011-03-02 17:30:39.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/r200/r200_cmdbuf.c	2011-03-02 17:31:59.000000000 -0800
+@@ -47,9 +47,8 @@
+  */
+ #define insert_at_tail_if(atom_list, atom) \
+    do { \
+-      struct radeon_state_atom* __atom = (atom); \
+-      if (__atom->check) \
+-	 insert_at_tail((atom_list), __atom); \
++      if ((atom)->check) \
++	 insert_at_tail((atom_list), (atom)); \
+    } while(0)
+ 
+ void r200SetUpAtomList( r200ContextPtr rmesa )

packages/graphics/Mesa/patches/Mesa-7.10.1-libdrm_nouveau.patch

@@ -0,0 +1,208 @@
+diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nv50/nv50_context.h Mesa-7.10.1-new/src/gallium/drivers/nv50/nv50_context.h
+--- Mesa-7.10.1-old/src/gallium/drivers/nv50/nv50_context.h	2010-12-15 15:02:44.000000000 -0800
++++ Mesa-7.10.1-new/src/gallium/drivers/nv50/nv50_context.h	2011-03-02 17:31:09.000000000 -0800
+@@ -15,6 +15,8 @@
+ 
+ #include "nouveau/nouveau_winsys.h"
+ #include "nouveau/nouveau_gldefs.h"
++/* Hack to silence warnings caused by nouveau/nouveau_stateobj.h using BEGIN_BIND marcro */
++#include <nouveau/nv04_pushbuf.h>
+ #include "nouveau/nouveau_stateobj.h"
+ #include "nv50_reg.h"
+ 
+diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nvfx/nv04_2d.c Mesa-7.10.1-new/src/gallium/drivers/nvfx/nv04_2d.c
+--- Mesa-7.10.1-old/src/gallium/drivers/nvfx/nv04_2d.c	2011-01-25 15:52:45.000000000 -0800
++++ Mesa-7.10.1-new/src/gallium/drivers/nvfx/nv04_2d.c	2011-03-02 17:31:09.000000000 -0800
+@@ -39,6 +39,7 @@
+ #include <nouveau/nouveau_bo.h>
+ #include <nouveau/nouveau_notifier.h>
+ #include <nouveau/nouveau_grobj.h>
++#include <nouveau/nv04_pushbuf.h>
+ #include "nv04_2d.h"
+ 
+ #include "nouveau/nv_object.xml.h"
+diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_buffer.c Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_buffer.c
+--- Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_buffer.c	2010-12-15 15:02:44.000000000 -0800
++++ Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_buffer.c	2011-03-02 17:31:09.000000000 -0800
+@@ -1,4 +1,3 @@
+-
+ #include "util/u_inlines.h"
+ #include "util/u_memory.h"
+ #include "util/u_math.h"
+diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_screen.c Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_screen.c
+--- Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_screen.c	2011-01-25 15:52:45.000000000 -0800
++++ Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_screen.c	2011-03-02 17:31:09.000000000 -0800
+@@ -10,6 +10,8 @@
+ #include "nvfx_resource.h"
+ #include "nvfx_tex.h"
+ 
++#include "nouveau/nv04_pushbuf.h"
++
+ #define NV30_3D_CHIPSET_3X_MASK 0x00000003
+ #define NV34_3D_CHIPSET_3X_MASK 0x00000010
+ #define NV35_3D_CHIPSET_3X_MASK 0x000001e0
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv04_driver.h Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv04_driver.h
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv04_driver.h	2010-12-14 13:43:15.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv04_driver.h	2011-03-02 17:31:09.000000000 -0800
+@@ -28,6 +28,7 @@
+ #define __NV04_DRIVER_H__
+ 
+ #include "nv04_context.h"
++#include "nv04_pushbuf.h"
+ 
+ enum {
+ 	NOUVEAU_STATE_BLEND = NUM_NOUVEAU_STATE,
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_render.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_render.c
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_render.c	2010-12-14 13:43:15.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_render.c	2011-03-02 17:31:09.000000000 -0800
+@@ -27,6 +27,7 @@
+ #include "nouveau_driver.h"
+ #include "nouveau_context.h"
+ #include "nv10_3d.xml.h"
++#include "nv04_driver.h"
+ #include "nv10_driver.h"
+ 
+ #define NUM_VERTEX_ATTRS 8
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_fb.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_fb.c	2010-12-14 13:43:15.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_fb.c	2011-03-02 17:31:09.000000000 -0800
+@@ -30,6 +30,7 @@
+ #include "nouveau_util.h"
+ #include "nv_object.xml.h"
+ #include "nv10_3d.xml.h"
++#include "nv04_driver.h"
+ #include "nv10_driver.h"
+ 
+ static inline unsigned
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_frag.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_frag.c
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_frag.c	2010-12-14 13:43:15.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_frag.c	2011-03-02 17:31:09.000000000 -0800
+@@ -30,6 +30,7 @@
+ #include "nv10_3d.xml.h"
+ #include "nouveau_util.h"
+ #include "nv10_driver.h"
++#include "nv04_driver.h"
+ #include "nv20_driver.h"
+ 
+ #define RC_IN_SHIFT_A	24
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c	2010-12-14 13:43:15.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c	2011-03-02 17:31:09.000000000 -0800
+@@ -29,6 +29,7 @@
+ #include "nouveau_gldefs.h"
+ #include "nouveau_util.h"
+ #include "nv10_3d.xml.h"
++#include "nv04_driver.h"
+ #include "nv10_driver.h"
+ 
+ void
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_raster.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_raster.c
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_raster.c	2011-01-25 15:52:45.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_raster.c	2011-03-02 17:31:09.000000000 -0800
+@@ -29,6 +29,7 @@
+ #include "nouveau_gldefs.h"
+ #include "nouveau_util.h"
+ #include "nv10_3d.xml.h"
++#include "nv04_driver.h"
+ #include "nv10_driver.h"
+ 
+ void
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tex.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tex.c	2010-12-14 13:43:15.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tex.c	2011-03-02 17:31:09.000000000 -0800
+@@ -30,6 +30,7 @@
+ #include "nouveau_texture.h"
+ #include "nv10_3d.xml.h"
+ #include "nouveau_util.h"
++#include "nv04_driver.h"
+ #include "nv10_driver.h"
+ 
+ void
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c	2010-12-14 13:43:15.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c	2011-03-02 17:31:09.000000000 -0800
+@@ -29,6 +29,7 @@
+ #include "nouveau_gldefs.h"
+ #include "nouveau_util.h"
+ #include "nv10_3d.xml.h"
++#include "nv04_driver.h"
+ #include "nv10_driver.h"
+ 
+ void
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_render.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_render.c
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_render.c	2010-12-14 13:43:15.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_render.c	2011-03-02 17:31:09.000000000 -0800
+@@ -27,6 +27,7 @@
+ #include "nouveau_driver.h"
+ #include "nouveau_context.h"
+ #include "nv20_3d.xml.h"
++#include "nv04_driver.h"
+ #include "nv20_driver.h"
+ 
+ #define NUM_VERTEX_ATTRS 16
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_fb.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_fb.c	2010-12-14 13:43:15.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_fb.c	2011-03-02 17:31:09.000000000 -0800
+@@ -30,6 +30,7 @@
+ #include "nouveau_gldefs.h"
+ #include "nouveau_util.h"
+ #include "nv20_3d.xml.h"
++#include "nv04_driver.h"
+ #include "nv20_driver.h"
+ 
+ static inline unsigned
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_frag.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_frag.c
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_frag.c	2010-12-14 13:43:15.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_frag.c	2011-03-02 17:31:09.000000000 -0800
+@@ -28,6 +28,7 @@
+ #include "nouveau_context.h"
+ #include "nv20_3d.xml.h"
+ #include "nv10_driver.h"
++#include "nv04_driver.h"
+ #include "nv20_driver.h"
+ 
+ void
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c	2010-12-14 13:43:15.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c	2011-03-02 17:31:09.000000000 -0800
+@@ -28,6 +28,7 @@
+ #include "nouveau_context.h"
+ #include "nouveau_gldefs.h"
+ #include "nv20_3d.xml.h"
++#include "nv04_driver.h"
+ #include "nv20_driver.h"
+ 
+ void
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_raster.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_raster.c
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_raster.c	2010-12-14 13:43:15.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_raster.c	2011-03-02 17:31:09.000000000 -0800
+@@ -29,6 +29,7 @@
+ #include "nouveau_gldefs.h"
+ #include "nouveau_util.h"
+ #include "nv20_3d.xml.h"
++#include "nv04_driver.h"
+ #include "nv20_driver.h"
+ 
+ void
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tex.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tex.c	2010-12-14 13:43:15.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tex.c	2011-03-02 17:31:09.000000000 -0800
+@@ -30,6 +30,7 @@
+ #include "nouveau_texture.h"
+ #include "nv20_3d.xml.h"
+ #include "nouveau_util.h"
++#include "nv04_driver.h"
+ #include "nv20_driver.h"
+ 
+ void
+diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c
+--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c	2010-12-14 13:43:15.000000000 -0800
++++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c	2011-03-02 17:31:09.000000000 -0800
+@@ -29,6 +29,7 @@
+ #include "nouveau_gldefs.h"
+ #include "nouveau_util.h"
+ #include "nv20_3d.xml.h"
++#include "nv04_driver.h"
+ #include "nv10_driver.h"
+ #include "nv20_driver.h"
+ 

packages/graphics/libdrm/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libdrm"
-PKG_VERSION="2.4.23"
+PKG_VERSION="2.4.24"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -36,6 +36,6 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 if [ "$LIBDRM_MASTER" = "yes" ]; then
-  PKG_VERSION="20101222"
+  PKG_VERSION="5cb554a"
   PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 fi

packages/graphics/libjpeg-turbo/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libjpeg-turbo"
-PKG_VERSION="1.0.1"
+PKG_VERSION="1.1.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/graphics/tiff/install

@@ -23,4 +23,6 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libtiff/.libs/*.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/libtiff/.libs/libtiff.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/libtiff/.libs/libtiffxx.so* $INSTALL/usr/lib
+    rm -rf $INSTALL/usr/lib/libtiffxx.so*T

packages/linux-drivers/bcm_sta/install

@@ -28,8 +28,6 @@ mkdir -p $INSTALL/lib/modules/$VER/bcm_sta
 [ "$TARGET_ARCH" = "i386" ] && cp $PKG_BUILD/x86-32/wl.ko $INSTALL/lib/modules/$VER/bcm_sta
 [ "$TARGET_ARCH" = "x86_64" ] && cp $PKG_BUILD/x86-64/wl.ko $INSTALL/lib/modules/$VER/bcm_sta
 
-strip_kmod $INSTALL/lib/modules/$VER/bcm_sta
-
 $ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
 for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
   rm -f $i

packages/linux-drivers/rtl8192se/install

@@ -30,8 +30,6 @@ mkdir -p $INSTALL/lib/modules/$VER/rtl8192se
 mkdir -p $INSTALL/lib/firmware/RTL8192SE
   cp $PKG_BUILD/firmware/RTL8192SE/* $INSTALL/lib/firmware/RTL8192SE
 
-strip_kmod $INSTALL/lib/modules/$VER/rtl8192se
-
 $ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
 for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
   rm -f $i

packages/linux-firmware/dvb-firmware/build

@@ -22,5 +22,6 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/lib/firmware
-  cp -PR $PKG_BUILD/*.fw* $INSTALL/lib/firmware
+cd $PKG_BUILD
+
+DESTDIR=.install ./install

packages/linux-firmware/dvb-firmware/install

@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/lib/firmware
-  cp -P $PKG_BUILD/* $INSTALL/lib/firmware
+mkdir -p $INSTALL
+  cp -PR $PKG_BUILD/.install/* $INSTALL

packages/linux-firmware/dvb-firmware/meta

@@ -18,19 +18,19 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="b43-fw"
-PKG_VERSION="20110211"
+PKG_NAME="dvb-firmware"
+PKG_VERSION="0.0.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"
-PKG_SITE="http://www.broadcom.com"
+PKG_SITE="https://github.com/OpenELEC/dvb-firmware"
 PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="b43-fw: Broadcom B43 Firmware"
-PKG_LONGDESC="b43-fw: Broadcom B43 Firmware"
+PKG_SECTION="firmware"
+PKG_SHORTDESC="dvb-firmware: firmwares for various DVB drivers"
+PKG_LONGDESC="dvb-firmware: firmwares for various DVB drivers"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"

packages/linux-firmware/install

@@ -1,38 +0,0 @@
-#!/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
-
-if [ "$FIRMWARE" = "external" ]; then
-  mkdir -p $INSTALL/lib/firmware
-    cp -R $PKG_BUILD/* $INSTALL/lib/firmware
-fi
-
-for firmware in $ADDITIONAL_FIRMWARE; do
-  [ $firmware = b43 ] && $SCRIPTS/install b43-fw
-  [ $firmware = ipw2100 ] && $SCRIPTS/install ipw2100-fw
-  [ $firmware = ipw2200 ] && $SCRIPTS/install ipw2200-fw
-  [ $firmware = zd1211 ] && $SCRIPTS/install zd1211-firmware
-  [ $firmware = dvb-firmware ] && $SCRIPTS/install linuxtv-dvb-firmware
-done
-
-exit 0

packages/linux-firmware/meta

@@ -19,18 +19,18 @@
 ################################################################################
 
 PKG_NAME="linux-firmware"
-PKG_VERSION="20110222"
+PKG_VERSION=""
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=tree"
-PKG_URL="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
+PKG_SITE=""
+PKG_URL=""
+PKG_DEPENDS="$FIRMWARE"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
+PKG_SECTION="firmware"
 PKG_SHORTDESC="linux-firmware: various free firmware drivers"
-PKG_LONGDESC="linux-firmware is a package to install various free firmware drivers"
+PKG_LONGDESC="linux-firmware is a meta-package to install various free firmware drivers"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"

packages/linux-firmware/wlan-firmware/build

@@ -0,0 +1,27 @@
+#!/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
+
+cd $PKG_BUILD
+
+DESTDIR=.install ./install

packages/linux-firmware/wlan-firmware/install

@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/lib/firmware
-  cp -PR $PKG_BUILD/* $INSTALL/lib/firmware
+mkdir -p $INSTALL
+  cp -PR $PKG_BUILD/.install/* $INSTALL

packages/linux-firmware/wlan-firmware/meta

@@ -18,19 +18,19 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="linuxtv-dvb-firmware"
-PKG_VERSION="20110212"
+PKG_NAME="wlan-firmware"
+PKG_VERSION="0.0.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"
-PKG_SITE="http://www.linuxtv.org"
+PKG_SITE="https://github.com/OpenELEC/wlan-firmware"
 PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="linuxtv-dvb-firmware: firmwarefiles for various DVB Cards."
-PKG_LONGDESC="firmwarefiles for various DVB Cards."
+PKG_SECTION="firmware"
+PKG_SHORTDESC="wlan-firmware: firmwares for various WLAN drivers"
+PKG_LONGDESC="wlan-firmware: firmwares for various WLAN drivers"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"

packages/linux-firmware/zd1211-firmware/install

@@ -1,26 +0,0 @@
-#!/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
-
-mkdir -p $INSTALL/lib/firmware/zd1211
-  cp -P $BUILD/$PKG_NAME/zd1211* $INSTALL/lib/firmware/zd1211

packages/linux-firmware/zd1211-firmware/meta

@@ -1,36 +0,0 @@
-################################################################################
-#      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="zd1211-firmware"
-PKG_VERSION="1.4"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="Free-to-use"
-PKG_SITE="http://sourceforge.net/projects/zd1211/"
-PKG_URL="$SOURCEFORGE_SRC/zd1211/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="zd1211-firmware: firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip Firmware"
-PKG_LONGDESC="zd1211-firmware: firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip Firmware"
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/linux/build

@@ -22,11 +22,21 @@
 
 . config/options $1
 
-export INSTALL=$(kernel_path)
+export INSTALL=$(kernel_path)/initramfs
 $SCRIPTS/install busybox-initramfs
 
+if [ "$BOOTLOADER" = "u-boot" ]; then
+  $SCRIPTS/build u-boot
+  KERNEL_IMAGE="uImage"
+else
+  KERNEL_IMAGE="bzImage"
+fi
+
 unset LDFLAGS
 
+# dont build parallel
+  MAKEFLAGS=-j1
+
 cd $(kernel_path)
 rm -rf modules
 mkdir -p modules
@@ -36,5 +46,5 @@ make INSTALL_MOD_PATH=modules DEPMOD="$ROOT/$TOOLCHAIN/sbin/depmod" modules_inst
 rm -f modules/lib/modules/*/build
 rm -f modules/lib/modules/*/source
 
-make bzImage
+make $KERNEL_IMAGE
 

packages/linux/config/initramfs

@@ -1,15 +1,14 @@
 dir /dev 755 0 0
-#nod /dev/tty1 644 0 0 c 4 1
-#nod /dev/console 644 0 0 c 5 1
 
 dir /bin 755 1000 1000
 slink /bin/sh busybox 777 0 0
 file /bin/busybox initramfs/bin/busybox 4755 0 0
-file /bin/ply-image initramfs/bin/ply-image 755 0 0
 
-# dir /lib 755 1000 1000
-# file /lib/ld-uClibc.so.0 initramfs/lib/ld-uClibc.so.0 755 0 0
-# file /lib/libc.so.0 initramfs/lib/libc.so.0 755 0 0
+dir /sbin 755 1000 1000
+file /sbin/ply-image initramfs/sbin/ply-image 755 0 0
+
+dir /splash 755 1000 1000
+file /splash/splash.png initramfs/splash/splash.png 644 0 0
 
 dir /proc 755 0 0
 dir /sys 755 0 0
@@ -18,4 +17,3 @@ dir /sysroot 755 0 0
 dir /storage 755 0 0
 
 file /init initramfs/init 755 0 0
-file /splash.png initramfs/splash.png 644 0 0

packages/linux/install

@@ -30,21 +30,18 @@ mkdir -p $INSTALL/lib/modules/$VER
   cp -r $PKG_BUILD/modules/* $INSTALL
   rm -f $INSTALL/lib/modules/$VER/modules.*
 
-strip_kmod $INSTALL/lib/modules/$VER/kernel
-
 $ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
 for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
   rm -f $i
 done
 
-if [ "$FIRMWARE" = "internal" ]; then
-  # copy kernel firmwares (if present and requested)
-    mkdir -p $INSTALL/lib/firmware
-      [ -d $PKG_BUILD/modules/lib/firmware ] && \
-        cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || true
-fi
+# copy kernel firmwares (if present and requested)
+  mkdir -p $INSTALL/lib/firmware
+  [ -d $PKG_BUILD/modules/lib/firmware ] && \
+    cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || true
 
 mkdir -p $INSTALL/etc
   cp $PKG_DIR/config/modules $INSTALL/etc
 
 mkdir -p $INSTALL/etc/modprobe.d
+  cp $PKG_DIR/modprobe.d/*.conf $INSTALL/etc/modprobe.d

packages/linux/meta

@@ -19,13 +19,13 @@
 ################################################################################
 
 PKG_NAME="linux"
-PKG_VERSION="2.6.38-rc6"
+PKG_VERSION="2.6.38.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kernel.org"
-#PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="busybox linux-drivers linux-firmware"
 PKG_BUILD_DEPENDS="toolchain busybox-hosttools xz"
 PKG_PRIORITY="optional"
@@ -36,7 +36,13 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-if [ "$LINUX_NEXT" = "yes" ]; then
-  PKG_VERSION="2.6.37"
+if [ "$LINUX_NEXT" = "yes" -a "$LINUX" = "default" ]; then
+  PKG_VERSION="2.6.39-rc1"
+#  PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2"
   PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
 fi
+
+if [ "$LINUX" = "ti-omap4" ]; then
+  PKG_VERSION="2.6.38-ti-omap4"
+  PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+fi

packages/linux/modprobe.d/ath9k.conf

@@ -0,0 +1,5 @@
+# /etc/modprobe.d/ath9k: setup modload options for module ath9k.
+# see:
+# http://openelec.tv/forum/28-issue-reports/4644-addons-download-not-working#4778
+
+options ath9k nohwcrypt=1

packages/linux/patches/linux-2.6.35-ti.980.1r14-321-linux_fix_SMC_instructions.patch

@@ -0,0 +1,22 @@
+diff -Naur linux-2.6.35-980.1release14/arch/arm/mach-omap2/Makefile linux-2.6.35-980.1release14a/arch/arm/mach-omap2/Makefile
+--- linux-2.6.35-980.1release14/arch/arm/mach-omap2/Makefile	2011-01-19 11:27:25.000000000 +0100
++++ linux-2.6.35-980.1release14a/arch/arm/mach-omap2/Makefile	2011-02-27 17:50:38.370778859 +0100
+@@ -29,7 +29,9 @@
+ obj-$(CONFIG_ARCH_OMAP4)		+= omap44xx-smc.o omap4-common.o \
+ 					   omap4-wakeupgen.o
+ 
+-AFLAGS_omap44xx-smc.o			:=-Wa,-march=armv7-a
++plus_sec := $(call as-instr,.arch_extension sec,+sec)
++AFLAGS_omap44xx-smc.o			:=-Wa,-march=armv7-a$(plus_sec)
++AFLAGS_omap-headsmp.o			:=-Wa,-march=armv7-a$(plus_sec)
+ 
+ # Functions loaded to SRAM
+ obj-$(CONFIG_ARCH_OMAP2420)		+= sram242x.o
+@@ -63,6 +65,7 @@
+ 
+ AFLAGS_sleep24xx.o			:=-Wa,-march=armv6
+ AFLAGS_sleep34xx.o			:=-Wa,-march=armv7-a
++AFLAGS_sleep44xx.o                   :=-Wa,-march=armv7-a$(plus_sec)
+ 
+ ifeq ($(CONFIG_PM_VERBOSE),y)
+ CFLAGS_pm_bus.o				+= -DDEBUG

packages/linux/patches/linux-2.6.38-rc6-700_701-730_BFS_patches.txt

@@ -1,20 +0,0 @@
-http://www.kernel.org/pub/linux/kernel/people/ck/patches/2.6/2.6.37/2.6.37-ck2/patches/
-
-2.6.37-sched-bfs-363.patch
-2637-bfs363-nonhotplug_fix.patch
-sched-add-above-background-load-function.patch
-mm-zero_swappiness.patch
-mm-enable_swaptoken_only_when_swap_full.patch
-mm-drop_swap_cache_aggressively.patch
-mm-kswapd_inherit_prio-1.patch
-mm-background_scan.patch
-mm-idleprio_prio-1.patch
-mm-lru_cache_add_lru_tail.patch
-mm-decrease_default_dirty_ratio.patch
-kconfig-expose_vmsplit_option.patch
-hz-default_1000.patch
-hz-no_default_250.patch
-hz-raise_max.patch
-preempt-desktop-tune.patch
-cpufreq-bfs_tweaks.patch
-ck2-version.patch

packages/linux/patches/linux-2.6.38-rc6-702_2637-bfs363-nonhotplug_fix.patch.disabled

@@ -1,60 +0,0 @@
-Fix a failure to build if CPU hotplug is disabled with BFS.
-
--ck
-
----
- kernel/sched_bfs.c |   34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-Index: linux-2.6.37-ck2/kernel/sched_bfs.c
-===================================================================
---- linux-2.6.37-ck2.orig/kernel/sched_bfs.c	2011-02-14 09:50:24.351252002 +1100
-+++ linux-2.6.37-ck2/kernel/sched_bfs.c	2011-02-14 09:53:53.820252000 +1100
-@@ -4812,6 +4812,23 @@
- 	grq_unlock_irqrestore(&flags);
- }
- 
-+/*
-+ * Ensures that the idle task is using init_mm right before its cpu goes
-+ * offline.
-+ */
-+void idle_task_exit(void)
-+{
-+	struct mm_struct *mm = current->active_mm;
-+
-+	BUG_ON(cpu_online(smp_processor_id()));
-+
-+	if (mm != &init_mm)
-+		switch_mm(mm, &init_mm, current);
-+	mmdrop(mm);
-+}
-+
-+#endif /* CONFIG_HOTPLUG_CPU */
-+
- void sched_set_stop_task(int cpu, struct task_struct *stop)
- {
- 	struct sched_param stop_param = { .sched_priority = STOP_PRIO };
-@@ -4841,23 +4858,6 @@
- 	}
- }
- 
--/*
-- * Ensures that the idle task is using init_mm right before its cpu goes
-- * offline.
-- */
--void idle_task_exit(void)
--{
--	struct mm_struct *mm = current->active_mm;
--
--	BUG_ON(cpu_online(smp_processor_id()));
--
--	if (mm != &init_mm)
--		switch_mm(mm, &init_mm, current);
--	mmdrop(mm);
--}
--
--#endif /* CONFIG_HOTPLUG_CPU */
--
- #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
- 
- static struct ctl_table sd_ctl_dir[] = {

packages/linux/patches/linux-2.6.38-rc6-702_ck2-version.patch

@@ -1,19 +0,0 @@
----
- Makefile |    4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: linux-2.6.37-ck2/Makefile
-===================================================================
---- linux-2.6.37-ck2.orig/Makefile	2011-01-06 14:04:07.000000000 +1100
-+++ linux-2.6.37-ck2/Makefile	2011-02-14 10:11:20.469252000 +1100
-@@ -10,6 +10,10 @@
- # Comments in this file are targeted only to the developer, do not
- # expect to learn how to build the kernel reading this file.
- 
-+CKVERSION = -ck2
-+CKNAME = BFS Powered
-+EXTRAVERSION := $(EXTRAVERSION)$(CKVERSION)
-+
- # Do not:
- # o  use make's built-in rules and variables
- #    (this increases performance and avoids hard-to-debug behaviour);

packages/linux/patches/linux-2.6.38-rc6-703_cpufreq-bfs_tweaks.patch

@@ -1,37 +0,0 @@
----
- drivers/cpufreq/cpufreq_ondemand.c |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-Index: linux-2.6.37-ck2/drivers/cpufreq/cpufreq_ondemand.c
-===================================================================
---- linux-2.6.37-ck2.orig/drivers/cpufreq/cpufreq_ondemand.c	2011-01-06 14:04:08.000000000 +1100
-+++ linux-2.6.37-ck2/drivers/cpufreq/cpufreq_ondemand.c	2011-02-14 10:11:11.438252001 +1100
-@@ -28,12 +28,12 @@
-  * It helps to keep variable names smaller, simpler
-  */
- 
--#define DEF_FREQUENCY_DOWN_DIFFERENTIAL		(10)
--#define DEF_FREQUENCY_UP_THRESHOLD		(80)
-+#define DEF_FREQUENCY_DOWN_DIFFERENTIAL		(17)
-+#define DEF_FREQUENCY_UP_THRESHOLD		(63)
- #define DEF_SAMPLING_DOWN_FACTOR		(1)
- #define MAX_SAMPLING_DOWN_FACTOR		(100000)
- #define MICRO_FREQUENCY_DOWN_DIFFERENTIAL	(3)
--#define MICRO_FREQUENCY_UP_THRESHOLD		(95)
-+#define MICRO_FREQUENCY_UP_THRESHOLD		(80)
- #define MICRO_FREQUENCY_MIN_SAMPLE_RATE		(10000)
- #define MIN_FREQUENCY_UP_THRESHOLD		(11)
- #define MAX_FREQUENCY_UP_THRESHOLD		(100)
-@@ -513,10 +513,10 @@
- 
- 	/*
- 	 * Every sampling_rate, we check, if current idle time is less
--	 * than 20% (default), then we try to increase frequency
-+	 * than 37% (default), then we try to increase frequency
- 	 * Every sampling_rate, we look for a the lowest
- 	 * frequency which can sustain the load while keeping idle time over
--	 * 30%. If such a frequency exist, we try to decrease to this frequency.
-+	 * 50%. If such a frequency exist, we try to decrease to this frequency.
- 	 *
- 	 * Any frequency increase takes it to the maximum frequency.
- 	 * Frequency reduction happens at minimum steps of

packages/linux/patches/linux-2.6.38-rc6-704_hz-default_1000.patch

@@ -1,17 +0,0 @@
----
- kernel/Kconfig.hz |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: linux-2.6.37-ck2/kernel/Kconfig.hz
-===================================================================
---- linux-2.6.37-ck2.orig/kernel/Kconfig.hz	2009-06-10 13:05:27.000000000 +1000
-+++ linux-2.6.37-ck2/kernel/Kconfig.hz	2011-02-14 10:11:10.474252000 +1100
-@@ -4,7 +4,7 @@
- 
- choice
- 	prompt "Timer frequency"
--	default HZ_250
-+	default HZ_1000
- 	help
- 	 Allows the configuration of the timer frequency. It is customary
- 	 to have the timer interrupt run at 1000 Hz but 100 Hz may be more

packages/linux/patches/linux-2.6.38-rc6-705_hz-no_default_250.patch

@@ -1,47 +0,0 @@
----
- kernel/Kconfig.hz |   17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
-Index: linux-2.6.37-ck2/kernel/Kconfig.hz
-===================================================================
---- linux-2.6.37-ck2.orig/kernel/Kconfig.hz	2011-02-14 10:11:10.474252000 +1100
-+++ linux-2.6.37-ck2/kernel/Kconfig.hz	2011-02-14 10:11:10.702252000 +1100
-@@ -23,13 +23,14 @@
- 	  with lots of processors that may show reduced performance if
- 	  too many timer interrupts are occurring.
- 
--	config HZ_250
-+	config HZ_250_NODEFAULT
- 		bool "250 HZ"
- 	help
--	 250 Hz is a good compromise choice allowing server performance
--	 while also showing good interactive responsiveness even
--	 on SMP and NUMA systems. If you are going to be using NTSC video
--	 or multimedia, selected 300Hz instead.
-+	 250 HZ is a lousy compromise choice allowing server interactivity
-+	 while also showing desktop throughput and no extra power saving on
-+	 laptops. No good for anything.
-+
-+	 Recommend 100 or 1000 instead.
- 
- 	config HZ_300
- 		bool "300 HZ"
-@@ -43,14 +44,16 @@
- 		bool "1000 HZ"
- 	help
- 	 1000 Hz is the preferred choice for desktop systems and other
--	 systems requiring fast interactive responses to events.
-+	 systems requiring fast interactive responses to events. Laptops
-+	 can also benefit from this choice without sacrificing battery life
-+	 if dynticks is also enabled.
- 
- endchoice
- 
- config HZ
- 	int
- 	default 100 if HZ_100
--	default 250 if HZ_250
-+	default 250 if HZ_250_NODEFAULT
- 	default 300 if HZ_300
- 	default 1000 if HZ_1000
- 

packages/linux/patches/linux-2.6.38-rc6-706_hz-raise_max.patch

@@ -1,174 +0,0 @@
----
- arch/x86/kernel/cpu/proc.c       |    2 -
- arch/x86/kernel/smpboot.c        |    2 -
- include/linux/nfsd/stats.h       |    4 +-
- include/net/inet_timewait_sock.h |   10 ++++--
- init/calibrate.c                 |    2 -
- kernel/Kconfig.hz                |   64 +++++++++++++++++++++++++++++++++++++++
- 6 files changed, 76 insertions(+), 8 deletions(-)
-
-Index: linux-2.6.37-ck2/arch/x86/kernel/cpu/proc.c
-===================================================================
---- linux-2.6.37-ck2.orig/arch/x86/kernel/cpu/proc.c	2009-12-03 21:39:58.000000000 +1100
-+++ linux-2.6.37-ck2/arch/x86/kernel/cpu/proc.c	2011-02-14 10:11:10.919252001 +1100
-@@ -109,7 +109,7 @@
- 
- 	seq_printf(m, "\nbogomips\t: %lu.%02lu\n",
- 		   c->loops_per_jiffy/(500000/HZ),
--		   (c->loops_per_jiffy/(5000/HZ)) % 100);
-+		   (c->loops_per_jiffy * 10 /(50000/HZ)) % 100);
- 
- #ifdef CONFIG_X86_64
- 	if (c->x86_tlbsize > 0)
-Index: linux-2.6.37-ck2/arch/x86/kernel/smpboot.c
-===================================================================
---- linux-2.6.37-ck2.orig/arch/x86/kernel/smpboot.c	2011-01-06 14:04:08.000000000 +1100
-+++ linux-2.6.37-ck2/arch/x86/kernel/smpboot.c	2011-02-14 10:11:10.920252001 +1100
-@@ -497,7 +497,7 @@
- 		"Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
- 		num_online_cpus(),
- 		bogosum/(500000/HZ),
--		(bogosum/(5000/HZ))%100);
-+		(bogosum * 10/(50000/HZ))%100);
- 
- 	pr_debug("Before bogocount - setting activated=1.\n");
- }
-Index: linux-2.6.37-ck2/include/linux/nfsd/stats.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/linux/nfsd/stats.h	2009-06-10 13:05:27.000000000 +1000
-+++ linux-2.6.37-ck2/include/linux/nfsd/stats.h	2011-02-14 10:11:10.920252001 +1100
-@@ -11,8 +11,8 @@
- 
- #include <linux/nfs4.h>
- 
--/* thread usage wraps very million seconds (approx one fortnight) */
--#define	NFSD_USAGE_WRAP	(HZ*1000000)
-+/* thread usage wraps every one hundred thousand seconds (approx one day) */
-+#define	NFSD_USAGE_WRAP	(HZ*100000)
- 
- #ifdef __KERNEL__
- 
-Index: linux-2.6.37-ck2/include/net/inet_timewait_sock.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/net/inet_timewait_sock.h	2010-08-02 11:12:25.000000000 +1000
-+++ linux-2.6.37-ck2/include/net/inet_timewait_sock.h	2011-02-14 10:11:10.920252001 +1100
-@@ -39,8 +39,8 @@
-  * If time > 4sec, it is "slow" path, no recycling is required,
-  * so that we select tick to get range about 4 seconds.
-  */
--#if HZ <= 16 || HZ > 4096
--# error Unsupported: HZ <= 16 or HZ > 4096
-+#if HZ <= 16 || HZ > 16384
-+# error Unsupported: HZ <= 16 or HZ > 16384
- #elif HZ <= 32
- # define INET_TWDR_RECYCLE_TICK (5 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
- #elif HZ <= 64
-@@ -55,8 +55,12 @@
- # define INET_TWDR_RECYCLE_TICK (10 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
- #elif HZ <= 2048
- # define INET_TWDR_RECYCLE_TICK (11 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
--#else
-+#elif HZ <= 4096
- # define INET_TWDR_RECYCLE_TICK (12 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
-+#elif HZ <= 8192
-+# define INET_TWDR_RECYCLE_TICK (13 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
-+#else
-+# define INET_TWDR_RECYCLE_TICK (14 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
- #endif
- 
- /* TIME_WAIT reaping mechanism. */
-Index: linux-2.6.37-ck2/init/calibrate.c
-===================================================================
---- linux-2.6.37-ck2.orig/init/calibrate.c	2010-02-25 21:51:52.000000000 +1100
-+++ linux-2.6.37-ck2/init/calibrate.c	2011-02-14 10:11:10.921252001 +1100
-@@ -176,7 +176,7 @@
- 	if (!printed)
- 		pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n",
- 			loops_per_jiffy/(500000/HZ),
--			(loops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy);
-+			(loops_per_jiffy * 10 /(50000/HZ)) % 100, loops_per_jiffy);
- 
- 	printed = true;
- }
-Index: linux-2.6.37-ck2/kernel/Kconfig.hz
-===================================================================
---- linux-2.6.37-ck2.orig/kernel/Kconfig.hz	2011-02-14 10:11:10.702252000 +1100
-+++ linux-2.6.37-ck2/kernel/Kconfig.hz	2011-02-14 10:11:10.921252001 +1100
-@@ -48,6 +48,63 @@
- 	 can also benefit from this choice without sacrificing battery life
- 	 if dynticks is also enabled.
- 
-+	config HZ_1500
-+		bool "1500 HZ"
-+	help
-+	 1500 Hz is an insane value to use to run broken software that is Hz
-+	 limited.
-+
-+	 Being over 1000, driver breakage is likely.
-+
-+	config HZ_2000
-+		bool "2000 HZ"
-+	help
-+	 2000 Hz is an insane value to use to run broken software that is Hz
-+	 limited.
-+
-+	 Being over 1000, driver breakage is likely.
-+
-+	config HZ_3000
-+		bool "3000 HZ"
-+	help
-+	 3000 Hz is an insane value to use to run broken software that is Hz
-+	 limited.
-+
-+	 Being over 1000, driver breakage is likely.
-+
-+	config HZ_4000
-+		bool "4000 HZ"
-+	help
-+	 4000 Hz is an insane value to use to run broken software that is Hz
-+	 limited.
-+
-+	 Being over 1000, driver breakage is likely.
-+
-+	config HZ_5000
-+		bool "5000 HZ"
-+	help
-+	 5000 Hz is an obscene value to use to run broken software that is Hz
-+	 limited.
-+
-+	 Being over 1000, driver breakage is likely.
-+
-+	config HZ_7500
-+		bool "7500 HZ"
-+	help
-+	 7500 Hz is an obscene value to use to run broken software that is Hz
-+	 limited.
-+
-+	 Being over 1000, driver breakage is likely.
-+
-+	config HZ_10000
-+		bool "10000 HZ"
-+	help
-+	 10000 Hz is an obscene value to use to run broken software that is Hz
-+	 limited.
-+
-+	 Being over 1000, driver breakage is likely.
-+
-+
- endchoice
- 
- config HZ
-@@ -56,6 +113,13 @@
- 	default 250 if HZ_250_NODEFAULT
- 	default 300 if HZ_300
- 	default 1000 if HZ_1000
-+	default 1500 if HZ_1500
-+	default 2000 if HZ_2000
-+	default 3000 if HZ_3000
-+	default 4000 if HZ_4000
-+	default 5000 if HZ_5000
-+	default 7500 if HZ_7500
-+	default 10000 if HZ_10000
- 
- config SCHED_HRTICK
- 	def_bool HIGH_RES_TIMERS && (!SMP || USE_GENERIC_SMP_HELPERS)

packages/linux/patches/linux-2.6.38-rc6-707_kconfig-expose_vmsplit_option.patch.disabled

@@ -1,40 +0,0 @@
----
- arch/x86/Kconfig |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-Index: linux-2.6.37-ck2/arch/x86/Kconfig
-===================================================================
---- linux-2.6.37-ck2.orig/arch/x86/Kconfig	2011-01-06 14:04:08.000000000 +1100
-+++ linux-2.6.37-ck2/arch/x86/Kconfig	2011-02-14 10:11:10.260252001 +1100
-@@ -1046,7 +1046,7 @@
- 
- choice
- 	depends on EXPERIMENTAL
--	prompt "Memory split" if EMBEDDED
-+	prompt "Memory split"
- 	default VMSPLIT_3G
- 	depends on X86_32
- 	---help---
-@@ -1066,17 +1066,17 @@
- 	  option alone!
- 
- 	config VMSPLIT_3G
--		bool "3G/1G user/kernel split"
-+		bool "Default 896MB lowmem (3G/1G user/kernel split)"
- 	config VMSPLIT_3G_OPT
- 		depends on !X86_PAE
--		bool "3G/1G user/kernel split (for full 1G low memory)"
-+		bool "1GB lowmem (3G/1G user/kernel split)"
- 	config VMSPLIT_2G
--		bool "2G/2G user/kernel split"
-+		bool "2GB lowmem (2G/2G user/kernel split)"
- 	config VMSPLIT_2G_OPT
- 		depends on !X86_PAE
--		bool "2G/2G user/kernel split (for full 2G low memory)"
-+		bool "2GB lowmem (2G/2G user/kernel split)"
- 	config VMSPLIT_1G
--		bool "1G/3G user/kernel split"
-+		bool "3GB lowmem (1G/3G user/kernel split)"
- endchoice
- 
- config PAGE_OFFSET

packages/linux/patches/linux-2.6.38-rc6-708_mm-kswapd_inherit_prio-1.patch.disabled

@@ -1,69 +0,0 @@
----
- mm/vmscan.c |   33 ++++++++++++++++++++++++++++++++-
- 1 file changed, 32 insertions(+), 1 deletion(-)
-
-Index: linux-2.6.37-ck2/mm/vmscan.c
-===================================================================
---- linux-2.6.37-ck2.orig/mm/vmscan.c	2011-02-14 10:11:00.986252001 +1100
-+++ linux-2.6.37-ck2/mm/vmscan.c	2011-02-14 10:11:01.254252001 +1100
-@@ -1855,6 +1855,33 @@
- }
- 
- /*
-+ * Helper functions to adjust nice level of kswapd, based on the priority of
-+ * the task (p) that called it. If it is already higher priority we do not
-+ * demote its nice level since it is still working on behalf of a higher
-+ * priority task. With kernel threads we leave it at nice 0.
-+ *
-+ * We don't ever run kswapd real time, so if a real time task calls kswapd we
-+ * set it to highest SCHED_NORMAL priority.
-+ */
-+static inline int effective_sc_prio(struct task_struct *p)
-+{
-+	if (likely(p->mm)) {
-+		if (rt_task(p))
-+			return -20;
-+		return task_nice(p);
-+	}
-+	return 0;
-+}
-+
-+static void set_kswapd_nice(struct task_struct *kswapd, int active)
-+{
-+	long nice = effective_sc_prio(current);
-+
-+	if (task_nice(kswapd) > nice || !active)
-+		set_user_nice(kswapd, nice);
-+}
-+
-+/*
-  * This is the direct reclaim path, for page-allocating processes.  We only
-  * try to reclaim pages from zones which will satisfy the caller's allocation
-  * request.
-@@ -2457,6 +2484,7 @@
- 				}
- 			}
- 
-+			set_user_nice(tsk, 0);
- 			order = pgdat->kswapd_max_order;
- 		}
- 		finish_wait(&pgdat->kswapd_wait, &wait);
-@@ -2483,6 +2511,7 @@
- void wakeup_kswapd(struct zone *zone, int order)
- {
- 	pg_data_t *pgdat;
-+	int active;
- 
- 	if (!populated_zone(zone))
- 		return;
-@@ -2495,7 +2524,9 @@
- 	trace_mm_vmscan_wakeup_kswapd(pgdat->node_id, zone_idx(zone), order);
- 	if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
- 		return;
--	if (!waitqueue_active(&pgdat->kswapd_wait))
-+	active = waitqueue_active(&pgdat->kswapd_wait);
-+	set_kswapd_nice(pgdat->kswapd, active);
-+	if (!active)
- 		return;
- 	wake_up_interruptible(&pgdat->kswapd_wait);
- }

packages/linux/patches/linux-2.6.38-rc6-709_mm-decrease_default_dirty_ratio.patch

@@ -1,34 +0,0 @@
-The default dirty ratio is chosen to be a compromise between throughput and
-overall system latency. On a desktop, if an application writes to disk a lot,
-that application should be the one to slow down rather than the desktop as a
-whole. At higher dirty ratio settings, an application could write a lot to
-disk and then happily use lots of CPU time after that while the rest of the
-system is busy waiting on that naughty applications disk writes to complete
-before anything else happening.
-
-Lower ratios mean that the application that do a lot of disk writes end up
-being responsible for their own actions and they're the ones that slow down
-rather than the system in general.
-
-This does decrease overall write throughput slightly, but to the benefit of
-the latency of the system as a whole.
-
--ck
-
----
- mm/page-writeback.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: linux-2.6.37-ck2/mm/page-writeback.c
-===================================================================
---- linux-2.6.37-ck2.orig/mm/page-writeback.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/mm/page-writeback.c	2011-02-14 10:11:10.037252000 +1100
-@@ -78,7 +78,7 @@
- /*
-  * The generator of dirty data starts writeback at this percentage
-  */
--int vm_dirty_ratio = 20;
-+int vm_dirty_ratio = 5;
- 
- /*
-  * vm_dirty_bytes starts at 0 (disabled) so that it is a function of

packages/linux/patches/linux-2.6.38-rc6-710_mm-drop_swap_cache_aggressively.patch

@@ -1,87 +0,0 @@
----
- include/linux/swap.h |    2 +-
- mm/memory.c          |    2 +-
- mm/swapfile.c        |    9 ++++-----
- mm/vmscan.c          |    2 +-
- 4 files changed, 7 insertions(+), 8 deletions(-)
-
-Index: linux-2.6.37-ck2/include/linux/swap.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/linux/swap.h	2011-02-14 10:11:00.763252001 +1100
-+++ linux-2.6.37-ck2/include/linux/swap.h	2011-02-14 10:11:00.982252001 +1100
-@@ -192,7 +192,7 @@
- 	int next;	/* swapfile to be used next */
- };
- 
--/* Swap 50% full? Release swapcache more aggressively.. */
-+/* Swap 50% full? */
- #define vm_swap_full() (nr_swap_pages*2 < total_swap_pages)
- 
- /* linux/mm/page_alloc.c */
-Index: linux-2.6.37-ck2/mm/memory.c
-===================================================================
---- linux-2.6.37-ck2.orig/mm/memory.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/mm/memory.c	2011-02-14 10:11:00.984252001 +1100
-@@ -2754,7 +2754,7 @@
- 	mem_cgroup_commit_charge_swapin(page, ptr);
- 
- 	swap_free(entry);
--	if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
-+	if ((vma->vm_flags & VM_LOCKED) || PageMlocked(page))
- 		try_to_free_swap(page);
- 	unlock_page(page);
- 	if (swapcache) {
-Index: linux-2.6.37-ck2/mm/swapfile.c
-===================================================================
---- linux-2.6.37-ck2.orig/mm/swapfile.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/mm/swapfile.c	2011-02-14 10:11:00.985252001 +1100
-@@ -321,7 +321,7 @@
- 		scan_base = offset = si->lowest_bit;
- 
- 	/* reuse swap entry of cache-only swap if not busy. */
--	if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) {
-+	if (si->swap_map[offset] == SWAP_HAS_CACHE) {
- 		int swap_was_freed;
- 		spin_unlock(&swap_lock);
- 		swap_was_freed = __try_to_reclaim_swap(si, offset);
-@@ -410,7 +410,7 @@
- 			spin_lock(&swap_lock);
- 			goto checks;
- 		}
--		if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) {
-+		if (si->swap_map[offset] == SWAP_HAS_CACHE) {
- 			spin_lock(&swap_lock);
- 			goto checks;
- 		}
-@@ -425,7 +425,7 @@
- 			spin_lock(&swap_lock);
- 			goto checks;
- 		}
--		if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) {
-+		if (si->swap_map[offset] == SWAP_HAS_CACHE) {
- 			spin_lock(&swap_lock);
- 			goto checks;
- 		}
-@@ -739,8 +739,7 @@
- 		 * Not mapped elsewhere, or swap space full? Free it!
- 		 * Also recheck PageSwapCache now page is locked (above).
- 		 */
--		if (PageSwapCache(page) && !PageWriteback(page) &&
--				(!page_mapped(page) || vm_swap_full())) {
-+		if (PageSwapCache(page) && !PageWriteback(page)) {
- 			delete_from_swap_cache(page);
- 			SetPageDirty(page);
- 		}
-Index: linux-2.6.37-ck2/mm/vmscan.c
-===================================================================
---- linux-2.6.37-ck2.orig/mm/vmscan.c	2011-02-14 10:11:00.536252000 +1100
-+++ linux-2.6.37-ck2/mm/vmscan.c	2011-02-14 10:11:00.986252001 +1100
-@@ -900,7 +900,7 @@
- 
- activate_locked:
- 		/* Not a candidate for swapping, so reclaim swap space. */
--		if (PageSwapCache(page) && vm_swap_full())
-+		if (PageSwapCache(page))
- 			try_to_free_swap(page);
- 		VM_BUG_ON(PageActive(page));
- 		SetPageActive(page);

packages/linux/patches/linux-2.6.38-rc6-711_mm-enable_swaptoken_only_when_swap_full.patch

@@ -1,20 +0,0 @@
----
- include/linux/swap.h |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: linux-2.6.37-ck2/include/linux/swap.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/linux/swap.h	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/include/linux/swap.h	2011-02-14 10:11:00.763252001 +1100
-@@ -348,9 +348,10 @@
- extern void grab_swap_token(struct mm_struct *);
- extern void __put_swap_token(struct mm_struct *);
- 
-+/* Only allow swap token to have effect if swap is full */
- static inline int has_swap_token(struct mm_struct *mm)
- {
--	return (mm == swap_token_mm);
-+	return (mm == swap_token_mm && vm_swap_full());
- }
- 
- static inline void put_swap_token(struct mm_struct *mm)

packages/linux/patches/linux-2.6.38-rc6-712_mm-background_scan.patch.disabled

@@ -1,137 +0,0 @@
----
- include/linux/mmzone.h |    6 +++++-
- mm/vmscan.c            |   42 ++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 47 insertions(+), 1 deletion(-)
-
-Index: linux-2.6.37-ck2/include/linux/mmzone.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/linux/mmzone.h	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/include/linux/mmzone.h	2011-02-14 10:11:01.470252001 +1100
-@@ -15,6 +15,7 @@
- #include <linux/seqlock.h>
- #include <linux/nodemask.h>
- #include <linux/pageblock-flags.h>
-+#include <linux/timer.h>
- #include <generated/bounds.h>
- #include <asm/atomic.h>
- #include <asm/page.h>
-@@ -161,12 +162,14 @@
- 	WMARK_MIN,
- 	WMARK_LOW,
- 	WMARK_HIGH,
-+	WMARK_LOTS,
- 	NR_WMARK
- };
- 
- #define min_wmark_pages(z) (z->watermark[WMARK_MIN])
- #define low_wmark_pages(z) (z->watermark[WMARK_LOW])
- #define high_wmark_pages(z) (z->watermark[WMARK_HIGH])
-+#define lots_wmark_pages(z) (z->watermark[WMARK_LOTS])
- 
- struct per_cpu_pages {
- 	int count;		/* number of pages in the list */
-@@ -343,7 +346,7 @@
- 	ZONE_PADDING(_pad1_)
- 
- 	/* Fields commonly accessed by the page reclaim scanner */
--	spinlock_t		lru_lock;	
-+	spinlock_t		lru_lock;
- 	struct zone_lru {
- 		struct list_head list;
- 	} lru[NR_LRU_LISTS];
-@@ -645,6 +648,7 @@
- 	wait_queue_head_t kswapd_wait;
- 	struct task_struct *kswapd;
- 	int kswapd_max_order;
-+	struct timer_list watermark_timer;
- } pg_data_t;
- 
- #define node_present_pages(nid)	(NODE_DATA(nid)->node_present_pages)
-Index: linux-2.6.37-ck2/mm/vmscan.c
-===================================================================
---- linux-2.6.37-ck2.orig/mm/vmscan.c	2011-02-14 10:11:01.254252001 +1100
-+++ linux-2.6.37-ck2/mm/vmscan.c	2011-02-14 10:11:01.471252001 +1100
-@@ -36,6 +36,7 @@
- #include <linux/rwsem.h>
- #include <linux/delay.h>
- #include <linux/kthread.h>
-+#include <linux/timer.h>
- #include <linux/freezer.h>
- #include <linux/memcontrol.h>
- #include <linux/delayacct.h>
-@@ -2398,6 +2399,8 @@
- 	return sc.nr_reclaimed;
- }
- 
-+#define WT_EXPIRY	(HZ * 5)	/* Time to wakeup watermark_timer */
-+
- /*
-  * The background pageout daemon, started as a kernel thread
-  * from the init process.
-@@ -2448,6 +2451,8 @@
- 		unsigned long new_order;
- 		int ret;
- 
-+		/* kswapd has been busy so delay watermark_timer */
-+		mod_timer(&pgdat->watermark_timer, jiffies + WT_EXPIRY);
- 		prepare_to_wait(&pgdat->kswapd_wait, &wait, TASK_INTERRUPTIBLE);
- 		new_order = pgdat->kswapd_max_order;
- 		pgdat->kswapd_max_order = 0;
-@@ -2632,20 +2637,57 @@
- }
- 
- /*
-+ * We wake up kswapd every WT_EXPIRY till free ram is above pages_lots
-+ */
-+static void watermark_wakeup(unsigned long data)
-+{
-+	pg_data_t *pgdat = (pg_data_t *)data;
-+	struct timer_list *wt = &pgdat->watermark_timer;
-+	int i;
-+
-+	if (!waitqueue_active(&pgdat->kswapd_wait) || above_background_load())
-+		goto out;
-+	for (i = pgdat->nr_zones - 1; i >= 0; i--) {
-+		struct zone *z = pgdat->node_zones + i;
-+
-+		if (!populated_zone(z) || is_highmem(z)) {
-+			/* We are better off leaving highmem full */
-+			continue;
-+		}
-+		if (!zone_watermark_ok(z, 0, lots_wmark_pages(z), 0, 0)) {
-+			wake_up_interruptible(&pgdat->kswapd_wait);
-+			goto out;
-+		}
-+	}
-+out:
-+	mod_timer(wt, jiffies + WT_EXPIRY);
-+	return;
-+}
-+
-+/*
-  * This kswapd start function will be called by init and node-hot-add.
-  * On node-hot-add, kswapd will moved to proper cpus if cpus are hot-added.
-  */
- int kswapd_run(int nid)
- {
- 	pg_data_t *pgdat = NODE_DATA(nid);
-+	struct timer_list *wt;
- 	int ret = 0;
- 
- 	if (pgdat->kswapd)
- 		return 0;
- 
-+	wt = &pgdat->watermark_timer;
-+	init_timer(wt);
-+	wt->data = (unsigned long)pgdat;
-+	wt->function = watermark_wakeup;
-+	wt->expires = jiffies + WT_EXPIRY;
-+	add_timer(wt);
-+
- 	pgdat->kswapd = kthread_run(kswapd, pgdat, "kswapd%d", nid);
- 	if (IS_ERR(pgdat->kswapd)) {
- 		/* failure at boot is fatal */
-+		del_timer(wt);
- 		BUG_ON(system_state == SYSTEM_BOOTING);
- 		printk("Failed to start kswapd on node %d\n",nid);
- 		ret = -1;

packages/linux/patches/linux-2.6.38-rc6-713_mm-idleprio_prio-1.patch.disabled

@@ -1,33 +0,0 @@
----
- include/linux/sched.h |    2 +-
- mm/vmscan.c           |    2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-Index: linux-2.6.37-ck1/include/linux/sched.h
-===================================================================
---- linux-2.6.37-ck1.orig/include/linux/sched.h	2011-01-06 14:07:19.971048973 +1100
-+++ linux-2.6.37-ck1/include/linux/sched.h	2011-01-06 14:07:58.442334300 +1100
-@@ -38,9 +38,9 @@
- #define SCHED_BATCH		3
- /* SCHED_ISO: Implemented on BFS only */
- #define SCHED_IDLE		5
-+#define SCHED_IDLEPRIO		SCHED_IDLE
- #ifdef CONFIG_SCHED_BFS
- #define SCHED_ISO		4
--#define SCHED_IDLEPRIO		SCHED_IDLE
- #define SCHED_MAX		(SCHED_IDLEPRIO)
- #define SCHED_RANGE(policy)	((policy) <= SCHED_MAX)
- #endif
-Index: linux-2.6.37-ck1/mm/vmscan.c
-===================================================================
---- linux-2.6.37-ck1.orig/mm/vmscan.c	2011-01-06 14:07:58.305326159 +1100
-+++ linux-2.6.37-ck1/mm/vmscan.c	2011-01-06 14:07:58.443334359 +1100
-@@ -1874,6 +1874,8 @@ static inline int effective_sc_prio(stru
- 	if (likely(p->mm)) {
- 		if (rt_task(p))
- 			return -20;
-+		if (p->policy == SCHED_IDLEPRIO)
-+			return 19;
- 		return task_nice(p);
- 	}
- 	return 0;

packages/linux/patches/linux-2.6.38-rc6-714_mm-lru_cache_add_lru_tail.patch.disabled

@@ -1,250 +0,0 @@
----
- include/linux/mm_inline.h |   14 +++++++++++-
- include/linux/swap.h      |    8 ++++++-
- mm/filemap.c              |   50 +++++++++++++++++++++++++++++++++++++++-------
- mm/swap.c                 |   30 ++++++++++++++++++++++-----
- 4 files changed, 86 insertions(+), 16 deletions(-)
-
-Index: linux-2.6.37-ck2/include/linux/mm_inline.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/linux/mm_inline.h	2009-12-03 21:40:09.000000000 +1100
-+++ linux-2.6.37-ck2/include/linux/mm_inline.h	2011-02-14 10:11:09.770252000 +1100
-@@ -20,14 +20,24 @@
- }
- 
- static inline void
--add_page_to_lru_list(struct zone *zone, struct page *page, enum lru_list l)
-+__add_page_to_lru_list(struct zone *zone, struct page *page, enum lru_list l, int tail)
- {
--	list_add(&page->lru, &zone->lru[l].list);
-+	/* See if this should be added to the tail of this lru list */
-+	if (tail)
-+		list_add_tail(&page->lru, &zone->lru[l].list);
-+	else
-+		list_add(&page->lru, &zone->lru[l].list);
- 	__inc_zone_state(zone, NR_LRU_BASE + l);
- 	mem_cgroup_add_lru_list(page, l);
- }
- 
- static inline void
-+add_page_to_lru_list(struct zone *zone, struct page *page, enum lru_list l)
-+{
-+	__add_page_to_lru_list(zone, page, l, 0);
-+}
-+
-+static inline void
- del_page_from_lru_list(struct zone *zone, struct page *page, enum lru_list l)
- {
- 	list_del(&page->lru);
-Index: linux-2.6.37-ck2/include/linux/swap.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/linux/swap.h	2011-02-14 10:11:00.982252001 +1100
-+++ linux-2.6.37-ck2/include/linux/swap.h	2011-02-14 10:11:09.770252000 +1100
-@@ -206,6 +206,7 @@
- 
- 
- /* linux/mm/swap.c */
-+extern void ____lru_cache_add(struct page *, enum lru_list lru, int tail);
- extern void __lru_cache_add(struct page *, enum lru_list lru);
- extern void lru_cache_add_lru(struct page *, enum lru_list lru);
- extern void activate_page(struct page *);
-@@ -226,9 +227,14 @@
- 	__lru_cache_add(page, LRU_INACTIVE_ANON);
- }
- 
-+static inline void lru_cache_add_file_tail(struct page *page, int tail)
-+{
-+	____lru_cache_add(page, LRU_INACTIVE_FILE, tail);
-+}
-+
- static inline void lru_cache_add_file(struct page *page)
- {
--	__lru_cache_add(page, LRU_INACTIVE_FILE);
-+	____lru_cache_add(page, LRU_INACTIVE_FILE, 0);
- }
- 
- /* LRU Isolation modes. */
-Index: linux-2.6.37-ck2/mm/filemap.c
-===================================================================
---- linux-2.6.37-ck2.orig/mm/filemap.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/mm/filemap.c	2011-02-14 10:11:09.772252000 +1100
-@@ -439,8 +439,8 @@
- }
- EXPORT_SYMBOL(add_to_page_cache_locked);
- 
--int add_to_page_cache_lru(struct page *page, struct address_space *mapping,
--				pgoff_t offset, gfp_t gfp_mask)
-+int __add_to_page_cache_lru(struct page *page, struct address_space *mapping,
-+				pgoff_t offset, gfp_t gfp_mask, int tail)
- {
- 	int ret;
- 
-@@ -456,12 +456,18 @@
- 	ret = add_to_page_cache(page, mapping, offset, gfp_mask);
- 	if (ret == 0) {
- 		if (page_is_file_cache(page))
--			lru_cache_add_file(page);
-+			lru_cache_add_file_tail(page, tail);
- 		else
- 			lru_cache_add_anon(page);
- 	}
- 	return ret;
- }
-+
-+int add_to_page_cache_lru(struct page *page, struct address_space *mapping,
-+				pgoff_t offset, gfp_t gfp_mask)
-+{
-+	return __add_to_page_cache_lru(page, mapping, offset, gfp_mask, 0);
-+}
- EXPORT_SYMBOL_GPL(add_to_page_cache_lru);
- 
- #ifdef CONFIG_NUMA
-@@ -968,6 +974,28 @@
- 	ra->ra_pages /= 4;
- }
- 
-+static inline int nr_mapped(void)
-+{
-+	return global_page_state(NR_FILE_MAPPED) +
-+		global_page_state(NR_ANON_PAGES);
-+}
-+
-+/*
-+ * This examines how large in pages a file size is and returns 1 if it is
-+ * more than half the unmapped ram. Avoid doing read_page_state which is
-+ * expensive unless we already know it is likely to be large enough.
-+ */
-+static int large_isize(unsigned long nr_pages)
-+{
-+	if (nr_pages * 6 > vm_total_pages) {
-+		 unsigned long unmapped_ram = vm_total_pages - nr_mapped();
-+
-+		if (nr_pages * 2 > unmapped_ram)
-+			return 1;
-+	}
-+	return 0;
-+}
-+
- /**
-  * do_generic_file_read - generic file read routine
-  * @filp:	the file to read
-@@ -992,7 +1020,7 @@
- 	pgoff_t prev_index;
- 	unsigned long offset;      /* offset into pagecache page */
- 	unsigned int prev_offset;
--	int error;
-+	int error, tail = 0;
- 
- 	index = *ppos >> PAGE_CACHE_SHIFT;
- 	prev_index = ra->prev_pos >> PAGE_CACHE_SHIFT;
-@@ -1003,7 +1031,7 @@
- 	for (;;) {
- 		struct page *page;
- 		pgoff_t end_index;
--		loff_t isize;
-+		loff_t isize = 0;
- 		unsigned long nr, ret;
- 
- 		cond_resched();
-@@ -1177,8 +1205,16 @@
- 			desc->error = -ENOMEM;
- 			goto out;
- 		}
--		error = add_to_page_cache_lru(page, mapping,
--						index, GFP_KERNEL);
-+		/*
-+		 * If we know the file is large we add the pages read to the
-+		 * end of the lru as we're unlikely to be able to cache the
-+		 * whole file in ram so make those pages the first to be
-+		 * dropped if not referenced soon.
-+		 */
-+		if (large_isize(end_index))
-+			tail = 1;
-+		error = __add_to_page_cache_lru(page, mapping,
-+						index, GFP_KERNEL, tail);
- 		if (error) {
- 			page_cache_release(page);
- 			if (error == -EEXIST)
-Index: linux-2.6.37-ck2/mm/swap.c
-===================================================================
---- linux-2.6.37-ck2.orig/mm/swap.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/mm/swap.c	2011-02-14 10:11:09.772252000 +1100
-@@ -215,15 +215,23 @@
- 
- EXPORT_SYMBOL(mark_page_accessed);
- 
--void __lru_cache_add(struct page *page, enum lru_list lru)
-+void ______pagevec_lru_add(struct pagevec *pvec, enum lru_list lru, int tail);
-+
-+void ____lru_cache_add(struct page *page, enum lru_list lru, int tail)
- {
- 	struct pagevec *pvec = &get_cpu_var(lru_add_pvecs)[lru];
- 
- 	page_cache_get(page);
- 	if (!pagevec_add(pvec, page))
--		____pagevec_lru_add(pvec, lru);
-+		______pagevec_lru_add(pvec, lru, tail);
- 	put_cpu_var(lru_add_pvecs);
- }
-+EXPORT_SYMBOL(____lru_cache_add);
-+
-+void __lru_cache_add(struct page *page, enum lru_list lru)
-+{
-+	____lru_cache_add(page, lru, 0);
-+}
- EXPORT_SYMBOL(__lru_cache_add);
- 
- /**
-@@ -231,7 +239,7 @@
-  * @page: the page to be added to the LRU.
-  * @lru: the LRU list to which the page is added.
-  */
--void lru_cache_add_lru(struct page *page, enum lru_list lru)
-+void __lru_cache_add_lru(struct page *page, enum lru_list lru, int tail)
- {
- 	if (PageActive(page)) {
- 		VM_BUG_ON(PageUnevictable(page));
-@@ -242,7 +250,12 @@
- 	}
- 
- 	VM_BUG_ON(PageLRU(page) || PageActive(page) || PageUnevictable(page));
--	__lru_cache_add(page, lru);
-+	____lru_cache_add(page, lru, tail);
-+}
-+
-+void lru_cache_add_lru(struct page *page, enum lru_list lru)
-+{
-+	__lru_cache_add_lru(page, lru, 0);
- }
- 
- /**
-@@ -403,7 +416,7 @@
-  * Add the passed pages to the LRU, then drop the caller's refcount
-  * on them.  Reinitialises the caller's pagevec.
-  */
--void ____pagevec_lru_add(struct pagevec *pvec, enum lru_list lru)
-+void ______pagevec_lru_add(struct pagevec *pvec, enum lru_list lru, int tail)
- {
- 	int i;
- 	struct zone *zone = NULL;
-@@ -431,7 +444,7 @@
- 		if (active)
- 			SetPageActive(page);
- 		update_page_reclaim_stat(zone, page, file, active);
--		add_page_to_lru_list(zone, page, lru);
-+		__add_page_to_lru_list(zone, page, lru, tail);
- 	}
- 	if (zone)
- 		spin_unlock_irq(&zone->lru_lock);
-@@ -439,6 +452,11 @@
- 	pagevec_reinit(pvec);
- }
- 
-+void ____pagevec_lru_add(struct pagevec *pvec, enum lru_list lru)
-+{
-+	______pagevec_lru_add(pvec, lru, 0);
-+}
-+
- EXPORT_SYMBOL(____pagevec_lru_add);
- 
- /*

packages/linux/patches/linux-2.6.38-rc6-717_preempt-desktop-tune.patch

@@ -1,36 +0,0 @@
----
- kernel/Kconfig.preempt |    7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-Index: linux-2.6.37-ck2/kernel/Kconfig.preempt
-===================================================================
---- linux-2.6.37-ck2.orig/kernel/Kconfig.preempt	2009-06-10 13:05:27.000000000 +1000
-+++ linux-2.6.37-ck2/kernel/Kconfig.preempt	2011-02-14 10:11:11.217252001 +1100
-@@ -1,7 +1,7 @@
- 
- choice
- 	prompt "Preemption Model"
--	default PREEMPT_NONE
-+	default PREEMPT
- 
- config PREEMPT_NONE
- 	bool "No Forced Preemption (Server)"
-@@ -17,7 +17,7 @@
- 	  latencies.
- 
- config PREEMPT_VOLUNTARY
--	bool "Voluntary Kernel Preemption (Desktop)"
-+	bool "Voluntary Kernel Preemption (Nothing)"
- 	help
- 	  This option reduces the latency of the kernel by adding more
- 	  "explicit preemption points" to the kernel code. These new
-@@ -31,7 +31,8 @@
- 	  applications to run more 'smoothly' even when the system is
- 	  under load.
- 
--	  Select this if you are building a kernel for a desktop system.
-+	  Select this for no system in particular (choose Preemptible
-+	  instead on a desktop if you know what's good for you).
- 
- config PREEMPT
- 	bool "Preemptible Kernel (Low-Latency Desktop)"

packages/linux/patches/linux-2.6.38-rc6-718_sched-add-above-background-load-function.patch.disabled

@@ -1,61 +0,0 @@
----
- include/linux/sched.h |    7 +++++++
- kernel/sched_bfs.c    |   20 ++++++++++++++++++++
- 2 files changed, 27 insertions(+)
-
-Index: linux-2.6.37-ck2/include/linux/sched.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/linux/sched.h	2011-02-14 09:47:50.988252000 +1100
-+++ linux-2.6.37-ck2/include/linux/sched.h	2011-02-14 10:11:00.292251999 +1100
-@@ -1558,6 +1558,7 @@
- 	return (p->policy == SCHED_ISO);
- }
- extern void remove_cpu(unsigned long cpu);
-+extern int above_background_load(void);
- #else /* CFS */
- extern int runqueue_is_locked(int cpu);
- #define tsk_seruntime(t)	((t)->se.sum_exec_runtime)
-@@ -1581,6 +1582,12 @@
- static inline void remove_cpu(unsigned long cpu)
- {
- }
-+
-+/* Anyone feel like implementing this? */
-+static inline int above_background_load(void)
-+{
-+	return 1;
-+}
- #endif /* CONFIG_SCHED_BFS */
- 
- /* Future-safe accessor for struct task_struct's cpus_allowed. */
-Index: linux-2.6.37-ck2/kernel/sched_bfs.c
-===================================================================
---- linux-2.6.37-ck2.orig/kernel/sched_bfs.c	2011-02-14 09:53:53.820252000 +1100
-+++ linux-2.6.37-ck2/kernel/sched_bfs.c	2011-02-14 10:11:00.294252001 +1100
-@@ -559,6 +559,26 @@
- 	grq_unlock();
- }
- 
-+/*
-+ * Look for any tasks *anywhere* that are running nice 0 or better. We do
-+ * this lockless for overhead reasons since the occasional wrong result
-+ * is harmless.
-+ */
-+int above_background_load(void)
-+{
-+	struct task_struct *cpu_curr;
-+	unsigned long cpu;
-+
-+	for_each_online_cpu(cpu) {
-+		cpu_curr = cpu_rq(cpu)->curr;
-+		if (unlikely(!cpu_curr))
-+			continue;
-+		if (PRIO_TO_NICE(cpu_curr->static_prio) < 1)
-+			return 1;
-+	}
-+	return 0;
-+}
-+
- #ifndef __ARCH_WANT_UNLOCKED_CTXSW
- static inline void prepare_lock_switch(struct rq *rq, struct task_struct *next)
- {

packages/linux/patches/linux-2.6.38-ti-omap4-000_crosscompile.patch

@@ -0,0 +1,22 @@
+--- linux-2.6.24-rc2.orig/arch/x86/boot/tools/build.c	2007-10-06 12:26:14.000000000 +0200
++++ linux-2.6.24-rc2/arch/x86/boot/tools/build.c	2007-10-06 12:27:36.000000000 +0200
+@@ -29,7 +29,6 @@
+ #include <stdarg.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <sys/sysmacros.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
+@@ -42,6 +41,11 @@
+ #define DEFAULT_MAJOR_ROOT 0
+ #define DEFAULT_MINOR_ROOT 0
+ 
++#undef major
++#define major(dev) ((int)(((dev) >> 8) & 0xff))
++#undef minor
++#define minor(dev) ((int)((dev) & 0xff))
++
+ /* Minimal number of setup sectors */
+ #define SETUP_SECT_MIN 5
+ #define SETUP_SECT_MAX 64

packages/linux/patches/linux-2.6.38-ti-omap4-002_bash_only_feature.patch

@@ -0,0 +1,15 @@
+Index: linux-2.6.16/scripts/gen_initramfs_list.sh
+===================================================================
+--- linux-2.6.16.orig/scripts/gen_initramfs_list.sh	2006-03-20 18:41:34.000000000 +0100
++++ linux-2.6.16/scripts/gen_initramfs_list.sh	2006-03-20 18:42:40.000000000 +0100
+@@ -56,9 +56,7 @@
+ 
+ parse() {
+ 	local location="$1"
+-	local name="${location/${srcdir}//}"
+-	# change '//' into '/'
+-	name="${name//\/\///}"
++	local name="$(echo "$location" | sed -e 's%$srcdir%%' -e 's%//*%/%g')"
+ 	local mode="$2"
+ 	local uid="$3"
+ 	local gid="$4"

packages/linux/patches/linux-2.6.38-ti-omap4-003-no_dev_console.patch

@@ -0,0 +1,20 @@
+diff -Naur linux-2.6.34-rc7/init/main.c linux-2.6.34-rc7.patch/init/main.c
+--- linux-2.6.34-rc7/init/main.c	2010-05-10 03:36:28.000000000 +0200
++++ linux-2.6.34-rc7.patch/init/main.c	2010-05-15 12:28:34.767241760 +0200
+@@ -886,8 +886,14 @@
+ 	do_basic_setup();
+ 
+ 	/* Open the /dev/console on the rootfs, this should never fail */
+-	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
+-		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
++	char *console = "/dev_console";
++
++	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) {
++		sys_mknod(console, S_IFCHR|0600, (TTYAUX_MAJOR<<8)|1);
++		if (sys_open(console, O_RDWR, 0) < 0)
++			printk(KERN_WARNING "Warning: unable to open an initial console.\n");
++		sys_unlink(console);
++	}
+ 
+ 	(void) sys_dup(0);
+ 	(void) sys_dup(0);

packages/linux/patches/linux-2.6.38-ti-omap4-004_lower_undefined_mode_timeout.patch

@@ -0,0 +1,24 @@
+diff -Naur linux-2.6.23-rc9.orig/arch/i386/boot/tty.c linux-2.6.23-rc9/arch/i386/boot/tty.c
+--- linux-2.6.23-rc9.orig/arch/x86/boot/tty.c	2007-10-06 12:26:14.000000000 +0200
++++ linux-2.6.23-rc9/arch/x86/boot/tty.c	2007-10-06 12:37:47.000000000 +0200
+@@ -92,7 +92,7 @@
+ 
+ int getchar_timeout(void)
+ {
+-	int cnt = 30;
++	int cnt = 3;
+ 	int t0, t1;
+ 
+ 	t0 = gettime();
+diff -Naur linux-2.6.23-rc9.orig/arch/i386/boot/video.c linux-2.6.23-rc9/arch/i386/boot/video.c
+--- linux-2.6.23-rc9.orig/arch/x86/boot/video.c	2007-10-06 12:26:14.000000000 +0200
++++ linux-2.6.23-rc9/arch/x86/boot/video.c	2007-10-06 12:36:05.000000000 +0200
+@@ -329,7 +329,7 @@
+ 	unsigned int sel;
+ 
+ 	puts("Press <ENTER> to see video modes available, "
+-	     "<SPACE> to continue, or wait 30 sec\n");
++	     "<SPACE> to continue, or wait 3 sec\n");
+ 
+ 	kbd_flush();
+ 	while (1) {

packages/linux/patches/linux-2.6.38-ti-omap4-005_kconfig_no_timestamp.patch

@@ -0,0 +1,13 @@
+Index: linux-2.6.16/scripts/kconfig/confdata.c
+===================================================================
+--- linux-2.6.16.orig/scripts/kconfig/confdata.c	2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16/scripts/kconfig/confdata.c	2006-03-20 18:47:06.000000000 +0100
+@@ -340,7 +340,7 @@
+ 	int type, l;
+ 	const char *str;
+ 	time_t now;
+-	int use_timestamp = 1;
++	int use_timestamp = 0;
+ 	char *env;
+ 
+ 	dirname[0] = 0;

packages/linux/patches/linux-2.6.38-ti-omap4-006_enable_utf8.patch

@@ -0,0 +1,25 @@
+diff -Naur linux-2.6.31-rc4.orig/fs/fat/inode.c linux-2.6.31-rc4/fs/fat/inode.c
+--- linux-2.6.31-rc4.orig/fs/fat/inode.c	2009-07-25 12:47:41.000000000 +0200
++++ linux-2.6.31-rc4/fs/fat/inode.c	2009-07-25 13:38:18.000000000 +0200
+@@ -979,7 +979,8 @@
+ 	}
+ 	opts->name_check = 'n';
+ 	opts->quiet = opts->showexec = opts->sys_immutable = opts->dotsOK =  0;
+-	opts->utf8 = opts->unicode_xlate = 0;
++	opts->utf8 = 1;
++	opts->unicode_xlate = 0;
+ 	opts->numtail = 1;
+ 	opts->usefree = opts->nocase = 0;
+ 	opts->tz_utc = 0;
+diff -Naur linux-2.6.31-rc4.orig/fs/isofs/inode.c linux-2.6.31-rc4/fs/isofs/inode.c
+--- linux-2.6.31-rc4.orig/fs/isofs/inode.c	2009-07-25 12:47:41.000000000 +0200
++++ linux-2.6.31-rc4/fs/isofs/inode.c	2009-07-25 13:38:49.000000000 +0200
+@@ -377,7 +377,7 @@
+ 	popt->gid = 0;
+ 	popt->uid = 0;
+ 	popt->iocharset = NULL;
+-	popt->utf8 = 0;
++	popt->utf8 = 1;
+ 	popt->overriderockperm = 0;
+ 	popt->session=-1;
+ 	popt->sbsector=-1;

packages/linux/patches/linux-2.6.38-ti-omap4-007_die_floppy_die.patch

@@ -0,0 +1,30 @@
+From 4ff58b642f80dedb20533978123d89b5ac9b1ed5 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle@phobos.i.jkkm.org>
+Date: Tue, 30 Mar 2010 00:04:29 -0400
+Subject: die-floppy-die
+
+Kill the floppy.ko pnp modalias. We were surviving just fine without
+autoloading floppy drivers, tyvm.
+
+Please feel free to register all complaints in the wastepaper bin.
+---
+ drivers/block/floppy.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
+index 90c4038..f4a0b90 100644
+--- a/drivers/block/floppy.c
++++ b/drivers/block/floppy.c
+@@ -4619,8 +4619,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
+ 	{"PNP0700", 0},
+ 	{}
+ };
+-
+-MODULE_DEVICE_TABLE(pnp, floppy_pnpids);
++/* MODULE_DEVICE_TABLE(pnp, floppy_pnpids); */
+ 
+ #else
+ 
+-- 
+1.7.0.1
+

packages/linux/patches/linux-2.6.38.2-000_crosscompile.patch

@@ -0,0 +1,22 @@
+--- linux-2.6.24-rc2.orig/arch/x86/boot/tools/build.c	2007-10-06 12:26:14.000000000 +0200
++++ linux-2.6.24-rc2/arch/x86/boot/tools/build.c	2007-10-06 12:27:36.000000000 +0200
+@@ -29,7 +29,6 @@
+ #include <stdarg.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <sys/sysmacros.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
+@@ -42,6 +41,11 @@
+ #define DEFAULT_MAJOR_ROOT 0
+ #define DEFAULT_MINOR_ROOT 0
+ 
++#undef major
++#define major(dev) ((int)(((dev) >> 8) & 0xff))
++#undef minor
++#define minor(dev) ((int)((dev) & 0xff))
++
+ /* Minimal number of setup sectors */
+ #define SETUP_SECT_MIN 5
+ #define SETUP_SECT_MAX 64

packages/linux/patches/linux-2.6.38.2-002_bash_only_feature.patch

@@ -0,0 +1,15 @@
+Index: linux-2.6.16/scripts/gen_initramfs_list.sh
+===================================================================
+--- linux-2.6.16.orig/scripts/gen_initramfs_list.sh	2006-03-20 18:41:34.000000000 +0100
++++ linux-2.6.16/scripts/gen_initramfs_list.sh	2006-03-20 18:42:40.000000000 +0100
+@@ -56,9 +56,7 @@
+ 
+ parse() {
+ 	local location="$1"
+-	local name="${location/${srcdir}//}"
+-	# change '//' into '/'
+-	name="${name//\/\///}"
++	local name="$(echo "$location" | sed -e 's%$srcdir%%' -e 's%//*%/%g')"
+ 	local mode="$2"
+ 	local uid="$3"
+ 	local gid="$4"

packages/linux/patches/linux-2.6.38.2-003-no_dev_console.patch

@@ -0,0 +1,20 @@
+diff -Naur linux-2.6.34-rc7/init/main.c linux-2.6.34-rc7.patch/init/main.c
+--- linux-2.6.34-rc7/init/main.c	2010-05-10 03:36:28.000000000 +0200
++++ linux-2.6.34-rc7.patch/init/main.c	2010-05-15 12:28:34.767241760 +0200
+@@ -886,8 +886,14 @@
+ 	do_basic_setup();
+ 
+ 	/* Open the /dev/console on the rootfs, this should never fail */
+-	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
+-		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
++	char *console = "/dev_console";
++
++	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) {
++		sys_mknod(console, S_IFCHR|0600, (TTYAUX_MAJOR<<8)|1);
++		if (sys_open(console, O_RDWR, 0) < 0)
++			printk(KERN_WARNING "Warning: unable to open an initial console.\n");
++		sys_unlink(console);
++	}
+ 
+ 	(void) sys_dup(0);
+ 	(void) sys_dup(0);

packages/linux/patches/linux-2.6.38.2-004_lower_undefined_mode_timeout.patch

@@ -0,0 +1,24 @@
+diff -Naur linux-2.6.23-rc9.orig/arch/i386/boot/tty.c linux-2.6.23-rc9/arch/i386/boot/tty.c
+--- linux-2.6.23-rc9.orig/arch/x86/boot/tty.c	2007-10-06 12:26:14.000000000 +0200
++++ linux-2.6.23-rc9/arch/x86/boot/tty.c	2007-10-06 12:37:47.000000000 +0200
+@@ -92,7 +92,7 @@
+ 
+ int getchar_timeout(void)
+ {
+-	int cnt = 30;
++	int cnt = 3;
+ 	int t0, t1;
+ 
+ 	t0 = gettime();
+diff -Naur linux-2.6.23-rc9.orig/arch/i386/boot/video.c linux-2.6.23-rc9/arch/i386/boot/video.c
+--- linux-2.6.23-rc9.orig/arch/x86/boot/video.c	2007-10-06 12:26:14.000000000 +0200
++++ linux-2.6.23-rc9/arch/x86/boot/video.c	2007-10-06 12:36:05.000000000 +0200
+@@ -329,7 +329,7 @@
+ 	unsigned int sel;
+ 
+ 	puts("Press <ENTER> to see video modes available, "
+-	     "<SPACE> to continue, or wait 30 sec\n");
++	     "<SPACE> to continue, or wait 3 sec\n");
+ 
+ 	kbd_flush();
+ 	while (1) {

packages/linux/patches/linux-2.6.38.2-005_kconfig_no_timestamp.patch

@@ -0,0 +1,13 @@
+Index: linux-2.6.16/scripts/kconfig/confdata.c
+===================================================================
+--- linux-2.6.16.orig/scripts/kconfig/confdata.c	2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16/scripts/kconfig/confdata.c	2006-03-20 18:47:06.000000000 +0100
+@@ -340,7 +340,7 @@
+ 	int type, l;
+ 	const char *str;
+ 	time_t now;
+-	int use_timestamp = 1;
++	int use_timestamp = 0;
+ 	char *env;
+ 
+ 	dirname[0] = 0;

packages/linux/patches/linux-2.6.38.2-006_enable_utf8.patch

@@ -0,0 +1,25 @@
+diff -Naur linux-2.6.31-rc4.orig/fs/fat/inode.c linux-2.6.31-rc4/fs/fat/inode.c
+--- linux-2.6.31-rc4.orig/fs/fat/inode.c	2009-07-25 12:47:41.000000000 +0200
++++ linux-2.6.31-rc4/fs/fat/inode.c	2009-07-25 13:38:18.000000000 +0200
+@@ -979,7 +979,8 @@
+ 	}
+ 	opts->name_check = 'n';
+ 	opts->quiet = opts->showexec = opts->sys_immutable = opts->dotsOK =  0;
+-	opts->utf8 = opts->unicode_xlate = 0;
++	opts->utf8 = 1;
++	opts->unicode_xlate = 0;
+ 	opts->numtail = 1;
+ 	opts->usefree = opts->nocase = 0;
+ 	opts->tz_utc = 0;
+diff -Naur linux-2.6.31-rc4.orig/fs/isofs/inode.c linux-2.6.31-rc4/fs/isofs/inode.c
+--- linux-2.6.31-rc4.orig/fs/isofs/inode.c	2009-07-25 12:47:41.000000000 +0200
++++ linux-2.6.31-rc4/fs/isofs/inode.c	2009-07-25 13:38:49.000000000 +0200
+@@ -377,7 +377,7 @@
+ 	popt->gid = 0;
+ 	popt->uid = 0;
+ 	popt->iocharset = NULL;
+-	popt->utf8 = 0;
++	popt->utf8 = 1;
+ 	popt->overriderockperm = 0;
+ 	popt->session=-1;
+ 	popt->sbsector=-1;

packages/linux/patches/linux-2.6.38.2-007_die_floppy_die.patch

@@ -0,0 +1,30 @@
+From 4ff58b642f80dedb20533978123d89b5ac9b1ed5 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle@phobos.i.jkkm.org>
+Date: Tue, 30 Mar 2010 00:04:29 -0400
+Subject: die-floppy-die
+
+Kill the floppy.ko pnp modalias. We were surviving just fine without
+autoloading floppy drivers, tyvm.
+
+Please feel free to register all complaints in the wastepaper bin.
+---
+ drivers/block/floppy.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
+index 90c4038..f4a0b90 100644
+--- a/drivers/block/floppy.c
++++ b/drivers/block/floppy.c
+@@ -4619,8 +4619,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
+ 	{"PNP0700", 0},
+ 	{}
+ };
+-
+-MODULE_DEVICE_TABLE(pnp, floppy_pnpids);
++/* MODULE_DEVICE_TABLE(pnp, floppy_pnpids); */
+ 
+ #else
+ 
+-- 
+1.7.0.1
+