From f6123f7c8727c38c494e16cc2e0becf199a6bb26 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 12 Mar 2013 16:04:58 +0100 Subject: [PATCH 1/6] xbmc: add PR2403 Signed-off-by: Stephan Raue --- .../xbmc/patches/xbmc-990.24-PR2403.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403.patch b/packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403.patch new file mode 100644 index 0000000000..b89f4b39ee --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403.patch @@ -0,0 +1,14 @@ +diff -Naur xbmc-12.0.6/xbmc/powermanagement/PowerManager.h xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.h +--- xbmc-12.0.6/xbmc/powermanagement/PowerManager.h 2013-03-11 18:01:45.000000000 +0100 ++++ xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.h 2013-03-12 13:42:28.698769168 +0100 +@@ -32,8 +32,8 @@ + virtual bool Reboot() { return false; } + + virtual bool CanPowerdown() { return true; } +- virtual bool CanSuspend() { return true; } +- virtual bool CanHibernate() { return true; } ++ virtual bool CanSuspend() { return false; } ++ virtual bool CanHibernate() { return false; } + virtual bool CanReboot() { return true; } + + virtual int BatteryLevel() { return 0; } From ce555f26e7214e40f3197fd2d03dd6a0a3ef8da0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 12 Mar 2013 16:05:52 +0100 Subject: [PATCH 2/6] projects/ATV: dont install upower, not needed after XBMC-PR2403 Signed-off-by: Stephan Raue --- projects/ATV/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/ATV/options b/projects/ATV/options index 5432431588..b21caf6cae 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -223,7 +223,7 @@ UDISKS="yes" # build and install powermanagement support (upower) (yes / no) - UPOWER="yes" + UPOWER="no" # build and install exFAT fuse support (yes / no) EXFAT="yes" From 632c954cff0abc37c6ed496e0a2db7ae279b3ea0 Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 12 Mar 2013 17:27:07 +0100 Subject: [PATCH 3/6] connman: disable BackgroundScanning. We dont use it anyway and it makes wifi a little unstable. At least on RPi. --- packages/network/connman/config/main.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/connman/config/main.conf b/packages/network/connman/config/main.conf index b4144ddc67..1f7af14728 100644 --- a/packages/network/connman/config/main.conf +++ b/packages/network/connman/config/main.conf @@ -4,4 +4,4 @@ # Background scanning will start every 5 minutes unless # the scan list is empty. In that case, a simple backoff # mechanism starting from 10s up to 5 minutes will run. -BackgroundScanning = true +BackgroundScanning = false From 3b9461b7c000f2d460bfb02edf9ed3ca2a875867 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 12 Mar 2013 19:24:25 +0100 Subject: [PATCH 4/6] projects/ATV/xbmc: set some default options Signed-off-by: Stephan Raue --- projects/ATV/xbmc/advancedsettings.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/ATV/xbmc/advancedsettings.xml b/projects/ATV/xbmc/advancedsettings.xml index 50c9e77475..178b719f24 100644 --- a/projects/ATV/xbmc/advancedsettings.xml +++ b/projects/ATV/xbmc/advancedsettings.xml @@ -20,4 +20,10 @@ 30 + + + false + false + false + From 58f400fb35cc87a5405d570c0563192b87b50a91 Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Wed, 13 Mar 2013 10:41:10 +0200 Subject: [PATCH 5/6] tvheadend: do not send debug message to syslog Apparently tvheadend by default uses the syslog service, and the `-s` option that we provide in the startup script in fact makes tvheadend send debug messages to syslog (which we obviously do not want by default as this causes for my single DVB card 1k/min to /var, which is 4MB/month). So this fix disables the `-s` option in the tvheadend startup script. closes #2053, closes #2055 --- .../service/multimedia/tvheadend/source/bin/tvheadend.start | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start index d39b22dc8f..3ddfa7d65c 100755 --- a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start +++ b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start @@ -94,7 +94,11 @@ if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then fi fi -TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME" +if [ "$DEBUG" = "yes" ]; then + ADEND_ARG="-C -s -u root -g video -c $ADDON_HOME" +else + ADEND_ARG="-C -u root -g video -c $ADDON_HOME" +fi mkdir -p /var/config if [ -f $ADDON_DIR/settings-default.xml ]; then From 90be8140a5dd0d7d2c426474125733ee04f5018e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 13 Mar 2013 16:38:35 +0000 Subject: [PATCH 6/6] linux-tbs-drivers: update to linux-tbs-drivers-130127 --- packages/linux-drivers/linux-tbs-drivers/meta | 2 +- .../linux-tbs-drivers-121119-kernel-3.7.patch | 117 ------------------ .../linux-drivers/linux-tbs-drivers/unpack | 7 -- 3 files changed, 1 insertion(+), 125 deletions(-) delete mode 100644 packages/linux-drivers/linux-tbs-drivers/patches.upstream/linux-tbs-drivers-121119-kernel-3.7.patch diff --git a/packages/linux-drivers/linux-tbs-drivers/meta b/packages/linux-drivers/linux-tbs-drivers/meta index 0623b0bf3d..04f4056b9e 100644 --- a/packages/linux-drivers/linux-tbs-drivers/meta +++ b/packages/linux-drivers/linux-tbs-drivers/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux-tbs-drivers" -PKG_VERSION="121119" +PKG_VERSION="130127" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux-drivers/linux-tbs-drivers/patches.upstream/linux-tbs-drivers-121119-kernel-3.7.patch b/packages/linux-drivers/linux-tbs-drivers/patches.upstream/linux-tbs-drivers-121119-kernel-3.7.patch deleted file mode 100644 index 93ce5d8c0c..0000000000 --- a/packages/linux-drivers/linux-tbs-drivers/patches.upstream/linux-tbs-drivers-121119-kernel-3.7.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff --git a/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c b/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c -index 3146eec..c3a112e 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c -@@ -1550,7 +1550,7 @@ static int et61x251_mmap(struct file* filp, struct vm_area_struct *vma) - } - - vma->vm_flags |= VM_IO; -- vma->vm_flags |= VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - - pos = cam->frame[i].bufmem; - while (size > 0) { /* size is page-aligned */ -diff --git a/linux-tbs-drivers/linux/drivers/media/video/meye.c b/linux-tbs-drivers/linux/drivers/media/video/meye.c -index 2b7b1db..c80a3c5 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/meye.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/meye.c -@@ -1708,7 +1708,7 @@ static int meye_mmap(struct file *file, struct vm_area_struct *vma) - - vma->vm_ops = &meye_vm_ops; - vma->vm_flags &= ~VM_IO; /* not I/O memory */ -- vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */ -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; /* avoid to swap out this VMA */ - vma->vm_private_data = (void *) (offset / gbufsize); - meye_vm_open(vma); - -diff --git a/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c b/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c -index b5ef362..b8119fe 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c -@@ -896,7 +896,7 @@ static int omap_vout_mmap(struct file *file, struct vm_area_struct *vma) - - q->bufs[i]->baddr = vma->vm_start; - -- vma->vm_flags |= VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); - vma->vm_ops = &omap_vout_vm_ops; - vma->vm_private_data = (void *) vout; -diff --git a/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c b/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c -index 32aa3c2..49d7042 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c -@@ -2130,7 +2130,7 @@ static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma) - } - - vma->vm_flags |= VM_IO; -- vma->vm_flags |= VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - - pos = cam->frame[i].bufmem; - while (size > 0) { /* size is page-aligned */ -diff --git a/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c b/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c -index 5a74f5e..5791c67 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c -@@ -1091,7 +1091,7 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma) - - /* VM_IO is eventually going to replace PageReserved altogether */ - vma->vm_flags |= VM_IO; -- vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */ -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; /* avoid to swap out this VMA */ - - pos = usbvision->frame[i].data; - while (size > 0) { -diff --git a/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c b/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c -index f163a3a..844adad 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c -@@ -586,7 +586,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, - map->count = 1; - map->q = q; - vma->vm_ops = &videobuf_vm_ops; -- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_flags &= ~VM_IO; /* using shared anonymous pages */ - vma->vm_private_data = map; - dprintk(1, "mmap %p: q=%p %08lx-%08lx pgoff %08lx bufs %d-%d\n", -diff --git a/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c b/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c -index 9f5632c..21375fa 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c -@@ -274,7 +274,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, - } - - vma->vm_ops = &videobuf_vm_ops; -- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_private_data = map; - - dprintk(1, "mmap %p: q=%p %08lx-%08lx (%lx) pgoff %08lx buf %d\n", -diff --git a/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c b/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c -index f542538..f330bf0 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c -@@ -176,7 +176,7 @@ int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr, - return ret; - } - -- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_private_data = priv; - vma->vm_ops = vm_ops; - -diff --git a/linux-tbs-drivers/linux/drivers/media/video/vino.c b/linux-tbs-drivers/linux/drivers/media/video/vino.c -index 52a0a37..7a40e12 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/vino.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/vino.c -@@ -3950,7 +3950,7 @@ found: - - fb->map_count = 1; - -- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_flags &= ~VM_IO; - vma->vm_private_data = fb; - vma->vm_file = file; diff --git a/packages/linux-drivers/linux-tbs-drivers/unpack b/packages/linux-drivers/linux-tbs-drivers/unpack index 725aaf616f..e91a5bc4c5 100755 --- a/packages/linux-drivers/linux-tbs-drivers/unpack +++ b/packages/linux-drivers/linux-tbs-drivers/unpack @@ -33,10 +33,3 @@ tar xjf $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers.tar.bz2 -C $BUILD/${ # fix permissions chmod -R u+rwX $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers/* -echo "### Applying upstream patches ###" - -for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do - cat $patch | patch -d \ - `echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1 -done -