Merge remote branch 'upstream/master' into headphones-suite99.3

Conflicts: packages/addons/service/downloadmanager/SABnzbd-Suite/meta
2025-08-03 16:07:51 +00:00 · 2011-08-19 00:52:55 +02:00 · 2011-08-19 00:52:55 +02:00 · b424c4c95c
commit b424c4c95c
parent 4c9c4c6de4 bf34a7306c
27 changed files with 9 additions and 15 deletions
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt
@ -1,3 +1,6 @@
+0.99.3
+- rebuild against fixed 'yenc', 'Cheetah' and 'pyOpenSSL'
+
 0.99.2
 - update to SABnzbd-0.6.7
 - update to SickBeard-e0e8f0e
--- a/packages/linux/meta
+++ b/packages/linux/meta
@ -19,12 +19,12 @@
 ################################################################################

 PKG_NAME="linux"
-PKG_VERSION="3.0.2"
+PKG_VERSION="3.0.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kernel.org"
-PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.0/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="busybox linux-drivers linux-firmware"
 PKG_BUILD_DEPENDS="toolchain busybox-hosttools xz cpio"
 PKG_PRIORITY="optional"
--- a/packages/linux/patches/linux-3.0.3-000_crosscompile.patch
+++ b/packages/linux/patches/linux-3.0.3-000_crosscompile.patch
--- a/packages/linux/patches/linux-3.0.3-003-no_dev_console.patch
+++ b/packages/linux/patches/linux-3.0.3-003-no_dev_console.patch
--- a/packages/linux/patches/linux-3.0.3-004_lower_undefined_mode_timeout.patch
+++ b/packages/linux/patches/linux-3.0.3-004_lower_undefined_mode_timeout.patch
--- a/packages/linux/patches/linux-3.0.3-006_enable_utf8.patch
+++ b/packages/linux/patches/linux-3.0.3-006_enable_utf8.patch
--- a/packages/linux/patches/linux-3.0.3-007_die_floppy_die.patch
+++ b/packages/linux/patches/linux-3.0.3-007_die_floppy_die.patch
--- a/packages/linux/patches/linux-3.0.3-008-hda_intel_prealloc_4mb_dmabuffer.patch
+++ b/packages/linux/patches/linux-3.0.3-008-hda_intel_prealloc_4mb_dmabuffer.patch
--- a/packages/linux/patches/linux-3.0.3-009_disable_i8042_check_on_apple_mac.patch
+++ b/packages/linux/patches/linux-3.0.3-009_disable_i8042_check_on_apple_mac.patch
--- a/packages/linux/patches/linux-3.0.3-050_add_appleir_usb_driver.patch
+++ b/packages/linux/patches/linux-3.0.3-050_add_appleir_usb_driver.patch
--- a/packages/linux/patches/linux-3.0.3-052-aureal_remote_quirk-0.1.patch
+++ b/packages/linux/patches/linux-3.0.3-052-aureal_remote_quirk-0.1.patch
--- a/packages/linux/patches/linux-3.0.3-053-ati_remote-0.1.patch
+++ b/packages/linux/patches/linux-3.0.3-053-ati_remote-0.1.patch
--- a/packages/linux/patches/linux-3.0.3-053_ati-remote_all_keys_and_keychange-0.1.patch
+++ b/packages/linux/patches/linux-3.0.3-053_ati-remote_all_keys_and_keychange-0.1.patch
--- a/packages/linux/patches/linux-3.0.3-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch
+++ b/packages/linux/patches/linux-3.0.3-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch
--- a/packages/linux/patches/linux-3.0.3-055-add_wiimote_hid_driver-0.1.patch
+++ b/packages/linux/patches/linux-3.0.3-055-add_wiimote_hid_driver-0.1.patch
--- a/packages/linux/patches/linux-3.0.3-058-add_rtl2832u_dvb-usb_driver-0.1.patch
+++ b/packages/linux/patches/linux-3.0.3-058-add_rtl2832u_dvb-usb_driver-0.1.patch
--- a/packages/linux/patches/linux-3.0.3-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch
+++ b/packages/linux/patches/linux-3.0.3-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch
--- a/packages/linux/patches/linux-3.0.3-060-fix_dib0700_buffer_access-0.1.patch
+++ b/packages/linux/patches/linux-3.0.3-060-fix_dib0700_buffer_access-0.1.patch
--- a/packages/linux/patches/linux-3.0.3-071-silence_i915_agp-module-0.1.patch
+++ b/packages/linux/patches/linux-3.0.3-071-silence_i915_agp-module-0.1.patch
--- a/packages/linux/patches/linux-3.0.3-072-silence_acpi-0.1.patch
+++ b/packages/linux/patches/linux-3.0.3-072-silence_acpi-0.1.patch
--- a/packages/linux/patches/linux-3.0.3-110-nouveau_drm_update-20110726.patch
+++ b/packages/linux/patches/linux-3.0.3-110-nouveau_drm_update-20110726.patch
--- a/packages/linux/patches/linux-3.0.3-322-omap4_pandaboard_fix_dvi_support-0.1.patch
+++ b/packages/linux/patches/linux-3.0.3-322-omap4_pandaboard_fix_dvi_support-0.1.patch
--- a/packages/linux/patches/linux-3.0.3-716_mm-zero_swappiness.patch
+++ b/packages/linux/patches/linux-3.0.3-716_mm-zero_swappiness.patch
--- a/packages/python/devel/Cheetah/build
+++ b/packages/python/devel/Cheetah/build
@ -28,9 +28,6 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 cd $PKG_BUILD

 python setup.py build --cross-compile
-python setup.py install -O1 --skip-build --prefix /usr --root .install
-
-find .install -name "*.py" -exec rm -rf "{}" ";"
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
+python setup.py install -O0 --no-compile --prefix /usr --root .install

 rm -rf .install/usr/bin
--- a/packages/python/security/pyOpenSSL/build
+++ b/packages/python/security/pyOpenSSL/build
@ -28,9 +28,6 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 cd $PKG_BUILD

 python setup.py build --cross-compile
-python setup.py install -O1 --skip-build --prefix /usr --root .install
-
-find .install -name "*.py" -exec rm -rf "{}" ";"
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
+python setup.py install -O0 --no-compile --prefix /usr --root .install

 rm -rf .install/usr/bin
--- a/packages/python/system/yenc/build
+++ b/packages/python/system/yenc/build
@ -28,9 +28,6 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 cd $PKG_BUILD

 python setup.py build --cross-compile
-python setup.py install -O1 --skip-build --prefix /usr --root .install
-
-find .install -name "*.py" -exec rm -rf "{}" ";"
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
+python setup.py install -O0 --no-compile --prefix /usr --root .install

 rm -rf .install/usr/bin
--- a/packages/x11/driver/xf86-video-fglrx/meta
+++ b/packages/x11/driver/xf86-video-fglrx/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="xf86-video-fglrx"
-PKG_VERSION="11.7"
+PKG_VERSION="11.8"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"