From 92def6cd50e5b59d008c8ce70e322c5891913712 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Tue, 4 Sep 2012 08:36:50 -0500 Subject: Merge remote-tracking branch 'origin/testing' into testing # By Britney Fransen (12) and others # Via Britney Fransen * origin/testing: mythtv: fixed and cleaned some menus. Closes #846 v4l-dvb: fix conflicting kernel modules. refs #844 mythdb-initial: add MiscStatusScript value to initial db. refs #845. LinHES-system: remove dup .install keylaunch: update .keylaunchrc to run mythtv-setup as user rsyslog: increase log retention to 2 weeks runit-scripts: enable cron logging to syslog premake:initial inclusion. closes #801 libaacs-git:initial inclusion. closes #801 aacskeys:initial inclusion. closes #801 LinHES-system: Add scripts for misc status in MythWeb. closes #845. linhes-scripts: tweak myth2mkv. Update version to 0.25-004 dvb-firmware: add xc5000c firmware. change xc5000 modprobe options. closes #844 v4l-dvb: update to snapshot from 20120828. refs #844 LinHES-system: update myth_status.py to work with tuners in error. closes #843 curlftpfs: Initial Inclusion. linhes-scripts: minor changes to myth2mkv mythtv:Bumped to latest fixes. Added ./configure items to close #842. LinHES-config:7.4 rdt 9th anniversary release. Conflicts: abs/core/LinHES-config/LinHES-release abs/core/LinHES-config/PKGBUILD abs/core/LinHES-system/PKGBUILD abs/core/keylaunch/PKGBUILD abs/core/linhes-scripts/PKGBUILD abs/core/mythdb-initial/PKGBUILD abs/core/mythdb-initial/mc.sql abs/core/mythtv/stable-0.25/git_src/git_hash abs/core/mythtv/stable-0.25/mythtv/PKGBUILD abs/core/rsyslog/PKGBUILD abs/core/runit-scripts/PKGBUILD abs/core/v4l-dvb/PKGBUILD --- abs/core/mythtv/stable-0.25/git_src/git_hash | 2 +- .../stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml | 93 +++++++++-------- .../stable-0.25/mythtv/menu-xml/info_menu.xml | 76 ++++++++++++++ .../mythtv/stable-0.25/mythtv/menu-xml/linhes.xml | 1 + .../mythtv/stable-0.25/mythtv/menu-xml/setup.xml | 111 --------------------- abs/core/v4l-dvb/PKGBUILD | 9 +- abs/core/v4l-dvb/v4l-dvb.install | 8 +- 7 files changed, 130 insertions(+), 170 deletions(-) create mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/info_menu.xml delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/setup.xml diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash b/abs/core/mythtv/stable-0.25/git_src/git_hash index 83e574c..8e5da8e 100644 --- a/abs/core/mythtv/stable-0.25/git_src/git_hash +++ b/abs/core/mythtv/stable-0.25/git_src/git_hash @@ -1 +1 @@ -46cab93562429cd19029402a2387f63a72aeb898 +d51927663b67c7c035108270a31bf14aed68bcdb diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml index 9d483d3..844647b 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml @@ -1,78 +1,77 @@ - + + - + - + - + - - - + - + - + - + - + - + MV_SYSTEM_SETUP_MENU + System Type + EXEC mythinstall -s hostype + + + + + + + + + + + + + + + + + + + + diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml index 01b6ffa..342766d 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml @@ -34,6 +34,7 @@ diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/setup.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/setup.xml deleted file mode 100644 index f56bb6f..0000000 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/setup.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/abs/core/v4l-dvb/PKGBUILD b/abs/core/v4l-dvb/PKGBUILD index ac150bb..f19c2fa 100644 --- a/abs/core/v4l-dvb/PKGBUILD +++ b/abs/core/v4l-dvb/PKGBUILD @@ -2,7 +2,7 @@ pkgname=v4l-dvb _kernver=`uname -r` -pkgver=20120828 +pkgver=20120904 pkgrel=1 pkgdesc="V4L-DVB device drivers (newer than those included in kernel26)" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ build() { msg "Connecting to GIT server...." if [ -d "${srcdir}/${_gitname}" ] ; then - cd ${_gitname} && git checkout -- . && git pull --rebase + cd ${_gitname} && git pull --rebase else git clone ${_gitroot} fi @@ -42,7 +42,8 @@ build() { package() { cd "${srcdir}/${_gitname}" - make DESTDIR="${pkgdir}" install - rm -fr ${pkgdir}/lib/modules/$_kernver/modules* + make DESTDIR="${pkgdir}/lib/modules/$_kernver/updates" install + # compress new kernel modules + find ${pkgdir}/lib/modules/$_kernver/updates/ -not -name 'media.ko' -name '*.ko' -exec gzip '{}' \; } md5sums=() diff --git a/abs/core/v4l-dvb/v4l-dvb.install b/abs/core/v4l-dvb/v4l-dvb.install index ec6382d..f7b7197 100644 --- a/abs/core/v4l-dvb/v4l-dvb.install +++ b/abs/core/v4l-dvb/v4l-dvb.install @@ -1,18 +1,12 @@ post_install() { - echo ">>> Removing duplicate compressed kernel modules..." - for file in `find /lib/modules -name "*.ko"`; do if [[ -e $file.gz ]]; then rm "$file.gz"; fi; done echo ">>> Running depmod..." depmod } post_upgrade() { - echo ">>> Removing duplicate compressed kernel modules..." - for file in `find /lib/modules -name "*.ko"`; do if [[ -e $file.gz ]]; then rm "$file.gz"; fi; done - echo ">>> Running depmod..." - depmod + post_install } post_remove() { echo ">>> v4l-dvb has been removed" - echo ">>> kernel26 & dvb-firmware & linux-firmware should be reinstalled" } -- cgit v0.12