diff --git a/packages/devel/glib/meta b/packages/devel/glib/meta index 3791dc2a4e..983d182651 100644 --- a/packages/devel/glib/meta +++ b/packages/devel/glib/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="glib" -PKG_VERSION="2.28.0" +PKG_VERSION="2.28.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" diff --git a/packages/devel/glib/patches/glib-2.28.1-linux_magic_h.patch b/packages/devel/glib/patches/glib-2.28.1-linux_magic_h.patch new file mode 100644 index 0000000000..10cc356846 --- /dev/null +++ b/packages/devel/glib/patches/glib-2.28.1-linux_magic_h.patch @@ -0,0 +1,24 @@ +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 ++#endif + #include + #endif + diff --git a/packages/linux/meta b/packages/linux/meta index 933fd6a683..435c1f1921 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux" -PKG_VERSION="2.6.37" +PKG_VERSION="2.6.37.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux/patches/linux-2.6.37-072-commit_ff2f078_fix.patch b/packages/linux/patches/linux-2.6.37-072-commit_ff2f078_fix.patch deleted file mode 100644 index 5566c41b02..0000000000 --- a/packages/linux/patches/linux-2.6.37-072-commit_ff2f078_fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur linux-2.6.37-old/drivers/usb/core/hcd.c linux-2.6.37-new/drivers/usb/core/hcd.c ---- linux-2.6.37-old/drivers/usb/core/hcd.c 2011-01-04 16:50:19.000000000 -0800 -+++ linux-2.6.37-new/drivers/usb/core/hcd.c 2011-01-30 20:06:09.000000000 -0800 -@@ -1956,7 +1956,6 @@ - - dev_dbg(&rhdev->dev, "usb %s%s\n", - (msg.event & PM_EVENT_AUTO ? "auto-" : ""), "resume"); -- clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags); - if (!hcd->driver->bus_resume) - return -ENOENT; - if (hcd->state == HC_STATE_RUNNING) -@@ -1964,6 +1963,7 @@ - - hcd->state = HC_STATE_RESUMING; - status = hcd->driver->bus_resume(hcd); -+ clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags); - if (status == 0) { - /* TRSMRCY = 10 msec */ - msleep(10); diff --git a/packages/linux/patches/linux-2.6.37-000_crosscompile.patch b/packages/linux/patches/linux-2.6.37.1-000_crosscompile.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-000_crosscompile.patch rename to packages/linux/patches/linux-2.6.37.1-000_crosscompile.patch diff --git a/packages/linux/patches/linux-2.6.37-002_bash_only_feature.patch b/packages/linux/patches/linux-2.6.37.1-002_bash_only_feature.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-002_bash_only_feature.patch rename to packages/linux/patches/linux-2.6.37.1-002_bash_only_feature.patch diff --git a/packages/linux/patches/linux-2.6.37-003-no_dev_console.patch b/packages/linux/patches/linux-2.6.37.1-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-003-no_dev_console.patch rename to packages/linux/patches/linux-2.6.37.1-003-no_dev_console.patch diff --git a/packages/linux/patches/linux-2.6.37-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-2.6.37.1-004_lower_undefined_mode_timeout.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-004_lower_undefined_mode_timeout.patch rename to packages/linux/patches/linux-2.6.37.1-004_lower_undefined_mode_timeout.patch diff --git a/packages/linux/patches/linux-2.6.37-005_kconfig_no_timestamp.patch b/packages/linux/patches/linux-2.6.37.1-005_kconfig_no_timestamp.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-005_kconfig_no_timestamp.patch rename to packages/linux/patches/linux-2.6.37.1-005_kconfig_no_timestamp.patch diff --git a/packages/linux/patches/linux-2.6.37-006_enable_utf8.patch b/packages/linux/patches/linux-2.6.37.1-006_enable_utf8.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-006_enable_utf8.patch rename to packages/linux/patches/linux-2.6.37.1-006_enable_utf8.patch diff --git a/packages/linux/patches/linux-2.6.37-007_die_floppy_die.patch b/packages/linux/patches/linux-2.6.37.1-007_die_floppy_die.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-007_die_floppy_die.patch rename to packages/linux/patches/linux-2.6.37.1-007_die_floppy_die.patch diff --git a/packages/linux/patches/linux-2.6.37-008-hda_intel_prealloc_4mb_dmabuffer.patch b/packages/linux/patches/linux-2.6.37.1-008-hda_intel_prealloc_4mb_dmabuffer.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-008-hda_intel_prealloc_4mb_dmabuffer.patch rename to packages/linux/patches/linux-2.6.37.1-008-hda_intel_prealloc_4mb_dmabuffer.patch diff --git a/packages/linux/patches/linux-2.6.37-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-2.6.37.1-009_disable_i8042_check_on_apple_mac.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-009_disable_i8042_check_on_apple_mac.patch rename to packages/linux/patches/linux-2.6.37.1-009_disable_i8042_check_on_apple_mac.patch diff --git a/packages/linux/patches/linux-2.6.37-050_add_appleir_usb_driver.patch b/packages/linux/patches/linux-2.6.37.1-050_add_appleir_usb_driver.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-050_add_appleir_usb_driver.patch rename to packages/linux/patches/linux-2.6.37.1-050_add_appleir_usb_driver.patch diff --git a/packages/linux/patches/linux-2.6.37-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-2.6.37.1-052-aureal_remote_quirk-0.1.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-052-aureal_remote_quirk-0.1.patch rename to packages/linux/patches/linux-2.6.37.1-052-aureal_remote_quirk-0.1.patch diff --git a/packages/linux/patches/linux-2.6.37-053_ati-remote_all_keys_and_keychange-0.1.patch b/packages/linux/patches/linux-2.6.37.1-053_ati-remote_all_keys_and_keychange-0.1.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-053_ati-remote_all_keys_and_keychange-0.1.patch rename to packages/linux/patches/linux-2.6.37.1-053_ati-remote_all_keys_and_keychange-0.1.patch diff --git a/packages/linux/patches/linux-2.6.37-061-Pioneer_DVR-212D_failed_xfermode-0.1.patch b/packages/linux/patches/linux-2.6.37.1-061-Pioneer_DVR-212D_failed_xfermode-0.1.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-061-Pioneer_DVR-212D_failed_xfermode-0.1.patch rename to packages/linux/patches/linux-2.6.37.1-061-Pioneer_DVR-212D_failed_xfermode-0.1.patch diff --git a/packages/linux/patches/linux-2.6.37-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch b/packages/linux/patches/linux-2.6.37.1-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch rename to packages/linux/patches/linux-2.6.37.1-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch diff --git a/packages/linux/patches/linux-2.6.37-071-fstrim-0.1.patch b/packages/linux/patches/linux-2.6.37.1-071-fstrim-0.1.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-071-fstrim-0.1.patch rename to packages/linux/patches/linux-2.6.37.1-071-fstrim-0.1.patch diff --git a/packages/linux/patches/linux-2.6.37-110-drm_nouveau_upstream-20110111.patch b/packages/linux/patches/linux-2.6.37.1-110-drm_nouveau_upstream-20110111.patch similarity index 100% rename from packages/linux/patches/linux-2.6.37-110-drm_nouveau_upstream-20110111.patch rename to packages/linux/patches/linux-2.6.37.1-110-drm_nouveau_upstream-20110111.patch diff --git a/packages/linux/patches/linux-2.6.37-700_701-730_BFS_patches.txt b/packages/linux/patches/linux-2.6.37.1-700_701-730_BFS_patches.txt similarity index 90% rename from packages/linux/patches/linux-2.6.37-700_701-730_BFS_patches.txt rename to packages/linux/patches/linux-2.6.37.1-700_701-730_BFS_patches.txt index 522c0c6573..1e9f6475cc 100644 --- a/packages/linux/patches/linux-2.6.37-700_701-730_BFS_patches.txt +++ b/packages/linux/patches/linux-2.6.37.1-700_701-730_BFS_patches.txt @@ -1,8 +1,8 @@ http://www.kernel.org/pub/linux/kernel/people/ck/patches/2.6/2.6.37/2.6.37-ck1/patches/ 2.6.37-sched-bfs-363.patch +2637-bfs363-nonhotplug_fix.patch sched-add-above-background-load-function.patch -mm-make_swappiness_really_mean_it.patch mm-zero_swappiness.patch mm-enable_swaptoken_only_when_swap_full.patch mm-drop_swap_cache_aggressively.patch @@ -17,4 +17,4 @@ hz-no_default_250.patch hz-raise_max.patch preempt-desktop-tune.patch cpufreq-bfs_tweaks.patch -ck1-version.patch +ck2-version.patch diff --git a/packages/linux/patches/linux-2.6.37-701_sched-bfs-363.patch b/packages/linux/patches/linux-2.6.37.1-701_sched-bfs-363.patch similarity index 97% rename from packages/linux/patches/linux-2.6.37-701_sched-bfs-363.patch rename to packages/linux/patches/linux-2.6.37.1-701_sched-bfs-363.patch index 9b7bfc7e06..77a4076fdc 100644 --- a/packages/linux/patches/linux-2.6.37-701_sched-bfs-363.patch +++ b/packages/linux/patches/linux-2.6.37.1-701_sched-bfs-363.patch @@ -46,11 +46,11 @@ cpu usage may be very different if you have very short lived tasks. lib/Kconfig.debug | 2 18 files changed, 7812 insertions(+), 27 deletions(-) -Index: linux-2.6.37-ck1/arch/powerpc/platforms/cell/spufs/sched.c +Index: linux-2.6.37-ck2/arch/powerpc/platforms/cell/spufs/sched.c =================================================================== ---- linux-2.6.37-ck1.orig/arch/powerpc/platforms/cell/spufs/sched.c 2010-05-17 18:51:19.000000000 +1000 -+++ linux-2.6.37-ck1/arch/powerpc/platforms/cell/spufs/sched.c 2011-01-06 14:07:00.646901367 +1100 -@@ -64,11 +64,6 @@ static struct timer_list spusched_timer; +--- linux-2.6.37-ck2.orig/arch/powerpc/platforms/cell/spufs/sched.c 2010-05-17 18:51:19.000000000 +1000 ++++ linux-2.6.37-ck2/arch/powerpc/platforms/cell/spufs/sched.c 2011-02-14 09:47:50.982252001 +1100 +@@ -64,11 +64,6 @@ static struct timer_list spuloadavg_timer; /* @@ -62,10 +62,10 @@ Index: linux-2.6.37-ck1/arch/powerpc/platforms/cell/spufs/sched.c * Frequency of the spu scheduler tick. By default we do one SPU scheduler * tick for every 10 CPU scheduler ticks. */ -Index: linux-2.6.37-ck1/Documentation/scheduler/sched-BFS.txt +Index: linux-2.6.37-ck2/Documentation/scheduler/sched-BFS.txt =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.37-ck1/Documentation/scheduler/sched-BFS.txt 2011-01-06 14:07:00.647901426 +1100 ++++ linux-2.6.37-ck2/Documentation/scheduler/sched-BFS.txt 2011-02-14 09:47:50.984252001 +1100 @@ -0,0 +1,351 @@ +BFS - The Brain Fuck Scheduler by Con Kolivas. + @@ -418,11 +418,11 @@ Index: linux-2.6.37-ck1/Documentation/scheduler/sched-BFS.txt + + +Con Kolivas Fri Aug 27 2010 -Index: linux-2.6.37-ck1/Documentation/sysctl/kernel.txt +Index: linux-2.6.37-ck2/Documentation/sysctl/kernel.txt =================================================================== ---- linux-2.6.37-ck1.orig/Documentation/sysctl/kernel.txt 2011-01-06 14:04:07.607634467 +1100 -+++ linux-2.6.37-ck1/Documentation/sysctl/kernel.txt 2011-01-06 14:07:00.647901426 +1100 -@@ -32,6 +32,7 @@ show up in /proc/sys/kernel: +--- linux-2.6.37-ck2.orig/Documentation/sysctl/kernel.txt 2011-01-06 14:04:07.000000000 +1100 ++++ linux-2.6.37-ck2/Documentation/sysctl/kernel.txt 2011-02-14 09:47:50.984252001 +1100 +@@ -32,6 +32,7 @@ - domainname - hostname - hotplug @@ -430,7 +430,7 @@ Index: linux-2.6.37-ck1/Documentation/sysctl/kernel.txt - java-appletviewer [ binfmt_java, obsolete ] - java-interpreter [ binfmt_java, obsolete ] - kstack_depth_to_print [ X86 only ] -@@ -54,6 +55,7 @@ show up in /proc/sys/kernel: +@@ -54,6 +55,7 @@ - randomize_va_space - real-root-dev ==> Documentation/initrd.txt - reboot-cmd [ SPARC only ] @@ -438,7 +438,7 @@ Index: linux-2.6.37-ck1/Documentation/sysctl/kernel.txt - rtsig-max - rtsig-nr - sem -@@ -254,6 +256,16 @@ Default value is "/sbin/hotplug". +@@ -254,6 +256,16 @@ ============================================================== @@ -455,7 +455,7 @@ Index: linux-2.6.37-ck1/Documentation/sysctl/kernel.txt l2cr: (PPC only) This flag controls the L2 cache of G3 processor boards. If -@@ -428,6 +440,20 @@ rebooting. ??? +@@ -428,6 +440,20 @@ ============================================================== @@ -476,11 +476,11 @@ Index: linux-2.6.37-ck1/Documentation/sysctl/kernel.txt rtsig-max & rtsig-nr: The file rtsig-max can be used to tune the maximum number -Index: linux-2.6.37-ck1/fs/proc/base.c +Index: linux-2.6.37-ck2/fs/proc/base.c =================================================================== ---- linux-2.6.37-ck1.orig/fs/proc/base.c 2011-01-06 14:04:10.387799279 +1100 -+++ linux-2.6.37-ck1/fs/proc/base.c 2011-01-06 14:07:00.647901426 +1100 -@@ -356,7 +356,7 @@ static int proc_pid_stack(struct seq_fil +--- linux-2.6.37-ck2.orig/fs/proc/base.c 2011-01-06 14:04:10.000000000 +1100 ++++ linux-2.6.37-ck2/fs/proc/base.c 2011-02-14 09:47:50.986252000 +1100 +@@ -356,7 +356,7 @@ static int proc_pid_schedstat(struct task_struct *task, char *buffer) { return sprintf(buffer, "%llu %llu %lu\n", @@ -489,11 +489,11 @@ Index: linux-2.6.37-ck1/fs/proc/base.c (unsigned long long)task->sched_info.run_delay, task->sched_info.pcount); } -Index: linux-2.6.37-ck1/include/linux/init_task.h +Index: linux-2.6.37-ck2/include/linux/init_task.h =================================================================== ---- linux-2.6.37-ck1.orig/include/linux/init_task.h 2011-01-06 14:04:10.453803192 +1100 -+++ linux-2.6.37-ck1/include/linux/init_task.h 2011-01-06 14:07:00.648901485 +1100 -@@ -114,6 +114,67 @@ extern struct cred init_cred; +--- linux-2.6.37-ck2.orig/include/linux/init_task.h 2011-01-06 14:04:10.000000000 +1100 ++++ linux-2.6.37-ck2/include/linux/init_task.h 2011-02-14 09:47:50.986252001 +1100 +@@ -114,6 +114,67 @@ * INIT_TASK is used to set up the first task table, touch at * your own risk!. Base=0, limit=0x1fffff (=2MB) */ @@ -561,7 +561,7 @@ Index: linux-2.6.37-ck1/include/linux/init_task.h #define INIT_TASK(tsk) \ { \ .state = 0, \ -@@ -179,7 +240,7 @@ extern struct cred init_cred; +@@ -179,7 +240,7 @@ INIT_TRACE_RECURSION \ INIT_TASK_RCU_PREEMPT(tsk) \ } @@ -570,11 +570,11 @@ Index: linux-2.6.37-ck1/include/linux/init_task.h #define INIT_CPU_TIMERS(cpu_timers) \ { \ -Index: linux-2.6.37-ck1/include/linux/ioprio.h +Index: linux-2.6.37-ck2/include/linux/ioprio.h =================================================================== ---- linux-2.6.37-ck1.orig/include/linux/ioprio.h 2009-06-10 13:05:27.000000000 +1000 -+++ linux-2.6.37-ck1/include/linux/ioprio.h 2011-01-06 14:07:00.648901485 +1100 -@@ -64,6 +64,8 @@ static inline int task_ioprio_class(stru +--- linux-2.6.37-ck2.orig/include/linux/ioprio.h 2009-06-10 13:05:27.000000000 +1000 ++++ linux-2.6.37-ck2/include/linux/ioprio.h 2011-02-14 09:47:50.986252001 +1100 +@@ -64,6 +64,8 @@ static inline int task_nice_ioprio(struct task_struct *task) { @@ -583,10 +583,10 @@ Index: linux-2.6.37-ck1/include/linux/ioprio.h return (task_nice(task) + 20) / 5; } -Index: linux-2.6.37-ck1/include/linux/sched.h +Index: linux-2.6.37-ck2/include/linux/sched.h =================================================================== ---- linux-2.6.37-ck1.orig/include/linux/sched.h 2011-01-06 14:04:10.485805089 +1100 -+++ linux-2.6.37-ck1/include/linux/sched.h 2011-01-06 14:07:00.648901485 +1100 +--- linux-2.6.37-ck2.orig/include/linux/sched.h 2011-01-06 14:04:10.000000000 +1100 ++++ linux-2.6.37-ck2/include/linux/sched.h 2011-02-14 09:47:50.988252000 +1100 @@ -36,8 +36,15 @@ #define SCHED_FIFO 1 #define SCHED_RR 2 @@ -604,7 +604,7 @@ Index: linux-2.6.37-ck1/include/linux/sched.h /* Can be ORed in to make sure the process is reverted back to SCHED_NORMAL on fork */ #define SCHED_RESET_ON_FORK 0x40000000 -@@ -268,8 +275,6 @@ extern asmlinkage void schedule_tail(str +@@ -268,8 +275,6 @@ extern void init_idle(struct task_struct *idle, int cpu); extern void init_idle_bootup_task(struct task_struct *idle); @@ -613,7 +613,7 @@ Index: linux-2.6.37-ck1/include/linux/sched.h extern cpumask_var_t nohz_cpu_mask; #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ) extern void select_nohz_load_balancer(int stop_tick); -@@ -1188,17 +1193,31 @@ struct task_struct { +@@ -1188,17 +1193,31 @@ int lock_depth; /* BKL lock depth */ @@ -645,7 +645,7 @@ Index: linux-2.6.37-ck1/include/linux/sched.h #ifdef CONFIG_PREEMPT_NOTIFIERS /* list of struct preempt_notifier: */ -@@ -1295,6 +1314,9 @@ struct task_struct { +@@ -1295,6 +1314,9 @@ int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */ cputime_t utime, stime, utimescaled, stimescaled; @@ -655,7 +655,7 @@ Index: linux-2.6.37-ck1/include/linux/sched.h cputime_t gtime; #ifndef CONFIG_VIRT_CPU_ACCOUNTING cputime_t prev_utime, prev_stime; -@@ -1514,6 +1536,53 @@ struct task_struct { +@@ -1514,6 +1536,53 @@ #endif }; @@ -709,7 +709,7 @@ Index: linux-2.6.37-ck1/include/linux/sched.h /* Future-safe accessor for struct task_struct's cpus_allowed. */ #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed) -@@ -1531,10 +1600,20 @@ struct task_struct { +@@ -1531,10 +1600,20 @@ */ #define MAX_USER_RT_PRIO 100 @@ -732,7 +732,7 @@ Index: linux-2.6.37-ck1/include/linux/sched.h static inline int rt_prio(int prio) { -@@ -1862,7 +1941,7 @@ task_sched_runtime(struct task_struct *t +@@ -1862,7 +1941,7 @@ extern unsigned long long thread_group_sched_runtime(struct task_struct *task); /* sched_exec is called by processes performing an exec */ @@ -741,11 +741,11 @@ Index: linux-2.6.37-ck1/include/linux/sched.h extern void sched_exec(void); #else #define sched_exec() {} -Index: linux-2.6.37-ck1/init/Kconfig +Index: linux-2.6.37-ck2/init/Kconfig =================================================================== ---- linux-2.6.37-ck1.orig/init/Kconfig 2011-01-06 14:04:10.526807520 +1100 -+++ linux-2.6.37-ck1/init/Kconfig 2011-01-06 14:07:00.648901485 +1100 -@@ -30,6 +30,19 @@ config IRQ_WORK +--- linux-2.6.37-ck2.orig/init/Kconfig 2011-01-06 14:04:10.000000000 +1100 ++++ linux-2.6.37-ck2/init/Kconfig 2011-02-14 09:47:50.988252001 +1100 +@@ -30,6 +30,19 @@ menu "General setup" @@ -765,7 +765,7 @@ Index: linux-2.6.37-ck1/init/Kconfig config EXPERIMENTAL bool "Prompt for development and/or incomplete code/drivers" ---help--- -@@ -563,6 +576,7 @@ config PROC_PID_CPUSET +@@ -563,6 +576,7 @@ config CGROUP_CPUACCT bool "Simple CPU accounting cgroup subsystem" @@ -773,7 +773,7 @@ Index: linux-2.6.37-ck1/init/Kconfig help Provides a simple Resource Controller for monitoring the total CPU consumed by the tasks in a cgroup. -@@ -629,7 +643,7 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED +@@ -629,7 +643,7 @@ menuconfig CGROUP_SCHED bool "Group CPU scheduler" @@ -782,11 +782,11 @@ Index: linux-2.6.37-ck1/init/Kconfig default n help This feature lets CPU scheduler recognize task groups and control CPU -Index: linux-2.6.37-ck1/init/main.c +Index: linux-2.6.37-ck2/init/main.c =================================================================== ---- linux-2.6.37-ck1.orig/init/main.c 2011-01-06 14:04:10.527807579 +1100 -+++ linux-2.6.37-ck1/init/main.c 2011-01-06 14:07:00.649901545 +1100 -@@ -824,6 +824,7 @@ static noinline int init_post(void) +--- linux-2.6.37-ck2.orig/init/main.c 2011-01-06 14:04:10.000000000 +1100 ++++ linux-2.6.37-ck2/init/main.c 2011-02-14 09:47:50.989252001 +1100 +@@ -824,6 +824,7 @@ system_state = SYSTEM_RUNNING; numa_default_policy(); @@ -794,11 +794,11 @@ Index: linux-2.6.37-ck1/init/main.c current->signal->flags |= SIGNAL_UNKILLABLE; -Index: linux-2.6.37-ck1/kernel/delayacct.c +Index: linux-2.6.37-ck2/kernel/delayacct.c =================================================================== ---- linux-2.6.37-ck1.orig/kernel/delayacct.c 2009-12-03 21:40:09.000000000 +1100 -+++ linux-2.6.37-ck1/kernel/delayacct.c 2011-01-06 14:07:00.649901545 +1100 -@@ -128,7 +128,7 @@ int __delayacct_add_tsk(struct taskstats +--- linux-2.6.37-ck2.orig/kernel/delayacct.c 2009-12-03 21:40:09.000000000 +1100 ++++ linux-2.6.37-ck2/kernel/delayacct.c 2011-02-14 09:47:50.989252001 +1100 +@@ -128,7 +128,7 @@ */ t1 = tsk->sched_info.pcount; t2 = tsk->sched_info.run_delay; @@ -807,11 +807,11 @@ Index: linux-2.6.37-ck1/kernel/delayacct.c d->cpu_count += t1; -Index: linux-2.6.37-ck1/kernel/exit.c +Index: linux-2.6.37-ck2/kernel/exit.c =================================================================== ---- linux-2.6.37-ck1.orig/kernel/exit.c 2011-01-06 14:04:10.534807992 +1100 -+++ linux-2.6.37-ck1/kernel/exit.c 2011-01-06 14:07:00.649901545 +1100 -@@ -132,7 +132,7 @@ static void __exit_signal(struct task_st +--- linux-2.6.37-ck2.orig/kernel/exit.c 2011-01-06 14:04:10.000000000 +1100 ++++ linux-2.6.37-ck2/kernel/exit.c 2011-02-14 09:47:50.989252001 +1100 +@@ -132,7 +132,7 @@ sig->inblock += task_io_get_inblock(tsk); sig->oublock += task_io_get_oublock(tsk); task_io_accounting_add(&sig->ioac, &tsk->ioac); @@ -820,11 +820,11 @@ Index: linux-2.6.37-ck1/kernel/exit.c } sig->nr_threads--; -Index: linux-2.6.37-ck1/kernel/kthread.c +Index: linux-2.6.37-ck2/kernel/kthread.c =================================================================== ---- linux-2.6.37-ck1.orig/kernel/kthread.c 2011-01-06 14:04:10.540808350 +1100 -+++ linux-2.6.37-ck1/kernel/kthread.c 2011-01-06 14:07:00.649901545 +1100 -@@ -184,7 +184,9 @@ void kthread_bind(struct task_struct *p, +--- linux-2.6.37-ck2.orig/kernel/kthread.c 2011-01-06 14:04:10.000000000 +1100 ++++ linux-2.6.37-ck2/kernel/kthread.c 2011-02-14 09:47:50.989252001 +1100 +@@ -184,7 +184,9 @@ } p->cpus_allowed = cpumask_of_cpu(cpu); @@ -834,11 +834,11 @@ Index: linux-2.6.37-ck1/kernel/kthread.c p->flags |= PF_THREAD_BOUND; } EXPORT_SYMBOL(kthread_bind); -Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c +Index: linux-2.6.37-ck2/kernel/posix-cpu-timers.c =================================================================== ---- linux-2.6.37-ck1.orig/kernel/posix-cpu-timers.c 2011-01-06 14:04:10.544808586 +1100 -+++ linux-2.6.37-ck1/kernel/posix-cpu-timers.c 2011-01-06 14:07:00.650901605 +1100 -@@ -248,7 +248,7 @@ void thread_group_cputime(struct task_st +--- linux-2.6.37-ck2.orig/kernel/posix-cpu-timers.c 2011-01-06 14:04:10.000000000 +1100 ++++ linux-2.6.37-ck2/kernel/posix-cpu-timers.c 2011-02-14 09:47:50.990252001 +1100 +@@ -248,7 +248,7 @@ do { times->utime = cputime_add(times->utime, t->utime); times->stime = cputime_add(times->stime, t->stime); @@ -847,7 +847,7 @@ Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c } while_each_thread(tsk, t); out: rcu_read_unlock(); -@@ -508,7 +508,7 @@ static void cleanup_timers(struct list_h +@@ -508,7 +508,7 @@ void posix_cpu_timers_exit(struct task_struct *tsk) { cleanup_timers(tsk->cpu_timers, @@ -856,7 +856,7 @@ Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c } void posix_cpu_timers_exit_group(struct task_struct *tsk) -@@ -518,7 +518,7 @@ void posix_cpu_timers_exit_group(struct +@@ -518,7 +518,7 @@ cleanup_timers(tsk->signal->cpu_timers, cputime_add(tsk->utime, sig->utime), cputime_add(tsk->stime, sig->stime), @@ -865,7 +865,7 @@ Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c } static void clear_dead_task(struct k_itimer *timer, union cpu_time_count now) -@@ -949,7 +949,7 @@ static void check_thread_timers(struct t +@@ -949,7 +949,7 @@ struct cpu_timer_list *t = list_first_entry(timers, struct cpu_timer_list, entry); @@ -874,7 +874,7 @@ Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c tsk->cputime_expires.sched_exp = t->expires.sched; break; } -@@ -966,7 +966,7 @@ static void check_thread_timers(struct t +@@ -966,7 +966,7 @@ ACCESS_ONCE(sig->rlim[RLIMIT_RTTIME].rlim_max); if (hard != RLIM_INFINITY && @@ -883,7 +883,7 @@ Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c /* * At the hard limit, we just die. * No need to calculate anything else now. -@@ -974,7 +974,7 @@ static void check_thread_timers(struct t +@@ -974,7 +974,7 @@ __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk); return; } @@ -892,7 +892,7 @@ Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c /* * At the soft limit, send a SIGXCPU every second. */ -@@ -1276,7 +1276,7 @@ static inline int fastpath_timer_check(s +@@ -1276,7 +1276,7 @@ struct task_cputime task_sample = { .utime = tsk->utime, .stime = tsk->stime, @@ -901,10 +901,10 @@ Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c }; if (task_cputime_expired(&task_sample, &tsk->cputime_expires)) -Index: linux-2.6.37-ck1/kernel/sched_bfs.c +Index: linux-2.6.37-ck2/kernel/sched_bfs.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.37-ck1/kernel/sched_bfs.c 2011-01-06 14:07:00.653901784 +1100 ++++ linux-2.6.37-ck2/kernel/sched_bfs.c 2011-02-14 09:47:50.993252001 +1100 @@ -0,0 +1,7223 @@ +/* + * kernel/sched_bfs.c, was sched.c @@ -8129,10 +8129,10 @@ Index: linux-2.6.37-ck1/kernel/sched_bfs.c + return smt_gain; +} +#endif -Index: linux-2.6.37-ck1/kernel/sched.c +Index: linux-2.6.37-ck2/kernel/sched.c =================================================================== ---- linux-2.6.37-ck1.orig/kernel/sched.c 2011-01-06 14:04:10.552809062 +1100 -+++ linux-2.6.37-ck1/kernel/sched.c 2011-01-06 14:07:00.654901843 +1100 +--- linux-2.6.37-ck2.orig/kernel/sched.c 2011-01-06 14:04:10.000000000 +1100 ++++ linux-2.6.37-ck2/kernel/sched.c 2011-02-14 09:47:50.994252001 +1100 @@ -1,3 +1,6 @@ +#ifdef CONFIG_SCHED_BFS +#include "sched_bfs.c" @@ -8140,16 +8140,16 @@ Index: linux-2.6.37-ck1/kernel/sched.c /* * kernel/sched.c * -@@ -9603,3 +9606,4 @@ void synchronize_sched_expedited(void) +@@ -9603,3 +9606,4 @@ EXPORT_SYMBOL_GPL(synchronize_sched_expedited); #endif /* #else #ifndef CONFIG_SMP */ +#endif /* CONFIG_SCHED_BFS */ -Index: linux-2.6.37-ck1/kernel/sysctl.c +Index: linux-2.6.37-ck2/kernel/sysctl.c =================================================================== ---- linux-2.6.37-ck1.orig/kernel/sysctl.c 2011-01-06 14:04:10.555809239 +1100 -+++ linux-2.6.37-ck1/kernel/sysctl.c 2011-01-06 14:07:00.654901843 +1100 -@@ -117,7 +117,12 @@ static int zero; +--- linux-2.6.37-ck2.orig/kernel/sysctl.c 2011-01-06 14:04:10.000000000 +1100 ++++ linux-2.6.37-ck2/kernel/sysctl.c 2011-02-14 09:47:50.995252001 +1100 +@@ -117,7 +117,12 @@ static int __maybe_unused one = 1; static int __maybe_unused two = 2; static unsigned long one_ul = 1; @@ -8163,7 +8163,7 @@ Index: linux-2.6.37-ck1/kernel/sysctl.c #ifdef CONFIG_PRINTK static int ten_thousand = 10000; #endif -@@ -252,7 +257,7 @@ static struct ctl_table root_table[] = { +@@ -252,7 +257,7 @@ { } }; @@ -8172,7 +8172,7 @@ Index: linux-2.6.37-ck1/kernel/sysctl.c static int min_sched_granularity_ns = 100000; /* 100 usecs */ static int max_sched_granularity_ns = NSEC_PER_SEC; /* 1 second */ static int min_wakeup_granularity_ns; /* 0 usecs */ -@@ -269,6 +274,7 @@ static int max_extfrag_threshold = 1000; +@@ -269,6 +274,7 @@ #endif static struct ctl_table kern_table[] = { @@ -8180,7 +8180,7 @@ Index: linux-2.6.37-ck1/kernel/sysctl.c { .procname = "sched_child_runs_first", .data = &sysctl_sched_child_runs_first, -@@ -382,6 +388,7 @@ static struct ctl_table kern_table[] = { +@@ -382,6 +388,7 @@ .mode = 0644, .proc_handler = proc_dointvec, }, @@ -8188,7 +8188,7 @@ Index: linux-2.6.37-ck1/kernel/sysctl.c #ifdef CONFIG_PROVE_LOCKING { .procname = "prove_locking", -@@ -815,6 +822,26 @@ static struct ctl_table kern_table[] = { +@@ -815,6 +822,26 @@ .proc_handler = proc_dointvec, }, #endif @@ -8215,11 +8215,11 @@ Index: linux-2.6.37-ck1/kernel/sysctl.c #if defined(CONFIG_S390) && defined(CONFIG_SMP) { .procname = "spin_retry", -Index: linux-2.6.37-ck1/lib/Kconfig.debug +Index: linux-2.6.37-ck2/lib/Kconfig.debug =================================================================== ---- linux-2.6.37-ck1.orig/lib/Kconfig.debug 2011-01-06 14:04:10.564809772 +1100 -+++ linux-2.6.37-ck1/lib/Kconfig.debug 2011-01-06 14:07:00.655901902 +1100 -@@ -833,7 +833,7 @@ config BOOT_PRINTK_DELAY +--- linux-2.6.37-ck2.orig/lib/Kconfig.debug 2011-01-06 14:04:10.000000000 +1100 ++++ linux-2.6.37-ck2/lib/Kconfig.debug 2011-02-14 09:47:50.995252001 +1100 +@@ -833,7 +833,7 @@ config RCU_TORTURE_TEST tristate "torture tests for RCU" @@ -8228,11 +8228,11 @@ Index: linux-2.6.37-ck1/lib/Kconfig.debug default n help This option provides a kernel module that runs torture tests -Index: linux-2.6.37-ck1/include/linux/jiffies.h +Index: linux-2.6.37-ck2/include/linux/jiffies.h =================================================================== ---- linux-2.6.37-ck1.orig/include/linux/jiffies.h 2010-02-25 21:51:52.000000000 +1100 -+++ linux-2.6.37-ck1/include/linux/jiffies.h 2011-01-06 14:07:00.655901902 +1100 -@@ -164,7 +164,7 @@ static inline u64 get_jiffies_64(void) +--- linux-2.6.37-ck2.orig/include/linux/jiffies.h 2010-02-25 21:51:52.000000000 +1100 ++++ linux-2.6.37-ck2/include/linux/jiffies.h 2011-02-14 09:47:50.995252001 +1100 +@@ -164,7 +164,7 @@ * Have the 32 bit jiffies value wrap 5 minutes after boot * so jiffies wrap bugs show up earlier. */ diff --git a/packages/linux/patches/linux-2.6.37.1-702_bfs363-nonhotplug_fix.patch b/packages/linux/patches/linux-2.6.37.1-702_bfs363-nonhotplug_fix.patch new file mode 100644 index 0000000000..59b401dea6 --- /dev/null +++ b/packages/linux/patches/linux-2.6.37.1-702_bfs363-nonhotplug_fix.patch @@ -0,0 +1,60 @@ +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[] = { diff --git a/packages/linux/patches/linux-2.6.37-702_ck1-version.patch b/packages/linux/patches/linux-2.6.37.1-702_ck2-version.patch similarity index 66% rename from packages/linux/patches/linux-2.6.37-702_ck1-version.patch rename to packages/linux/patches/linux-2.6.37.1-702_ck2-version.patch index 24c1c71610..4f34a3ebed 100644 --- a/packages/linux/patches/linux-2.6.37-702_ck1-version.patch +++ b/packages/linux/patches/linux-2.6.37.1-702_ck2-version.patch @@ -2,15 +2,15 @@ Makefile | 4 ++++ 1 file changed, 4 insertions(+) -Index: linux-2.6.37-ck1/Makefile +Index: linux-2.6.37-ck2/Makefile =================================================================== ---- linux-2.6.37-ck1.orig/Makefile 2011-01-06 14:04:07.612634764 +1100 -+++ linux-2.6.37-ck1/Makefile 2011-01-06 14:09:14.006825250 +1100 -@@ -10,6 +10,10 @@ NAME = Flesh-Eating Bats with Fangs +--- 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 = -ck1 ++CKVERSION = -ck2 +CKNAME = BFS Powered +EXTRAVERSION := $(EXTRAVERSION)$(CKVERSION) + diff --git a/packages/linux/patches/linux-2.6.37-703_cpufreq-bfs_tweaks.patch b/packages/linux/patches/linux-2.6.37.1-703_cpufreq-bfs_tweaks.patch similarity index 83% rename from packages/linux/patches/linux-2.6.37-703_cpufreq-bfs_tweaks.patch rename to packages/linux/patches/linux-2.6.37.1-703_cpufreq-bfs_tweaks.patch index c6a5a7defc..fc0122e323 100644 --- a/packages/linux/patches/linux-2.6.37-703_cpufreq-bfs_tweaks.patch +++ b/packages/linux/patches/linux-2.6.37.1-703_cpufreq-bfs_tweaks.patch @@ -2,10 +2,10 @@ drivers/cpufreq/cpufreq_ondemand.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -Index: linux-2.6.37-ck1/drivers/cpufreq/cpufreq_ondemand.c +Index: linux-2.6.37-ck2/drivers/cpufreq/cpufreq_ondemand.c =================================================================== ---- linux-2.6.37-ck1.orig/drivers/cpufreq/cpufreq_ondemand.c 2011-01-06 14:04:08.000000000 +1100 -+++ linux-2.6.37-ck1/drivers/cpufreq/cpufreq_ondemand.c 2011-01-06 14:08:56.522785888 +1100 +--- 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 */ @@ -22,7 +22,7 @@ Index: linux-2.6.37-ck1/drivers/cpufreq/cpufreq_ondemand.c #define MICRO_FREQUENCY_MIN_SAMPLE_RATE (10000) #define MIN_FREQUENCY_UP_THRESHOLD (11) #define MAX_FREQUENCY_UP_THRESHOLD (100) -@@ -513,10 +513,10 @@ static void dbs_check_cpu(struct cpu_dbs +@@ -513,10 +513,10 @@ /* * Every sampling_rate, we check, if current idle time is less diff --git a/packages/linux/patches/linux-2.6.37-704_hz-default_1000.patch b/packages/linux/patches/linux-2.6.37.1-704_hz-default_1000.patch similarity index 68% rename from packages/linux/patches/linux-2.6.37-704_hz-default_1000.patch rename to packages/linux/patches/linux-2.6.37.1-704_hz-default_1000.patch index 414deaff98..5af5138068 100644 --- a/packages/linux/patches/linux-2.6.37-704_hz-default_1000.patch +++ b/packages/linux/patches/linux-2.6.37.1-704_hz-default_1000.patch @@ -2,10 +2,10 @@ kernel/Kconfig.hz | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.37-ck1/kernel/Kconfig.hz +Index: linux-2.6.37-ck2/kernel/Kconfig.hz =================================================================== ---- linux-2.6.37-ck1.orig/kernel/Kconfig.hz 2009-06-10 13:05:27.000000000 +1000 -+++ linux-2.6.37-ck1/kernel/Kconfig.hz 2011-01-06 14:07:58.988366741 +1100 +--- 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 diff --git a/packages/linux/patches/linux-2.6.37-705_hz-no_default_250.patch b/packages/linux/patches/linux-2.6.37.1-705_hz-no_default_250.patch similarity index 83% rename from packages/linux/patches/linux-2.6.37-705_hz-no_default_250.patch rename to packages/linux/patches/linux-2.6.37.1-705_hz-no_default_250.patch index 32128a2443..051075471a 100644 --- a/packages/linux/patches/linux-2.6.37-705_hz-no_default_250.patch +++ b/packages/linux/patches/linux-2.6.37.1-705_hz-no_default_250.patch @@ -2,11 +2,11 @@ kernel/Kconfig.hz | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) -Index: linux-2.6.37-ck1/kernel/Kconfig.hz +Index: linux-2.6.37-ck2/kernel/Kconfig.hz =================================================================== ---- linux-2.6.37-ck1.orig/kernel/Kconfig.hz 2011-01-06 14:07:58.988366741 +1100 -+++ linux-2.6.37-ck1/kernel/Kconfig.hz 2011-01-06 14:07:59.115374288 +1100 -@@ -23,13 +23,14 @@ choice +--- 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. @@ -26,7 +26,7 @@ Index: linux-2.6.37-ck1/kernel/Kconfig.hz config HZ_300 bool "300 HZ" -@@ -43,14 +44,16 @@ choice +@@ -43,14 +44,16 @@ bool "1000 HZ" help 1000 Hz is the preferred choice for desktop systems and other diff --git a/packages/linux/patches/linux-2.6.37-706_hz-raise_max.patch b/packages/linux/patches/linux-2.6.37.1-706_hz-raise_max.patch similarity index 74% rename from packages/linux/patches/linux-2.6.37-706_hz-raise_max.patch rename to packages/linux/patches/linux-2.6.37.1-706_hz-raise_max.patch index c696e4f30d..bf70f54392 100644 --- a/packages/linux/patches/linux-2.6.37-706_hz-raise_max.patch +++ b/packages/linux/patches/linux-2.6.37.1-706_hz-raise_max.patch @@ -7,11 +7,11 @@ kernel/Kconfig.hz | 64 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 76 insertions(+), 8 deletions(-) -Index: linux-2.6.37-ck1/arch/x86/kernel/cpu/proc.c +Index: linux-2.6.37-ck2/arch/x86/kernel/cpu/proc.c =================================================================== ---- linux-2.6.37-ck1.orig/arch/x86/kernel/cpu/proc.c 2009-12-03 21:39:58.000000000 +1100 -+++ linux-2.6.37-ck1/arch/x86/kernel/cpu/proc.c 2011-01-06 14:07:59.250382309 +1100 -@@ -109,7 +109,7 @@ static int show_cpuinfo(struct seq_file +--- 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), @@ -20,11 +20,11 @@ Index: linux-2.6.37-ck1/arch/x86/kernel/cpu/proc.c #ifdef CONFIG_X86_64 if (c->x86_tlbsize > 0) -Index: linux-2.6.37-ck1/arch/x86/kernel/smpboot.c +Index: linux-2.6.37-ck2/arch/x86/kernel/smpboot.c =================================================================== ---- linux-2.6.37-ck1.orig/arch/x86/kernel/smpboot.c 2011-01-06 14:04:08.473685806 +1100 -+++ linux-2.6.37-ck1/arch/x86/kernel/smpboot.c 2011-01-06 14:07:59.251382368 +1100 -@@ -497,7 +497,7 @@ static void impress_friends(void) +--- 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), @@ -33,10 +33,10 @@ Index: linux-2.6.37-ck1/arch/x86/kernel/smpboot.c pr_debug("Before bogocount - setting activated=1.\n"); } -Index: linux-2.6.37-ck1/include/linux/nfsd/stats.h +Index: linux-2.6.37-ck2/include/linux/nfsd/stats.h =================================================================== ---- linux-2.6.37-ck1.orig/include/linux/nfsd/stats.h 2009-06-10 13:05:27.000000000 +1000 -+++ linux-2.6.37-ck1/include/linux/nfsd/stats.h 2011-01-06 14:07:59.251382368 +1100 +--- 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 @@ -48,11 +48,11 @@ Index: linux-2.6.37-ck1/include/linux/nfsd/stats.h #ifdef __KERNEL__ -Index: linux-2.6.37-ck1/include/net/inet_timewait_sock.h +Index: linux-2.6.37-ck2/include/net/inet_timewait_sock.h =================================================================== ---- linux-2.6.37-ck1.orig/include/net/inet_timewait_sock.h 2010-08-02 11:12:25.000000000 +1000 -+++ linux-2.6.37-ck1/include/net/inet_timewait_sock.h 2011-01-06 14:07:59.251382368 +1100 -@@ -39,8 +39,8 @@ struct inet_hashinfo; +--- 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. */ @@ -63,7 +63,7 @@ Index: linux-2.6.37-ck1/include/net/inet_timewait_sock.h #elif HZ <= 32 # define INET_TWDR_RECYCLE_TICK (5 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG) #elif HZ <= 64 -@@ -55,8 +55,12 @@ struct inet_hashinfo; +@@ -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) @@ -77,11 +77,11 @@ Index: linux-2.6.37-ck1/include/net/inet_timewait_sock.h #endif /* TIME_WAIT reaping mechanism. */ -Index: linux-2.6.37-ck1/init/calibrate.c +Index: linux-2.6.37-ck2/init/calibrate.c =================================================================== ---- linux-2.6.37-ck1.orig/init/calibrate.c 2010-02-25 21:51:52.000000000 +1100 -+++ linux-2.6.37-ck1/init/calibrate.c 2011-01-06 14:07:59.251382368 +1100 -@@ -176,7 +176,7 @@ void __cpuinit calibrate_delay(void) +--- 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), @@ -90,11 +90,11 @@ Index: linux-2.6.37-ck1/init/calibrate.c printed = true; } -Index: linux-2.6.37-ck1/kernel/Kconfig.hz +Index: linux-2.6.37-ck2/kernel/Kconfig.hz =================================================================== ---- linux-2.6.37-ck1.orig/kernel/Kconfig.hz 2011-01-06 14:07:59.115374288 +1100 -+++ linux-2.6.37-ck1/kernel/Kconfig.hz 2011-01-06 14:07:59.251382368 +1100 -@@ -48,6 +48,63 @@ choice +--- 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. @@ -158,7 +158,7 @@ Index: linux-2.6.37-ck1/kernel/Kconfig.hz endchoice config HZ -@@ -56,6 +113,13 @@ config HZ +@@ -56,6 +113,13 @@ default 250 if HZ_250_NODEFAULT default 300 if HZ_300 default 1000 if HZ_1000 diff --git a/packages/linux/patches/linux-2.6.37-707_kconfig-expose_vmsplit_option.patch b/packages/linux/patches/linux-2.6.37.1-707_kconfig-expose_vmsplit_option.patch similarity index 79% rename from packages/linux/patches/linux-2.6.37-707_kconfig-expose_vmsplit_option.patch rename to packages/linux/patches/linux-2.6.37.1-707_kconfig-expose_vmsplit_option.patch index 9ea0757844..937cf72f31 100644 --- a/packages/linux/patches/linux-2.6.37-707_kconfig-expose_vmsplit_option.patch +++ b/packages/linux/patches/linux-2.6.37.1-707_kconfig-expose_vmsplit_option.patch @@ -2,11 +2,11 @@ arch/x86/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -Index: linux-2.6.37-ck1/arch/x86/Kconfig +Index: linux-2.6.37-ck2/arch/x86/Kconfig =================================================================== ---- linux-2.6.37-ck1.orig/arch/x86/Kconfig 2011-01-06 14:04:08.122664999 +1100 -+++ linux-2.6.37-ck1/arch/x86/Kconfig 2011-01-06 14:07:58.859359075 +1100 -@@ -1046,7 +1046,7 @@ endchoice +--- 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 @@ -15,7 +15,7 @@ Index: linux-2.6.37-ck1/arch/x86/Kconfig default VMSPLIT_3G depends on X86_32 ---help--- -@@ -1066,17 +1066,17 @@ choice +@@ -1066,17 +1066,17 @@ option alone! config VMSPLIT_3G diff --git a/packages/linux/patches/linux-2.6.37-708_mm-kswapd_inherit_prio-1.patch b/packages/linux/patches/linux-2.6.37.1-708_mm-kswapd_inherit_prio-1.patch.ignore similarity index 81% rename from packages/linux/patches/linux-2.6.37-708_mm-kswapd_inherit_prio-1.patch rename to packages/linux/patches/linux-2.6.37.1-708_mm-kswapd_inherit_prio-1.patch.ignore index 77525a7a70..04d3712fe7 100644 --- a/packages/linux/patches/linux-2.6.37-708_mm-kswapd_inherit_prio-1.patch +++ b/packages/linux/patches/linux-2.6.37.1-708_mm-kswapd_inherit_prio-1.patch.ignore @@ -2,11 +2,11 @@ mm/vmscan.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) -Index: linux-2.6.37-ck1/mm/vmscan.c +Index: linux-2.6.37-ck2/mm/vmscan.c =================================================================== ---- linux-2.6.37-ck1.orig/mm/vmscan.c 2011-01-06 14:07:58.020309225 +1100 -+++ linux-2.6.37-ck1/mm/vmscan.c 2011-01-06 14:07:58.175318434 +1100 -@@ -1860,6 +1860,33 @@ static void shrink_zone(int priority, st +--- 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 @@ } /* @@ -40,7 +40,7 @@ Index: linux-2.6.37-ck1/mm/vmscan.c * 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. -@@ -2462,6 +2489,7 @@ static int kswapd(void *p) +@@ -2457,6 +2484,7 @@ } } @@ -48,7 +48,7 @@ Index: linux-2.6.37-ck1/mm/vmscan.c order = pgdat->kswapd_max_order; } finish_wait(&pgdat->kswapd_wait, &wait); -@@ -2488,6 +2516,7 @@ static int kswapd(void *p) +@@ -2483,6 +2511,7 @@ void wakeup_kswapd(struct zone *zone, int order) { pg_data_t *pgdat; @@ -56,7 +56,7 @@ Index: linux-2.6.37-ck1/mm/vmscan.c if (!populated_zone(zone)) return; -@@ -2500,7 +2529,9 @@ void wakeup_kswapd(struct zone *zone, in +@@ -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; diff --git a/packages/linux/patches/linux-2.6.37-709_mm-decrease_default_dirty_ratio.patch b/packages/linux/patches/linux-2.6.37.1-709_mm-decrease_default_dirty_ratio.patch similarity index 82% rename from packages/linux/patches/linux-2.6.37-709_mm-decrease_default_dirty_ratio.patch rename to packages/linux/patches/linux-2.6.37.1-709_mm-decrease_default_dirty_ratio.patch index 3ce0d5d977..804bccfcd4 100644 --- a/packages/linux/patches/linux-2.6.37-709_mm-decrease_default_dirty_ratio.patch +++ b/packages/linux/patches/linux-2.6.37.1-709_mm-decrease_default_dirty_ratio.patch @@ -19,11 +19,11 @@ the latency of the system as a whole. mm/page-writeback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.37-ck1/mm/page-writeback.c +Index: linux-2.6.37-ck2/mm/page-writeback.c =================================================================== ---- linux-2.6.37-ck1.orig/mm/page-writeback.c 2011-01-06 14:04:10.576810484 +1100 -+++ linux-2.6.37-ck1/mm/page-writeback.c 2011-01-06 14:07:58.729351350 +1100 -@@ -78,7 +78,7 @@ int vm_highmem_is_dirtyable; +--- 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 */ diff --git a/packages/linux/patches/linux-2.6.37-710_mm-drop_swap_cache_aggressively.patch b/packages/linux/patches/linux-2.6.37.1-710_mm-drop_swap_cache_aggressively.patch similarity index 69% rename from packages/linux/patches/linux-2.6.37-710_mm-drop_swap_cache_aggressively.patch rename to packages/linux/patches/linux-2.6.37.1-710_mm-drop_swap_cache_aggressively.patch index 7ca455beec..2cd9f63b62 100644 --- a/packages/linux/patches/linux-2.6.37-710_mm-drop_swap_cache_aggressively.patch +++ b/packages/linux/patches/linux-2.6.37.1-710_mm-drop_swap_cache_aggressively.patch @@ -5,11 +5,11 @@ mm/vmscan.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) -Index: linux-2.6.37-ck1/include/linux/swap.h +Index: linux-2.6.37-ck2/include/linux/swap.h =================================================================== ---- linux-2.6.37-ck1.orig/include/linux/swap.h 2011-01-06 14:07:57.889301442 +1100 -+++ linux-2.6.37-ck1/include/linux/swap.h 2011-01-06 14:07:58.019309165 +1100 -@@ -192,7 +192,7 @@ struct swap_list_t { +--- 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 */ }; @@ -18,11 +18,11 @@ Index: linux-2.6.37-ck1/include/linux/swap.h #define vm_swap_full() (nr_swap_pages*2 < total_swap_pages) /* linux/mm/page_alloc.c */ -Index: linux-2.6.37-ck1/mm/memory.c +Index: linux-2.6.37-ck2/mm/memory.c =================================================================== ---- linux-2.6.37-ck1.orig/mm/memory.c 2011-01-06 14:04:10.573810305 +1100 -+++ linux-2.6.37-ck1/mm/memory.c 2011-01-06 14:07:58.019309165 +1100 -@@ -2754,7 +2754,7 @@ static int do_swap_page(struct mm_struct +--- 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); @@ -31,11 +31,11 @@ Index: linux-2.6.37-ck1/mm/memory.c try_to_free_swap(page); unlock_page(page); if (swapcache) { -Index: linux-2.6.37-ck1/mm/swapfile.c +Index: linux-2.6.37-ck2/mm/swapfile.c =================================================================== ---- linux-2.6.37-ck1.orig/mm/swapfile.c 2011-01-06 14:04:10.582810838 +1100 -+++ linux-2.6.37-ck1/mm/swapfile.c 2011-01-06 14:07:58.020309225 +1100 -@@ -321,7 +321,7 @@ checks: +--- 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. */ @@ -44,7 +44,7 @@ Index: linux-2.6.37-ck1/mm/swapfile.c int swap_was_freed; spin_unlock(&swap_lock); swap_was_freed = __try_to_reclaim_swap(si, offset); -@@ -410,7 +410,7 @@ scan: +@@ -410,7 +410,7 @@ spin_lock(&swap_lock); goto checks; } @@ -53,7 +53,7 @@ Index: linux-2.6.37-ck1/mm/swapfile.c spin_lock(&swap_lock); goto checks; } -@@ -425,7 +425,7 @@ scan: +@@ -425,7 +425,7 @@ spin_lock(&swap_lock); goto checks; } @@ -62,7 +62,7 @@ Index: linux-2.6.37-ck1/mm/swapfile.c spin_lock(&swap_lock); goto checks; } -@@ -739,8 +739,7 @@ int free_swap_and_cache(swp_entry_t entr +@@ -739,8 +739,7 @@ * Not mapped elsewhere, or swap space full? Free it! * Also recheck PageSwapCache now page is locked (above). */ @@ -72,11 +72,11 @@ Index: linux-2.6.37-ck1/mm/swapfile.c delete_from_swap_cache(page); SetPageDirty(page); } -Index: linux-2.6.37-ck1/mm/vmscan.c +Index: linux-2.6.37-ck2/mm/vmscan.c =================================================================== ---- linux-2.6.37-ck1.orig/mm/vmscan.c 2011-01-06 14:07:57.758293657 +1100 -+++ linux-2.6.37-ck1/mm/vmscan.c 2011-01-06 14:07:58.020309225 +1100 -@@ -900,7 +900,7 @@ cull_mlocked: +--- 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. */ diff --git a/packages/linux/patches/linux-2.6.37-711_mm-enable_swaptoken_only_when_swap_full.patch b/packages/linux/patches/linux-2.6.37.1-711_mm-enable_swaptoken_only_when_swap_full.patch similarity index 66% rename from packages/linux/patches/linux-2.6.37-711_mm-enable_swaptoken_only_when_swap_full.patch rename to packages/linux/patches/linux-2.6.37.1-711_mm-enable_swaptoken_only_when_swap_full.patch index 5d74968e70..f7f76ea318 100644 --- a/packages/linux/patches/linux-2.6.37-711_mm-enable_swaptoken_only_when_swap_full.patch +++ b/packages/linux/patches/linux-2.6.37.1-711_mm-enable_swaptoken_only_when_swap_full.patch @@ -2,11 +2,11 @@ include/linux/swap.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: linux-2.6.37-ck1/include/linux/swap.h +Index: linux-2.6.37-ck2/include/linux/swap.h =================================================================== ---- linux-2.6.37-ck1.orig/include/linux/swap.h 2011-01-06 14:04:10.493805562 +1100 -+++ linux-2.6.37-ck1/include/linux/swap.h 2011-01-06 14:07:57.889301442 +1100 -@@ -348,9 +348,10 @@ extern struct mm_struct *swap_token_mm; +--- 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 *); diff --git a/packages/linux/patches/linux-2.6.37-712_mm-background_scan.patch b/packages/linux/patches/linux-2.6.37.1-712_mm-background_scan.patch similarity index 84% rename from packages/linux/patches/linux-2.6.37-712_mm-background_scan.patch rename to packages/linux/patches/linux-2.6.37.1-712_mm-background_scan.patch index 679b778a44..c84d37d1af 100644 --- a/packages/linux/patches/linux-2.6.37-712_mm-background_scan.patch +++ b/packages/linux/patches/linux-2.6.37.1-712_mm-background_scan.patch @@ -3,10 +3,10 @@ mm/vmscan.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) -Index: linux-2.6.37-ck1/include/linux/mmzone.h +Index: linux-2.6.37-ck2/include/linux/mmzone.h =================================================================== ---- linux-2.6.37-ck1.orig/include/linux/mmzone.h 2011-01-06 14:04:10.468804082 +1100 -+++ linux-2.6.37-ck1/include/linux/mmzone.h 2011-01-06 14:07:58.304326100 +1100 +--- 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 #include @@ -15,7 +15,7 @@ Index: linux-2.6.37-ck1/include/linux/mmzone.h #include #include #include -@@ -161,12 +162,14 @@ enum zone_watermarks { +@@ -161,12 +162,14 @@ WMARK_MIN, WMARK_LOW, WMARK_HIGH, @@ -30,7 +30,7 @@ Index: linux-2.6.37-ck1/include/linux/mmzone.h struct per_cpu_pages { int count; /* number of pages in the list */ -@@ -343,7 +346,7 @@ struct zone { +@@ -343,7 +346,7 @@ ZONE_PADDING(_pad1_) /* Fields commonly accessed by the page reclaim scanner */ @@ -39,7 +39,7 @@ Index: linux-2.6.37-ck1/include/linux/mmzone.h struct zone_lru { struct list_head list; } lru[NR_LRU_LISTS]; -@@ -645,6 +648,7 @@ typedef struct pglist_data { +@@ -645,6 +648,7 @@ wait_queue_head_t kswapd_wait; struct task_struct *kswapd; int kswapd_max_order; @@ -47,10 +47,10 @@ Index: linux-2.6.37-ck1/include/linux/mmzone.h } pg_data_t; #define node_present_pages(nid) (NODE_DATA(nid)->node_present_pages) -Index: linux-2.6.37-ck1/mm/vmscan.c +Index: linux-2.6.37-ck2/mm/vmscan.c =================================================================== ---- linux-2.6.37-ck1.orig/mm/vmscan.c 2011-01-06 14:07:58.175318434 +1100 -+++ linux-2.6.37-ck1/mm/vmscan.c 2011-01-06 14:07:58.305326159 +1100 +--- 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 #include @@ -59,7 +59,7 @@ Index: linux-2.6.37-ck1/mm/vmscan.c #include #include #include -@@ -2403,6 +2404,8 @@ out: +@@ -2398,6 +2399,8 @@ return sc.nr_reclaimed; } @@ -68,7 +68,7 @@ Index: linux-2.6.37-ck1/mm/vmscan.c /* * The background pageout daemon, started as a kernel thread * from the init process. -@@ -2453,6 +2456,8 @@ static int kswapd(void *p) +@@ -2448,6 +2451,8 @@ unsigned long new_order; int ret; @@ -77,7 +77,7 @@ Index: linux-2.6.37-ck1/mm/vmscan.c prepare_to_wait(&pgdat->kswapd_wait, &wait, TASK_INTERRUPTIBLE); new_order = pgdat->kswapd_max_order; pgdat->kswapd_max_order = 0; -@@ -2637,20 +2642,57 @@ static int __devinit cpu_callback(struct +@@ -2632,20 +2637,57 @@ } /* diff --git a/packages/linux/patches/linux-2.6.37-713_mm-idleprio_prio-1.patch b/packages/linux/patches/linux-2.6.37.1-713_mm-idleprio_prio-1.patch.ignore similarity index 100% rename from packages/linux/patches/linux-2.6.37-713_mm-idleprio_prio-1.patch rename to packages/linux/patches/linux-2.6.37.1-713_mm-idleprio_prio-1.patch.ignore diff --git a/packages/linux/patches/linux-2.6.37-714_mm-lru_cache_add_lru_tail.patch b/packages/linux/patches/linux-2.6.37.1-714_mm-lru_cache_add_lru_tail.patch similarity index 80% rename from packages/linux/patches/linux-2.6.37-714_mm-lru_cache_add_lru_tail.patch rename to packages/linux/patches/linux-2.6.37.1-714_mm-lru_cache_add_lru_tail.patch index a1b304820e..98cf2994f4 100644 --- a/packages/linux/patches/linux-2.6.37-714_mm-lru_cache_add_lru_tail.patch +++ b/packages/linux/patches/linux-2.6.37.1-714_mm-lru_cache_add_lru_tail.patch @@ -5,11 +5,11 @@ mm/swap.c | 30 ++++++++++++++++++++++----- 4 files changed, 86 insertions(+), 16 deletions(-) -Index: linux-2.6.37-ck1/include/linux/mm_inline.h +Index: linux-2.6.37-ck2/include/linux/mm_inline.h =================================================================== ---- linux-2.6.37-ck1.orig/include/linux/mm_inline.h 2009-12-03 21:40:09.000000000 +1100 -+++ linux-2.6.37-ck1/include/linux/mm_inline.h 2011-01-06 14:07:58.577342321 +1100 -@@ -20,14 +20,24 @@ static inline int page_is_file_cache(str +--- 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 @@ -36,11 +36,11 @@ Index: linux-2.6.37-ck1/include/linux/mm_inline.h del_page_from_lru_list(struct zone *zone, struct page *page, enum lru_list l) { list_del(&page->lru); -Index: linux-2.6.37-ck1/include/linux/swap.h +Index: linux-2.6.37-ck2/include/linux/swap.h =================================================================== ---- linux-2.6.37-ck1.orig/include/linux/swap.h 2011-01-06 14:07:58.019309165 +1100 -+++ linux-2.6.37-ck1/include/linux/swap.h 2011-01-06 14:07:58.578342381 +1100 -@@ -206,6 +206,7 @@ extern unsigned int nr_free_pagecache_pa +--- 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 */ @@ -48,7 +48,7 @@ Index: linux-2.6.37-ck1/include/linux/swap.h 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 @@ static inline void lru_cache_add_anon(st +@@ -226,9 +227,14 @@ __lru_cache_add(page, LRU_INACTIVE_ANON); } @@ -64,11 +64,11 @@ Index: linux-2.6.37-ck1/include/linux/swap.h } /* LRU Isolation modes. */ -Index: linux-2.6.37-ck1/mm/filemap.c +Index: linux-2.6.37-ck2/mm/filemap.c =================================================================== ---- linux-2.6.37-ck1.orig/mm/filemap.c 2011-01-06 14:04:10.569810068 +1100 -+++ linux-2.6.37-ck1/mm/filemap.c 2011-01-06 14:07:58.578342381 +1100 -@@ -439,8 +439,8 @@ out: +--- 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); @@ -79,7 +79,7 @@ Index: linux-2.6.37-ck1/mm/filemap.c { int ret; -@@ -456,12 +456,18 @@ int add_to_page_cache_lru(struct page *p +@@ -456,12 +456,18 @@ ret = add_to_page_cache(page, mapping, offset, gfp_mask); if (ret == 0) { if (page_is_file_cache(page)) @@ -99,7 +99,7 @@ Index: linux-2.6.37-ck1/mm/filemap.c EXPORT_SYMBOL_GPL(add_to_page_cache_lru); #ifdef CONFIG_NUMA -@@ -968,6 +974,28 @@ static void shrink_readahead_size_eio(st +@@ -968,6 +974,28 @@ ra->ra_pages /= 4; } @@ -128,7 +128,7 @@ Index: linux-2.6.37-ck1/mm/filemap.c /** * do_generic_file_read - generic file read routine * @filp: the file to read -@@ -992,7 +1020,7 @@ static void do_generic_file_read(struct +@@ -992,7 +1020,7 @@ pgoff_t prev_index; unsigned long offset; /* offset into pagecache page */ unsigned int prev_offset; @@ -137,7 +137,7 @@ Index: linux-2.6.37-ck1/mm/filemap.c index = *ppos >> PAGE_CACHE_SHIFT; prev_index = ra->prev_pos >> PAGE_CACHE_SHIFT; -@@ -1003,7 +1031,7 @@ static void do_generic_file_read(struct +@@ -1003,7 +1031,7 @@ for (;;) { struct page *page; pgoff_t end_index; @@ -146,7 +146,7 @@ Index: linux-2.6.37-ck1/mm/filemap.c unsigned long nr, ret; cond_resched(); -@@ -1177,8 +1205,16 @@ no_cached_page: +@@ -1177,8 +1205,16 @@ desc->error = -ENOMEM; goto out; } @@ -165,11 +165,11 @@ Index: linux-2.6.37-ck1/mm/filemap.c if (error) { page_cache_release(page); if (error == -EEXIST) -Index: linux-2.6.37-ck1/mm/swap.c +Index: linux-2.6.37-ck2/mm/swap.c =================================================================== ---- linux-2.6.37-ck1.orig/mm/swap.c 2011-01-06 14:04:10.582810838 +1100 -+++ linux-2.6.37-ck1/mm/swap.c 2011-01-06 14:07:58.578342381 +1100 -@@ -215,15 +215,23 @@ void mark_page_accessed(struct page *pag +--- 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); @@ -195,7 +195,7 @@ Index: linux-2.6.37-ck1/mm/swap.c EXPORT_SYMBOL(__lru_cache_add); /** -@@ -231,7 +239,7 @@ 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. */ @@ -204,7 +204,7 @@ Index: linux-2.6.37-ck1/mm/swap.c { if (PageActive(page)) { VM_BUG_ON(PageUnevictable(page)); -@@ -242,7 +250,12 @@ void lru_cache_add_lru(struct page *page +@@ -242,7 +250,12 @@ } VM_BUG_ON(PageLRU(page) || PageActive(page) || PageUnevictable(page)); @@ -218,7 +218,7 @@ Index: linux-2.6.37-ck1/mm/swap.c } /** -@@ -403,7 +416,7 @@ EXPORT_SYMBOL(__pagevec_release); +@@ -403,7 +416,7 @@ * Add the passed pages to the LRU, then drop the caller's refcount * on them. Reinitialises the caller's pagevec. */ @@ -227,7 +227,7 @@ Index: linux-2.6.37-ck1/mm/swap.c { int i; struct zone *zone = NULL; -@@ -431,7 +444,7 @@ void ____pagevec_lru_add(struct pagevec +@@ -431,7 +444,7 @@ if (active) SetPageActive(page); update_page_reclaim_stat(zone, page, file, active); @@ -236,7 +236,7 @@ Index: linux-2.6.37-ck1/mm/swap.c } if (zone) spin_unlock_irq(&zone->lru_lock); -@@ -439,6 +452,11 @@ void ____pagevec_lru_add(struct pagevec +@@ -439,6 +452,11 @@ pagevec_reinit(pvec); } diff --git a/packages/linux/patches/linux-2.6.37-715_mm-make_swappiness_really_mean_it.patch b/packages/linux/patches/linux-2.6.37.1-715_mm-make_swappiness_really_mean_it.patch.ignore similarity index 100% rename from packages/linux/patches/linux-2.6.37-715_mm-make_swappiness_really_mean_it.patch rename to packages/linux/patches/linux-2.6.37.1-715_mm-make_swappiness_really_mean_it.patch.ignore diff --git a/packages/linux/patches/linux-2.6.37-716_mm-zero_swappiness.patch b/packages/linux/patches/linux-2.6.37.1-716_mm-zero_swappiness.patch similarity index 62% rename from packages/linux/patches/linux-2.6.37-716_mm-zero_swappiness.patch rename to packages/linux/patches/linux-2.6.37.1-716_mm-zero_swappiness.patch index 977759befa..fad5b48936 100644 --- a/packages/linux/patches/linux-2.6.37-716_mm-zero_swappiness.patch +++ b/packages/linux/patches/linux-2.6.37.1-716_mm-zero_swappiness.patch @@ -2,11 +2,11 @@ mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.37-ck1/mm/vmscan.c +Index: linux-2.6.37-ck2/mm/vmscan.c =================================================================== ---- linux-2.6.37-ck1.orig/mm/vmscan.c 2011-01-06 14:07:57.629285994 +1100 -+++ linux-2.6.37-ck1/mm/vmscan.c 2011-01-06 14:07:57.758293657 +1100 -@@ -133,7 +133,7 @@ struct scan_control { +--- linux-2.6.37-ck2.orig/mm/vmscan.c 2011-01-06 14:04:10.000000000 +1100 ++++ linux-2.6.37-ck2/mm/vmscan.c 2011-02-14 10:11:00.536252000 +1100 +@@ -133,7 +133,7 @@ /* * From 0 .. 100. Higher means more swappy. */ diff --git a/packages/linux/patches/linux-2.6.37-717_preempt-desktop-tune.patch b/packages/linux/patches/linux-2.6.37.1-717_preempt-desktop-tune.patch similarity index 77% rename from packages/linux/patches/linux-2.6.37-717_preempt-desktop-tune.patch rename to packages/linux/patches/linux-2.6.37.1-717_preempt-desktop-tune.patch index 8d439b8189..89d3f3aead 100644 --- a/packages/linux/patches/linux-2.6.37-717_preempt-desktop-tune.patch +++ b/packages/linux/patches/linux-2.6.37.1-717_preempt-desktop-tune.patch @@ -2,10 +2,10 @@ kernel/Kconfig.preempt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -Index: linux-2.6.37-ck1/kernel/Kconfig.preempt +Index: linux-2.6.37-ck2/kernel/Kconfig.preempt =================================================================== ---- linux-2.6.37-ck1.orig/kernel/Kconfig.preempt 2009-06-10 13:05:27.000000000 +1000 -+++ linux-2.6.37-ck1/kernel/Kconfig.preempt 2011-01-06 14:07:59.416392169 +1100 +--- 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 @@ -15,7 +15,7 @@ Index: linux-2.6.37-ck1/kernel/Kconfig.preempt config PREEMPT_NONE bool "No Forced Preemption (Server)" -@@ -17,7 +17,7 @@ config PREEMPT_NONE +@@ -17,7 +17,7 @@ latencies. config PREEMPT_VOLUNTARY @@ -24,7 +24,7 @@ Index: linux-2.6.37-ck1/kernel/Kconfig.preempt 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 @@ config PREEMPT_VOLUNTARY +@@ -31,7 +31,8 @@ applications to run more 'smoothly' even when the system is under load. diff --git a/packages/linux/patches/linux-2.6.37-718_sched-add-above-background-load-function.patch b/packages/linux/patches/linux-2.6.37.1-718_sched-add-above-background-load-function.patch similarity index 69% rename from packages/linux/patches/linux-2.6.37-718_sched-add-above-background-load-function.patch rename to packages/linux/patches/linux-2.6.37.1-718_sched-add-above-background-load-function.patch index 9e7a67dd32..ea1c1fa5b1 100644 --- a/packages/linux/patches/linux-2.6.37-718_sched-add-above-background-load-function.patch +++ b/packages/linux/patches/linux-2.6.37.1-718_sched-add-above-background-load-function.patch @@ -3,11 +3,11 @@ kernel/sched_bfs.c | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) -Index: linux-2.6.37-ck1/include/linux/sched.h +Index: linux-2.6.37-ck2/include/linux/sched.h =================================================================== ---- linux-2.6.37-ck1.orig/include/linux/sched.h 2011-01-06 14:07:00.000000000 +1100 -+++ linux-2.6.37-ck1/include/linux/sched.h 2011-01-06 14:07:19.971048973 +1100 -@@ -1558,6 +1558,7 @@ static inline int iso_task(struct task_s +--- 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); @@ -15,7 +15,7 @@ Index: linux-2.6.37-ck1/include/linux/sched.h #else /* CFS */ extern int runqueue_is_locked(int cpu); #define tsk_seruntime(t) ((t)->se.sum_exec_runtime) -@@ -1581,6 +1582,12 @@ static inline int iso_task(struct task_s +@@ -1581,6 +1582,12 @@ static inline void remove_cpu(unsigned long cpu) { } @@ -28,11 +28,11 @@ Index: linux-2.6.37-ck1/include/linux/sched.h #endif /* CONFIG_SCHED_BFS */ /* Future-safe accessor for struct task_struct's cpus_allowed. */ -Index: linux-2.6.37-ck1/kernel/sched_bfs.c +Index: linux-2.6.37-ck2/kernel/sched_bfs.c =================================================================== ---- linux-2.6.37-ck1.orig/kernel/sched_bfs.c 2011-01-06 14:07:00.000000000 +1100 -+++ linux-2.6.37-ck1/kernel/sched_bfs.c 2011-01-06 14:07:19.972049048 +1100 -@@ -559,6 +559,26 @@ static inline void __task_grq_unlock(voi +--- 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(); } diff --git a/packages/mediacenter/xbmc/sleep.d/01_update_videodb b/packages/mediacenter/xbmc/sleep.d/01_update_videodb new file mode 100755 index 0000000000..032d6f0531 --- /dev/null +++ b/packages/mediacenter/xbmc/sleep.d/01_update_videodb @@ -0,0 +1,34 @@ +#!/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 +################################################################################ + +. /etc/profile + +case "$1" in + thaw|resume) + ( + usleep 5000000 + xbmc-send --host=127.0.0.1 -a "UpdateLibrary(video)" + )& + ;; + *) exit $NA + ;; +esac diff --git a/packages/mediacenter/xbmc/sleep.d/02_update_musicdb b/packages/mediacenter/xbmc/sleep.d/02_update_musicdb new file mode 100755 index 0000000000..f000ffcb67 --- /dev/null +++ b/packages/mediacenter/xbmc/sleep.d/02_update_musicdb @@ -0,0 +1,34 @@ +#!/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 +################################################################################ + +. /etc/profile + +case "$1" in + thaw|resume) + ( + usleep 5000000 + xbmc-send --host=127.0.0.1 -a "UpdateLibrary(music)" + )& + ;; + *) exit $NA + ;; +esac diff --git a/packages/multimedia/libbluray/meta b/packages/multimedia/libbluray/meta index 3402bfb88c..05990f0dd7 100644 --- a/packages/multimedia/libbluray/meta +++ b/packages/multimedia/libbluray/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libbluray" -PKG_VERSION="20101216" +PKG_VERSION="20739ed" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/multimedia/libbluray/patches/libbluray-20101216-configure.patch b/packages/multimedia/libbluray/patches/libbluray-20739ed-configure.patch similarity index 100% rename from packages/multimedia/libbluray/patches/libbluray-20101216-configure.patch rename to packages/multimedia/libbluray/patches/libbluray-20739ed-configure.patch diff --git a/packages/network/nfs-utils/build b/packages/network/nfs-utils/build index 5c69dc7223..2c0ce5791e 100755 --- a/packages/network/nfs-utils/build +++ b/packages/network/nfs-utils/build @@ -54,3 +54,5 @@ libblkid_is_recent="yes" \ --with-gnu-ld make + +sed -e "s,#!/bin/sh -p,#!/bin/sh,g" -i utils/statd/start-statd \ No newline at end of file diff --git a/packages/web/wget/build b/packages/python/system/configobj/build similarity index 75% rename from packages/web/wget/build rename to packages/python/system/configobj/build index 3c89fcc50e..3d37a7f15b 100755 --- a/packages/web/wget/build +++ b/packages/python/system/configobj/build @@ -22,16 +22,15 @@ . config/options $1 -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --disable-debug \ - --disable-nls \ - --disable-rpath \ - --enable-ipv6 \ - --with-libiconv-prefix="$SYSROOT_PREFIX/usr" \ - --without-libgnutls-prefix \ - --without-libssl-prefix \ +export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" +export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" -make +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 "{}" ";" + +rm -rf .install/usr/bin diff --git a/packages/web/wget/install b/packages/python/system/configobj/install similarity index 93% rename from packages/web/wget/install rename to packages/python/system/configobj/install index eb550fed50..a9c8b9924b 100755 --- a/packages/web/wget/install +++ b/packages/python/system/configobj/install @@ -22,5 +22,4 @@ . config/options $1 -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/src/wget $INSTALL/usr/bin +cp -PR $PKG_BUILD/.install/* $INSTALL diff --git a/packages/web/wget/meta b/packages/python/system/configobj/meta similarity index 59% rename from packages/web/wget/meta rename to packages/python/system/configobj/meta index 7df85843eb..1069b8b3c8 100644 --- a/packages/web/wget/meta +++ b/packages/python/system/configobj/meta @@ -18,19 +18,19 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -PKG_NAME="wget" -PKG_VERSION="1.12" +PKG_NAME="configobj" +PKG_VERSION="4.7.2" PKG_REV="1" PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.gnu.org" -PKG_URL="http://ftp.gnu.org/gnu/wget/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libiconv openssl" -PKG_BUILD_DEPENDS="toolchain libiconv openssl" +PKG_LICENSE="OSS" +PKG_SITE="http://www.voidspace.org.uk/python/configobj.html" +PKG_URL="http://pypi.python.org/packages/source/c/configobj/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_DEPENDS="Python distribute" +PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross" PKG_PRIORITY="optional" -PKG_SECTION="web" -PKG_SHORTDESC="wget: A non-interactive network retriever" -PKG_LONGDESC="GNU Wget is a free network utility to retrieve files from the World Wide Web using HTTP and FTP, the two most widely used Internet protocols. It works non-interactively, thus enabling work in the background, after having logged off. The recursive retrieval of HTML pages, as well as FTP sites is supported -- you can use Wget to make mirrors of archives and home pages, or traverse the web like a WWW robot (Wget understands /robots.txt)." +PKG_SECTION="python/system" +PKG_SHORTDESC="configobj: a simple but powerful config file reader and writer" +PKG_LONGDESC="ConfigObj is a simple but powerful config file reader and writer: an ini file round tripper. Its main feature is that it is very easy to use, with a straightforward programmer's interface and a simple syntax for config files." PKG_IS_ADDON="no" PKG_AUTORECONF="no" diff --git a/packages/python/system/configobj/patches/configobj-4.7.2-setuptools-0.1.patch b/packages/python/system/configobj/patches/configobj-4.7.2-setuptools-0.1.patch new file mode 100644 index 0000000000..9141114ffa --- /dev/null +++ b/packages/python/system/configobj/patches/configobj-4.7.2-setuptools-0.1.patch @@ -0,0 +1,12 @@ +diff -Naur configobj-4.7.2/setup.py configobj-4.7.2.patch/setup.py +--- configobj-4.7.2/setup.py 2010-03-02 00:18:36.000000000 +0100 ++++ configobj-4.7.2.patch/setup.py 2011-02-19 13:56:40.861322489 +0100 +@@ -9,7 +9,7 @@ + # http://www.voidspace.org.uk/python/license.shtml + + import sys +-from distutils.core import setup ++from setuptools import setup + from configobj import __version__ as VERSION + + NAME = 'configobj' diff --git a/packages/python/system/simplejson/build b/packages/python/system/simplejson/build new file mode 100755 index 0000000000..3d37a7f15b --- /dev/null +++ b/packages/python/system/simplejson/build @@ -0,0 +1,36 @@ +#!/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 + +export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" +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 "{}" ";" + +rm -rf .install/usr/bin diff --git a/packages/tools/wgetpaste/install b/packages/python/system/simplejson/install similarity index 93% rename from packages/tools/wgetpaste/install rename to packages/python/system/simplejson/install index 915ba2a5df..a9c8b9924b 100755 --- a/packages/tools/wgetpaste/install +++ b/packages/python/system/simplejson/install @@ -22,5 +22,4 @@ . config/options $1 -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/wgetpaste $INSTALL/usr/bin +cp -PR $PKG_BUILD/.install/* $INSTALL diff --git a/packages/python/system/simplejson/meta b/packages/python/system/simplejson/meta new file mode 100644 index 0000000000..9ae87c3e87 --- /dev/null +++ b/packages/python/system/simplejson/meta @@ -0,0 +1,36 @@ +################################################################################ +# 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="simplejson" +PKG_VERSION="2.1.3" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="OSS" +PKG_SITE="http://pypi.python.org/pypi/simplejson" +PKG_URL="http://pypi.python.org/packages/source/s/simplejson/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_DEPENDS="Python distribute" +PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross" +PKG_PRIORITY="optional" +PKG_SECTION="python/system" +PKG_SHORTDESC="simplejson: a simple, fast, complete, correct and extensible JSON encoder and decoder for Python 2.5+." +PKG_LONGDESC="simplejson is a simple, fast, complete, correct and extensible JSON encoder and decoder for Python 2.5+. It is pure Python code with no dependencies, but includes an optional C extension for a serious speed boost." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index 6d2d159f89..892bea5fa3 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.18.3 -# Wed Feb 16 15:46:17 2011 +# Sat Feb 19 14:18:19 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -823,11 +823,11 @@ CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" # CONFIG_UDPSVD is not set # CONFIG_VCONFIG is not set -# CONFIG_WGET is not set -# CONFIG_FEATURE_WGET_STATUSBAR is not set -# CONFIG_FEATURE_WGET_AUTHENTICATION is not set -# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set -# CONFIG_FEATURE_WGET_TIMEOUT is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y # CONFIG_ZCIP is not set # diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 58a36fc678..769e3be3a6 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -34,6 +34,9 @@ mkdir -p /dev/shm mount -n -t tmpfs none /dev/shm +# showing version + lsb_release + # starting init scripts for wanted runlevel . /etc/profile diff --git a/packages/sysutils/dbus/build b/packages/sysutils/dbus/build index bb258f5c8d..920be07ca5 100755 --- a/packages/sysutils/dbus/build +++ b/packages/sysutils/dbus/build @@ -41,7 +41,6 @@ mkdir -p .build-target && cd .build-target --disable-checks \ --disable-xml-docs \ --disable-doxygen-docs \ - --disable-gcov \ --enable-abstract-sockets \ --disable-selinux \ --disable-libaudit \ diff --git a/packages/sysutils/dbus/meta b/packages/sysutils/dbus/meta index 3ba92a7a79..c9d427d781 100644 --- a/packages/sysutils/dbus/meta +++ b/packages/sysutils/dbus/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="dbus" -PKG_VERSION="1.4.1" +PKG_VERSION="1.4.6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/dbus/patches/dbus-1.4.6-remove_pie.patch b/packages/sysutils/dbus/patches/dbus-1.4.6-remove_pie.patch new file mode 100644 index 0000000000..192e401c94 --- /dev/null +++ b/packages/sysutils/dbus/patches/dbus-1.4.6-remove_pie.patch @@ -0,0 +1,42 @@ +diff -Naur dbus-1.4.6-old/bus/Makefile.am dbus-1.4.6-new/bus/Makefile.am +--- dbus-1.4.6-old/bus/Makefile.am 2011-02-17 08:15:23.000000000 -0800 ++++ dbus-1.4.6-new/bus/Makefile.am 2011-02-18 09:11:44.000000000 -0800 +@@ -1,7 +1,7 @@ + + configdir=$(sysconfdir)/dbus-1 + +-INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \ ++INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) \ + -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ + -DDBUS_COMPILATION + +@@ -88,7 +88,7 @@ + $(EFENCE) \ + $(DBUS_BUS_LIBS) + +-dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@ ++dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ + + LAUNCH_HELPER_SOURCES= \ + $(XML_SOURCES) \ +diff -Naur dbus-1.4.6-old/bus/Makefile.in dbus-1.4.6-new/bus/Makefile.in +--- dbus-1.4.6-old/bus/Makefile.in 2011-02-17 12:06:58.000000000 -0800 ++++ dbus-1.4.6-new/bus/Makefile.in 2011-02-18 09:11:44.000000000 -0800 +@@ -514,7 +514,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + configdir = $(sysconfdir)/dbus-1 +-INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \ ++INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) \ + -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ + -DDBUS_COMPILATION + +@@ -582,7 +582,7 @@ + $(EFENCE) \ + $(DBUS_BUS_LIBS) + +-dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@ ++dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ + LAUNCH_HELPER_SOURCES = \ + $(XML_SOURCES) \ + config-parser-common.c \ diff --git a/packages/sysutils/lcdproc/meta b/packages/sysutils/lcdproc/meta index 4069205392..54aac07c50 100644 --- a/packages/sysutils/lcdproc/meta +++ b/packages/sysutils/lcdproc/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="lcdproc" -PKG_VERSION="20100423" +PKG_VERSION="0.5.4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://lcdproc.org/" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="$SOURCEFORGE_SRC/lcdproc/lcdproc/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="libusb irserver" PKG_BUILD_DEPENDS="toolchain libusb" PKG_PRIORITY="optional" diff --git a/packages/sysutils/plymouth-lite/splash/splash.png b/packages/sysutils/plymouth-lite/splash/splash.png index 7a4fe389f0..6b2897b0a1 100644 Binary files a/packages/sysutils/plymouth-lite/splash/splash.png and b/packages/sysutils/plymouth-lite/splash/splash.png differ diff --git a/packages/sysutils/plymouth-lite/splash/splash1.png b/packages/sysutils/plymouth-lite/splash/splash1.png index 8c86ae06a7..ac0aa0052f 100644 Binary files a/packages/sysutils/plymouth-lite/splash/splash1.png and b/packages/sysutils/plymouth-lite/splash/splash1.png differ diff --git a/packages/sysutils/plymouth-lite/splash/splash2.png b/packages/sysutils/plymouth-lite/splash/splash2.png deleted file mode 100644 index 1db8fc8ccd..0000000000 Binary files a/packages/sysutils/plymouth-lite/splash/splash2.png and /dev/null differ diff --git a/packages/sysutils/plymouth-lite/splash/splash3.png b/packages/sysutils/plymouth-lite/splash/splash3.png deleted file mode 100644 index cc3bb90a5a..0000000000 Binary files a/packages/sysutils/plymouth-lite/splash/splash3.png and /dev/null differ diff --git a/packages/sysutils/plymouth-lite/splash/splash4.png b/packages/sysutils/plymouth-lite/splash/splash4.png deleted file mode 100644 index 62590dfd6e..0000000000 Binary files a/packages/sysutils/plymouth-lite/splash/splash4.png and /dev/null differ diff --git a/packages/sysutils/remote/eventlircd/evmap/03_0709_9137.evmap b/packages/sysutils/remote/eventlircd/evmap/03_0709_9137.evmap new file mode 100644 index 0000000000..d43670aac6 --- /dev/null +++ b/packages/sysutils/remote/eventlircd/evmap/03_0709_9137.evmap @@ -0,0 +1,42 @@ +# Giada N20 Remote +# Bus=0003 Vendor=0709 Product=9137 Version=0111 + + KEY_1 = KEY_NUMERIC_1 # 1 + KEY_2 = KEY_NUMERIC_2 # 2 + KEY_3 = KEY_NUMERIC_3 # 3 + KEY_4 = KEY_NUMERIC_4 # 4 + KEY_5 = KEY_NUMERIC_5 # 5 + KEY_6 = KEY_NUMERIC_6 # 6 + KEY_7 = KEY_NUMERIC_7 # 7 + KEY_8 = KEY_NUMERIC_8 # 8 + KEY_9 = KEY_NUMERIC_9 # 9 + KEY_0 = KEY_NUMERIC_0 # 0 + + KEY_UP = KEY_UP # Up Arrow + KEY_DOWN = KEY_DOWN # Down Arrow + KEY_LEFT = KEY_LEFT # Left Arrow + KEY_RIGHT = KEY_RIGHT # Right Arrow + + KEY_ENTER = KEY_OK # Enter & Ok + KEY_BACK = KEY_EXIT # Back + KEY_ESC = KEY_CLEAR # Clear + + KEY_VOLUMEDOWN = KEY_VOLUMEDOWN # Vol - + KEY_VOLUMEUP = KEY_VOLUMEUP # Vol + + KEY_MUTE = KEY_MUTE # Mute + KEY_CHANNELUP = KEY_CHANNELUP # CH/PG up + KEY_CHANNELDOWN = KEY_CHANNELDOWN # CH/PG down + + KEY_PLAY = KEY_PLAY # Play + KEY_STOPCD = KEY_STOP # Stop + KEY_PAUSE = KEY_PAUSE # Pause + KEY_RECORD = KEY_RECORD # Record + KEY_NEXTSONG = KEY_NEXT # Next + KEY_PREVIOUSSONG = KEY_PREVIOUS # Prev + KEY_REWIND = KEY_REWIND # Rev + KEY_FASTFORWARD = KEY_FASTFORWARD # Fwd + + KEY_COMPOSE = KEY_INFO # Info/EPG + KEY_G = KEY_EPG # Guide + + KEY_POWER = KEY_POWER # Power diff --git a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules index f5cdb78d41..fd36969f8d 100644 --- a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules +++ b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules @@ -95,6 +95,10 @@ ENV{ID_VENDOR_ID}=="05a4", ENV{ID_MODEL_ID}=="9881", \ # ENV{eventlircd_enable}="true", \ # ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap" +ENV{ID_VENDOR_ID}=="0709", ENV{ID_MODEL_ID}=="9137", \ + ENV{eventlircd_enable}="true", \ + ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap" + ENV{ID_VENDOR_ID}=="0755", ENV{ID_MODEL_ID}=="2626", \ ENV{eventlircd_enable}="true", \ ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap" diff --git a/packages/toolchain/math/ppl/meta b/packages/toolchain/math/ppl/meta index a4c2637ee1..faa170b204 100644 --- a/packages/toolchain/math/ppl/meta +++ b/packages/toolchain/math/ppl/meta @@ -19,13 +19,12 @@ ################################################################################ PKG_NAME="ppl" -PKG_VERSION="0.11" +PKG_VERSION="0.11.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.cs.unipr.it/ppl" -#PKG_URL="http://www.cs.unipr.it/ppl/Download/ftp/releases/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://www.cs.unipr.it/ppl/Download/ftp/releases/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" PKG_BUILD_DEPENDS="ccache gmp" PKG_PRIORITY="optional" diff --git a/packages/tools/autoupdate/meta b/packages/tools/autoupdate/meta index 054768b20c..8f7ae26f56 100644 --- a/packages/tools/autoupdate/meta +++ b/packages/tools/autoupdate/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS="wget" +PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" PKG_SECTION="tools" diff --git a/packages/tools/installer/scripts/installer b/packages/tools/installer/scripts/installer index 6b93d33bc3..36fc9cfdcf 100755 --- a/packages/tools/installer/scripts/installer +++ b/packages/tools/installer/scripts/installer @@ -15,7 +15,7 @@ # 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 +# along with OpenELEC; 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 ################################################################################ @@ -52,7 +52,7 @@ [ -f /etc/installer.conf ] && . /etc/installer.conf || exit 0 -function dbglg() { +dbglg() { # Acts just like echo cmd, with automatic redirection echo "" >> $LOGFILE @@ -62,7 +62,7 @@ function dbglg() { echo "" >> $LOGFILE } -function get_device_unmount() { +get_device_unmount() { # get all unmounted devices # usage: get_devices_unmount # uses: - @@ -76,7 +76,7 @@ function get_device_unmount() { done } -function get_partition() { +get_partition() { # get all partitions of an specifed device # usage: get_partitions /dev/sda # uses: - @@ -85,7 +85,7 @@ function get_partition() { PARTITIONS=$(parted -m $1 print |grep -v ^/dev |grep -v BYT | cut -f1 -d ":") } -function create_device_list() { +create_device_list() { # create devices list for menu # usage: create_devices_list # uses: get_device_unmount @@ -111,7 +111,7 @@ function create_device_list() { done } -function create_partition_list() { +create_partition_list() { # get an overview of all partitions of an specifed device # usage: get_partition_list /dev/sda # uses: get_partition @@ -133,7 +133,7 @@ function create_partition_list() { done } -function do_install_mbr() { +do_install_mbr() { # show menu MSG_TITLE="\Z4[ (RE)INSTALL MBR ]\Zn" @@ -149,7 +149,7 @@ function do_install_mbr() { # now we must do anything case $? in 0) - INSTALL_DEVICE=$(< "$TMPDIR/device_for_install" ) + INSTALL_DEVICE=$(cat "$TMPDIR/device_for_install" ) # installing mbr cat /usr/share/syslinux/mbr.bin > $INSTALL_DEVICE @@ -165,7 +165,7 @@ function do_install_mbr() { esac } -function do_install_quick() { +do_install_quick() { # show menu MSG_TITLE="\Z4[ QUICK INSTALL MENU ]\Zn" @@ -181,7 +181,7 @@ function do_install_quick() { # now we must do anything case $? in 0) - INSTALL_DEVICE=$(< "$TMPDIR/device_for_install" ) + INSTALL_DEVICE=$(cat "$TMPDIR/device_for_install" ) # remove all partitions msg_progress_install "1" "get all partitions $INSTALL_DEVICE" @@ -270,7 +270,7 @@ function do_install_quick() { esac } -function msg_not_implemented() { +msg_not_implemented() { # show an dialog that this function is not yet implemented MSG_TITLE="\Z2[ WORK IN PROGRESS ]\Zn" MSG_INFOBOX=" This function is not yet implemented \n stay tuned!!!" @@ -278,7 +278,7 @@ function msg_not_implemented() { dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_INFOBOX" 7 70 } -function msg_oem_only() { +msg_oem_only() { # show an dialog that this function is only implemented on special builds MSG_TITLE="\Z2[ FOR OEM ONLY ]\Zn" MSG_INFOBOX=" OEM only feature, this function is not implemented in this build! \n if you have questions about this feature \n visit http://www.openelec.tv!!!" @@ -286,7 +286,7 @@ function msg_oem_only() { dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_INFOBOX" 7 70 } -function msg_warning_beta() { +msg_warning_beta() { # show an warning dialog if we use beta software MSG_TITLE="\Z1[ BETA WARNING ]\Zn" MSG_INFOBOX=" This installer is Beta \n use it on your own risk!!! \n Please make first an backup !" @@ -294,7 +294,7 @@ function msg_warning_beta() { dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_INFOBOX" 7 70 } -function msg_no_device() { +msg_no_device() { # show an warning dialog if we dont find not mounted devices for install and return to main menu MSG_TITLE="\Z1[ INFORMATION ]\Zn" MSG_INFOBOX=" Not found any devices to install. \n be sure you have connected your device via USB or (e)SATA. \n Please try again !" @@ -304,7 +304,7 @@ function msg_no_device() { menu_main } -function msg_install_ready() { +msg_install_ready() { # show an dialog that we have installed MSG_TITLE="\Z1[ INFORMATION ]\Zn" @@ -313,7 +313,7 @@ function msg_install_ready() { menu_main } -function msg_progress_install() { +msg_progress_install() { # show the progress dialog MSG_TITLE="\Z1[ INSTALLING ]\Zn" @@ -321,13 +321,13 @@ function msg_progress_install() { dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --gauge "$2 ..." 6 70 $1 & } -function menu_main() { +menu_main() { # show the mainmenu MSG_TITLE="\Z4[ MAIN MENU ]\Zn" MSG_MENU="\n\ZbQuick Install:\Zn do an default installation on an specific devices, \ \Z1\Zb(this will delete all your data on this device)\Zn \ \n\ZbCustom Install:\Zn do an custom installation \ - \n\ZbSetup:\Zn change some settings to run OpenELEC.tv \ + \n\ZbSetup:\Zn change some settings to run OpenELEC \ \n\ZbBIOS Update:\Zn backup and update your BIOS (only for OEMs) \ \n\ZbShow logfile:\Zn show and save the logfile \ \n \ @@ -336,15 +336,15 @@ function menu_main() { dialog --colors --backtitle "$BACKTITLE" --cancel-label "$MSG_CANCEL" \ --title "$MSG_TITLE" --menu "$MSG_MENU" 20 70 5 \ - 1 "Quick Install OpenELEC.tv" \ - 2 "Custom Install OpenELEC.tv" \ - 3 "Setup OpenELEC.tv" \ + 1 "Quick Install OpenELEC" \ + 2 "Custom Install OpenELEC" \ + 3 "Setup OpenELEC" \ 4 "BIOS update (only for OEM's)" \ 5 "Show logfile" 2> $TMPDIR/mainmenu case $? in 0) - ITEM_MAINMENU=$(< "$TMPDIR/mainmenu" ) + ITEM_MAINMENU=$(cat "$TMPDIR/mainmenu" ) case $ITEM_MAINMENU in 1) do_install_quick; break;; 2) menu_custom; break;; @@ -362,13 +362,13 @@ function menu_main() { esac } -function menu_setup() { +menu_setup() { # TODO: show the setupmenu msg_not_implemented menu_main } -function menu_bios() { +menu_bios() { # show the biosmenu MSG_TITLE="\Z4[ BIOS MENU ]\Zn" MSG_MENU="\n You can use the UP/DOWN arrow keys,\n the No. of the choice as a hot key,\n to choose an option.\n\n Please choose an item:" @@ -382,7 +382,7 @@ function menu_bios() { case $? in 0) - ITEM_BIOSMENU=$(< "$TMPDIR/biosmenu" ) + ITEM_BIOSMENU=$(cat "$TMPDIR/biosmenu" ) case $ITEM_BIOSMENU in 1) bios_backup; break;; 2) bios_update; break;; @@ -398,13 +398,13 @@ function menu_bios() { esac } -function menu_custom() { +menu_custom() { # TODO: show the installmenu msg_not_implemented menu_main } -function bios_backup() { +bios_backup() { # create an backup from installed bios if [ "$BIOS_UPDATE" = "yes" -a -f "$BIOS_FILE" ]; then @@ -424,7 +424,7 @@ function bios_backup() { menu_bios } -function bios_update() { +bios_update() { # update the bios if [ "$BIOS_UPDATE" = "yes" -a -f "$BIOS_FILE" ]; then @@ -446,7 +446,7 @@ function bios_update() { menu_bios } -function bios_erase() { +bios_erase() { # erase the bios if [ "$BIOS_UPDATE" = "yes" -a -f "$BIOS_FILE" ]; then @@ -464,20 +464,20 @@ function bios_erase() { menu_bios } -function logfile_show() { +logfile_show() { # TODO: show the logfile msg_not_implemented menu_main } -function do_reboot() { +do_reboot() { # reboot on request clear sync reboot } -function do_poweroff() { +do_poweroff() { # powerdown on request clear sync @@ -486,8 +486,9 @@ function do_poweroff() { # setup needed variables BETA="yes" - VERSION="0.2.4" - BACKTITLE="OpenELEC.tv Installer $VERSION" + INSTALLER_VERSION="0.2.5" + OS_VERSION=$(lsb_release) + BACKTITLE="OpenELEC Installer $INSTALLER_VERSION - Operating System: $OS_VERSION" TMPDIR="/tmp/installer" LOGFILE="$TMPDIR/install.log" diff --git a/packages/tools/meta b/packages/tools/meta index 7a00cb0232..447074e2d0 100644 --- a/packages/tools/meta +++ b/packages/tools/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS="nano wgetpaste evtest" +PKG_DEPENDS="nano pastebinit evtest" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" PKG_SECTION="debug" diff --git a/packages/tools/pastebinit/install b/packages/tools/pastebinit/install new file mode 100755 index 0000000000..7b7635cd67 --- /dev/null +++ b/packages/tools/pastebinit/install @@ -0,0 +1,29 @@ +#!/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/etc/pastebin.d + cp $PKG_BUILD/pastebin.d/pastebin.com.conf $INSTALL/etc/pastebin.d + +mkdir -p $INSTALL/usr/bin + cp $PKG_BUILD/pastebinit $INSTALL/usr/bin diff --git a/packages/tools/wgetpaste/meta b/packages/tools/pastebinit/meta similarity index 74% rename from packages/tools/wgetpaste/meta rename to packages/tools/pastebinit/meta index d5f2da081e..4a03b3ee9f 100644 --- a/packages/tools/wgetpaste/meta +++ b/packages/tools/pastebinit/meta @@ -18,19 +18,19 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -PKG_NAME="wgetpaste" -PKG_VERSION="2.18" +PKG_NAME="pastebinit" +PKG_VERSION="1.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" -PKG_SITE="http://wgetpaste.zlin.dk" -PKG_URL="http://wgetpaste.zlin.dk/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="wget" +PKG_SITE="http://launchpad.net/pastebinit" +PKG_URL="http://launchpad.net/pastebinit/trunk/$PKG_VERSION/+download/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_DEPENDS="Python simplejson configobj" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" PKG_SECTION="tools" -PKG_SHORTDESC="wgetpaste: Upload Directly to Pastebin from the Linux Shell" -PKG_LONGDESC="Wgetpaste is a tool for Uploading Directly to Pastebin from the Linux Shell" +PKG_SHORTDESC="pastebinit: Upload Directly to Pastebin from the Linux Shell" +PKG_LONGDESC="pastebinit is a tool for Uploading Directly to Pastebin from the Linux Shell" PKG_IS_ADDON="no" PKG_AUTORECONF="no" diff --git a/packages/web/curl/meta b/packages/web/curl/meta index e6923bd57a..9b405f8f12 100644 --- a/packages/web/curl/meta +++ b/packages/web/curl/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="curl" -PKG_VERSION="7.21.3" +PKG_VERSION="7.21.4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MIT" diff --git a/packages/web/curl/patches/curl-7.21.3-0108-threaded_dns_multi.patch b/packages/web/curl/patches/curl-7.21.4-0108-threaded_dns_multi.patch similarity index 100% rename from packages/web/curl/patches/curl-7.21.3-0108-threaded_dns_multi.patch rename to packages/web/curl/patches/curl-7.21.4-0108-threaded_dns_multi.patch diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 664ec83bc3..6f386e5085 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-ck1 Kernel Configuration +# Linux/i386 2.6.37.1-ck2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1830,9 +1830,9 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y # CONFIG_LOGO is not set -CONFIG_SOUND=m +CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set -CONFIG_SND=m +CONFIG_SND=y CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m @@ -1920,7 +1920,7 @@ CONFIG_SND_HDA_GENERIC=y # CONFIG_SND_HDSPM is not set # CONFIG_SND_HIFIER is not set # CONFIG_SND_ICE1712 is not set -# CONFIG_SND_ICE1724 is not set +CONFIG_SND_ICE1724=m CONFIG_SND_INTEL8X0=m # CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_KORG1212 is not set diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 29e541b853..8e87390ff4 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-ck1 Kernel Configuration +# Linux/i386 2.6.37.1-ck2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1720,9 +1720,9 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y # CONFIG_LOGO is not set -CONFIG_SOUND=m +CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set -CONFIG_SND=m +CONFIG_SND=y CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index c821ab5dbf..4376d2d05b 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.37-ck1 Kernel Configuration +# Linux/x86_64 2.6.37.1-ck2 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1655,9 +1655,9 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y # CONFIG_LOGO is not set -CONFIG_SOUND=m +CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set -CONFIG_SND=m +CONFIG_SND=y CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 1b6d15e601..aec8eda471 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-ck1 Kernel Configuration +# Linux/i386 2.6.37.1-ck2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1684,9 +1684,9 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y # CONFIG_LOGO is not set -CONFIG_SOUND=m +CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set -CONFIG_SND=m +CONFIG_SND=y CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index f6133a337f..0dd11b4834 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.37-ck1 Kernel Configuration +# Linux/x86_64 2.6.37.1-ck2 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1624,9 +1624,9 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y # CONFIG_LOGO is not set -CONFIG_SOUND=m +CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set -CONFIG_SND=m +CONFIG_SND=y CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m