summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2010-09-21 04:27:13 (GMT)
committerJames Meyer <james.meyer@operamail.com>2010-09-21 04:27:13 (GMT)
commitfefb747730dc79412a1a18b33a69e2b089b28f7e (patch)
tree8616332d794133b3d761fa80f9268874327a022f
parent2bf905c893bac50e2536ad24e6ee5a1eac7d6da8 (diff)
downloadlinhes_pkgbuild-fefb747730dc79412a1a18b33a69e2b089b28f7e.zip
linhes_pkgbuild-fefb747730dc79412a1a18b33a69e2b089b28f7e.tar.gz
linhes_pkgbuild-fefb747730dc79412a1a18b33a69e2b089b28f7e.tar.bz2
linhes-config: recompile mythvantage, update script to match new location of system squashfile
-rw-r--r--abs/core-testing/LinHES-config/PKGBUILD4
-rwxr-xr-xabs/core-testing/LinHES-config/checkout_MythVantage.sh8
-rwxr-xr-xabs/core-testing/LinHES-config/mv_install.py4
3 files changed, 8 insertions, 8 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index dd07a29..ef25620 100644
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.1
-pkgrel=41
+pkgrel=45
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -101,7 +101,7 @@ build() {
install -m 0755 issue $startdir/pkg/etc/issue
}
-md5sums=('297441b8d85820698c19e7c0ad5a3dfe'
+md5sums=('381de315bceff755c7c5106ee693059f'
'1a4694fcd694b362c339bda781ed0f3e'
'e36da536dd651ef182e7642337889e77'
'3baa23764e1b6bcb2d66d7d859096940'
diff --git a/abs/core-testing/LinHES-config/checkout_MythVantage.sh b/abs/core-testing/LinHES-config/checkout_MythVantage.sh
index 944b9c6..21f25e5 100755
--- a/abs/core-testing/LinHES-config/checkout_MythVantage.sh
+++ b/abs/core-testing/LinHES-config/checkout_MythVantage.sh
@@ -1,7 +1,7 @@
#!/bin/bash
MYDIR=`pwd`
-MYTHPATH="\/data\/LinHES-PKGBUILD\/abs\/core-testing\/mythtv\/stable\/mythtv\/src\/mythtv-0.21"
-
+#MYTHPATH="\/data\/LinHES-PKGBUILD\/abs\/core-testing\/mythtv\/stable\/mythtv\/src\/mythtv-0.23"
+MYTHPATH="\/data\/LinHES-PKGBUILD\/abs\/core-testing\/mythtv\/stable-0.23\/mythtv\/src\/mythtv"
function setup_links {
rm mythinstall.bin
rm mythbeselect.bin
@@ -44,6 +44,6 @@ echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythbese
echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
cd $MYDIR/src/MythVantage-app/mythinstall && qmake
make || exit 1
-cd $MYDIR/src/MythVantage-app/mythbeselect && qmake
-make ||exit 1
+#cd $MYDIR/src/MythVantage-app/mythbeselect && qmake
+#make ||exit 1
diff --git a/abs/core-testing/LinHES-config/mv_install.py b/abs/core-testing/LinHES-config/mv_install.py
index 19295ca..908851b 100755
--- a/abs/core-testing/LinHES-config/mv_install.py
+++ b/abs/core-testing/LinHES-config/mv_install.py
@@ -467,7 +467,7 @@ def copy_it(install_type):
logging.debug( install_type)
if ( install_type == "install"):
logging.info("Transferring system")
- cmd = " unsquashfs -f -d %s /.livesys/medium/system.sqf" %(data_config.MOUNTPOINT)
+ cmd = " unsquashfs -f -d %s /.livesys/medium/larch/system.sqf" %(data_config.MOUNTPOINT)
runcmd(cmd)
#logging.debug(cmd)
#cmdout=commands.getoutput(cmd)
@@ -475,7 +475,7 @@ def copy_it(install_type):
if ( install_type == "upgrade"):
logging.info("Upgrading system")
create_squashlist()
- cmd = " unsquashfs -e %s -f -d %s /.livesys/medium/system.sqf" %(data_config.SQUASHFILE, data_config.MOUNTPOINT)
+ cmd = " unsquashfs -e %s -f -d %s /.livesys/medium/larch/system.sqf" %(data_config.SQUASHFILE, data_config.MOUNTPOINT)
runcmd(cmd)
#logging.debug(cmd)
#cmdout=commands.getoutput(cmd)