Merge branch 'master' into openelec-ifuse

2025-07-30 14:16:40 +00:00 · 2011-01-05 15:29:54 +01:00 · 2011-01-05 15:29:54 +01:00 · 7f0455c704
commit 7f0455c704
parent 7427b201c3 4800dce6e6
15 changed files with 5 additions and 5 deletions
--- a/packages/linux/meta
+++ b/packages/linux/meta
@ -1,11 +1,11 @@
 PKG_NAME="linux"
-PKG_VERSION="2.6.37-rc8"
+PKG_VERSION="2.6.37"
 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"
 PKG_PRIORITY="optional"
@ -17,6 +17,6 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"

 if [ "$LINUX_NEXT" = "yes" ]; then
-  PKG_VERSION="2.6.37-rc8"
+  PKG_VERSION="2.6.37"
  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-rc8-000_crosscompile.patch
+++ b/packages/linux/patches/linux-2.6.37-rc8-000_crosscompile.patch
--- a/packages/linux/patches/linux-2.6.37-rc8-002_bash_only_feature.patch
+++ b/packages/linux/patches/linux-2.6.37-rc8-002_bash_only_feature.patch
--- a/packages/linux/patches/linux-2.6.37-rc8-003-no_dev_console.patch
+++ b/packages/linux/patches/linux-2.6.37-rc8-003-no_dev_console.patch
--- a/packages/linux/patches/linux-2.6.37-rc8-004_lower_undefined_mode_timeout.patch
+++ b/packages/linux/patches/linux-2.6.37-rc8-004_lower_undefined_mode_timeout.patch
--- a/packages/linux/patches/linux-2.6.37-rc8-005_kconfig_no_timestamp.patch
+++ b/packages/linux/patches/linux-2.6.37-rc8-005_kconfig_no_timestamp.patch
--- a/packages/linux/patches/linux-2.6.37-rc8-006_enable_utf8.patch
+++ b/packages/linux/patches/linux-2.6.37-rc8-006_enable_utf8.patch
--- a/packages/linux/patches/linux-2.6.37-rc8-007_die_floppy_die.patch
+++ b/packages/linux/patches/linux-2.6.37-rc8-007_die_floppy_die.patch
--- a/packages/linux/patches/linux-2.6.37-rc8-008-hda_intel_prealloc_4mb_dmabuffer.patch
+++ b/packages/linux/patches/linux-2.6.37-rc8-008-hda_intel_prealloc_4mb_dmabuffer.patch
--- a/packages/linux/patches/linux-2.6.37-rc8-009_disable_i8042_check_on_apple_mac.patch
+++ b/packages/linux/patches/linux-2.6.37-rc8-009_disable_i8042_check_on_apple_mac.patch
--- a/packages/linux/patches/linux-2.6.37-rc8-050_add_appleir_usb_driver.patch
+++ b/packages/linux/patches/linux-2.6.37-rc8-050_add_appleir_usb_driver.patch
--- a/packages/linux/patches/linux-2.6.37-rc8-052-aureal_remote_quirk-0.1.patch
+++ b/packages/linux/patches/linux-2.6.37-rc8-052-aureal_remote_quirk-0.1.patch
--- a/packages/linux/patches/linux-2.6.37-rc8-053_ati-remote_all_keys_and_keychange-0.1.patch
+++ b/packages/linux/patches/linux-2.6.37-rc8-053_ati-remote_all_keys_and_keychange-0.1.patch
--- a/packages/linux/patches/linux-2.6.37-rc8-110-drm_nouveau_upstream-20101217.patch
+++ b/packages/linux/patches/linux-2.6.37-rc8-110-drm_nouveau_upstream-20101217.patch
--- a/packages/network/ntp/build
+++ b/packages/network/ntp/build
@ -15,6 +15,6 @@ cd $PKG_BUILD
            --with-gnu-ld \
            --without-crypto

-make -C libopts
+make -C sntp/libopts
 make -C ntpd
 make -C ntpdate