Merge branch 'master' into openelec-1.0

2025-07-24 11:16:51 +00:00 · 2010-12-23 17:50:26 +01:00 · 2010-12-23 17:50:26 +01:00 · 2adf44d221
commit 2adf44d221
parent fc06337ba5 7752bcad3c
17 changed files with 5 additions and 5 deletions
--- a/config/optimize
+++ b/config/optimize
@ -1,5 +1,5 @@
 if [ "$OPTIMIZATIONS" = speed ];then
-  GCC_OPTIM="-O4"
+  GCC_OPTIM="-O3"
  LD_OPTIM=""
 fi

--- a/packages/debug/meta
+++ b/packages/debug/meta
@ -5,7 +5,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="strace gdb mesa-demos tvdump w_scan tools"
+PKG_DEPENDS="strace gdb mesa-demos tvdump w_scan tools htop"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"
--- a/packages/linux/meta
+++ b/packages/linux/meta
@ -1,5 +1,5 @@
 PKG_NAME="linux"
-PKG_VERSION="2.6.37-rc6"
+PKG_VERSION="2.6.37-rc7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@ -17,6 +17,6 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"

 if [ "$LINUX_NEXT" = "yes" ]; then
-  PKG_VERSION="2.6.37-rc6"
+  PKG_VERSION="2.6.37-rc7"
  PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
 fi
--- a/packages/linux/patches/linux-2.6.37-rc7-000_crosscompile.patch
+++ b/packages/linux/patches/linux-2.6.37-rc7-000_crosscompile.patch
--- a/packages/linux/patches/linux-2.6.37-rc7-002_bash_only_feature.patch
+++ b/packages/linux/patches/linux-2.6.37-rc7-002_bash_only_feature.patch
--- a/packages/linux/patches/linux-2.6.37-rc7-003-no_dev_console.patch
+++ b/packages/linux/patches/linux-2.6.37-rc7-003-no_dev_console.patch
--- a/packages/linux/patches/linux-2.6.37-rc7-004_lower_undefined_mode_timeout.patch
+++ b/packages/linux/patches/linux-2.6.37-rc7-004_lower_undefined_mode_timeout.patch
--- a/packages/linux/patches/linux-2.6.37-rc7-005_kconfig_no_timestamp.patch
+++ b/packages/linux/patches/linux-2.6.37-rc7-005_kconfig_no_timestamp.patch
--- a/packages/linux/patches/linux-2.6.37-rc7-006_enable_utf8.patch
+++ b/packages/linux/patches/linux-2.6.37-rc7-006_enable_utf8.patch
--- a/packages/linux/patches/linux-2.6.37-rc7-007_die_floppy_die.patch
+++ b/packages/linux/patches/linux-2.6.37-rc7-007_die_floppy_die.patch
--- a/packages/linux/patches/linux-2.6.37-rc7-008-hda_intel_prealloc_4mb_dmabuffer.patch
+++ b/packages/linux/patches/linux-2.6.37-rc7-008-hda_intel_prealloc_4mb_dmabuffer.patch
--- a/packages/linux/patches/linux-2.6.37-rc7-009_disable_i8042_check_on_apple_mac.patch
+++ b/packages/linux/patches/linux-2.6.37-rc7-009_disable_i8042_check_on_apple_mac.patch
--- a/packages/linux/patches/linux-2.6.37-rc7-050_add_appleir_usb_driver.patch
+++ b/packages/linux/patches/linux-2.6.37-rc7-050_add_appleir_usb_driver.patch
--- a/packages/linux/patches/linux-2.6.37-rc7-052-aureal_remote_quirk-0.1.patch
+++ b/packages/linux/patches/linux-2.6.37-rc7-052-aureal_remote_quirk-0.1.patch
--- a/packages/linux/patches/linux-2.6.37-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch
+++ b/packages/linux/patches/linux-2.6.37-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch
--- a/packages/linux/patches/linux-2.6.37-rc7-110-drm_nouveau_upstream-20101217.patch
+++ b/packages/linux/patches/linux-2.6.37-rc7-110-drm_nouveau_upstream-20101217.patch
--- a/packages/tools/meta
+++ b/packages/tools/meta
@ -5,7 +5,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="htop nano wgetpaste evtest"
+PKG_DEPENDS="nano wgetpaste evtest"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"