Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.

4 files changed, 10 insertions, 11 deletions

diff --git a/abs/core/LinHES-config/LinHES-release b/abs/core/LinHES-config/LinHES-release
index 6fc5aed..156ac78 100644
--- a/abs/core/LinHES-config/LinHES-release
+++ b/abs/core/LinHES-config/LinHES-release
@@ -1 +1 @@
-LinHES R6.03.00 (M)
+LinHES R7.00.01 (Punta Gorda)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 655d5c0..ef25620 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.1
-pkgrel=40
+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,8 +101,7 @@ build() {
     install -m 0755 issue $startdir/pkg/etc/issue
 
 }
-
-md5sums=('297441b8d85820698c19e7c0ad5a3dfe'
+md5sums=('381de315bceff755c7c5106ee693059f'
          '1a4694fcd694b362c339bda781ed0f3e'
          'e36da536dd651ef182e7642337889e77'
          '3baa23764e1b6bcb2d66d7d859096940'
@@ -114,7 +113,7 @@ md5sums=('297441b8d85820698c19e7c0ad5a3dfe'
          '4620f6f498ef4523398635cb0bd59425'
          '06188493e5ed79cb501d3c5694dee8ca'
          'e459ed069317bccb20351f037a9df3d2'
-         'e519c47ae24fb65799ec57a4a2050653'
+         'b47f477693ed3e83a0cd951a616e16d1'
          '6aff504ed5e860adc1b7317cd0780900'
          '55fccb1da0417a896b724f7cfc32dd5a'
          'ab2aa42c2947148c2b1cac0ade6d1d55'
diff --git a/abs/core/LinHES-config/checkout_MythVantage.sh b/abs/core/LinHES-config/checkout_MythVantage.sh
index 944b9c6..21f25e5 100755
--- a/abs/core/LinHES-config/checkout_MythVantage.sh
+++ b/abs/core/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/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index 19295ca..908851b 100755
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/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)