Merge branch 'testing' of linhes.org:linhes_pkgbuild into testing

6 files changed, 29 insertions, 7 deletions

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index d26a94f..1f7d048 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=8.2
-pkgrel=16
+pkgrel=17
 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'
@@ -133,7 +133,7 @@ package() {
     install -o root -g root  -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf
 }
 
-md5sums=('af15ebdfbbc3442626a807569a0db2a4'
+md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff'
          '3f6855b7bb860a44f96a972c2e80f497'
          'f6e9dd7bc6cf0aaa3bd203dab4cb79b9'
          '2596460462cf6c889cf8f95485537b20'
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index 9556a0e..7dfbddb 100644
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -924,6 +924,10 @@ def copy_it(install_type):
     cp_and_log("/etc/dhcpcd.duid", data_config.MOUNTPOINT+"/etc/dhcpcd.duid")
     cp_and_log("/var/lib/dhcpcd/*.lease", data_config.MOUNTPOINT+"/var/lib/dhcpcd/")
 
+
+
+
+
 #   General fixup
     cmd = "chmod 777 %s/tmp" %(data_config.MOUNTPOINT)
     runcmd(cmd)
@@ -1828,7 +1832,7 @@ def find_upgrade():
         cp_and_log(data_config.MOUNTPOINT+"/var/lib/oss/", "/tmp/oss")
         cp_and_log("/tmp/etc/mdadm.conf", "/etc/mdadm.conf")
         cp_and_log("/tmp/etc/dhcpcd.duid", "/etc/dhcpcd.duid")
-        
+
     else:
         logging.info("Could not find systemconfig file %s", srcfile)
         cp_and_log(data_config.MOUNTPOINT+"/etc/", "/tmp/etc/")
@@ -1975,6 +1979,13 @@ def upgrade(hostoptions):
     cp_and_log2(srcfile, destfile, '*.pkl')
 
 
+    #ctn interfaces
+    srcfile = "%s/etc.old/net/ifaces/" %(data_config.MOUNTPOINT)
+    destfile = "%s/etc/net/ifaces/" %(data_config.MOUNTPOINT)
+    cp_and_log2(srcfile, destfile, 'ctn*')
+    
+
+
     mdfile = mdadm_find("/tmp")
     cp_and_log("/tmp"+mdfile, data_config.MOUNTPOINT+"/etc")
 
diff --git a/abs/core/ceton_infinitv/PKGBUILD b/abs/core/ceton_infinitv/PKGBUILD
index 2e73f8c..98b8a92 100755
--- a/abs/core/ceton_infinitv/PKGBUILD
+++ b/abs/core/ceton_infinitv/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Cecil Watson<knoppmyth@gmail.com>
 
 pkgname=ceton_infinitv
-_kernver=3.13.7-1-ARCH
+_kernver=3.13.7-2-ARCH
 pkgver=2013_0326_2226
-pkgrel=3
+pkgrel=4
 usb_pkgver=0.1.0
 pkgdesc="Drivers for Ceton InfiniTV4 - pci/usb "
 arch=('i686' 'x86_64')
@@ -40,7 +40,7 @@ package() {
   install -Dm755 ${srcdir}/ifctn.sh ${pkgdir}/usr/LH/bin/
   install -m755 ${srcdir}/reset_network.py ${pkgdir}/usr/bin/infinitv_reset_network.py
 }
-md5sums=('7ae02309e86ee642b13aeb2f446462bb'
+md5sums=('de329d7c9477a22fa8cb18f3a74b2ff5'
          '554f2c1bcc5d7169659f0ad3d8a513a5'
          'b5db78e2b9cccd65d6ea4c88dd028ace'
          '9f95a08bdd8c2a9e8d62e7daf52a90f6'
diff --git a/abs/core/dvd+rw-tools/PKGBUILD b/abs/core/dvd+rw-tools/PKGBUILD
index 21ea762..081cd6e 100644
--- a/abs/core/dvd+rw-tools/PKGBUILD
+++ b/abs/core/dvd+rw-tools/PKGBUILD
@@ -3,13 +3,14 @@
 
 pkgname=dvd+rw-tools
 pkgver=7.1
-pkgrel=4
+pkgrel=5
 pkgdesc="dvd burning tools"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://fy.chalmers.se/~appro/linux/DVD+RW"
 depends=('cdrkit' 'gcc-libs')
 source=("http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-${pkgver}.tar.gz"
+        'growisofs.sh'
         'dvd+rw-tools-7.0-dvddl.patch'
         'dvd+rw-tools-7.0-glibc2.6.90.patch'
         'dvd+rw-tools-7.0-wctomb.patch'
@@ -35,8 +36,12 @@ package() {
 
   install -m755 growisofs dvd+rw-booktype dvd+rw-format dvd+rw-mediainfo dvd-ram-control "${pkgdir}/usr/bin/"
   install -m644 growisofs.1 ${pkgdir}/usr/share/man/man1/growisofs.1
+  mv  ${pkgdir}/usr/bin/growisofs ${pkgdir}/usr/bin/growisofs.bin
+  install -m755 ${srcdir}/growisofs.sh  "${pkgdir}/usr/bin/growisofs"
+  
 }
 md5sums=('8acb3c885c87f6838704a0025e435871'
+         '8bc0f9438b0ba922260741bf4e6179b2'
          '65d30aa98ff314f256d0a1afb9e3edf6'
          '1be5401035ca850edb7e522f22aead4b'
          '3ba1af063b30f942e1cd2004044702d3'
diff --git a/abs/core/dvd+rw-tools/__changelog b/abs/core/dvd+rw-tools/__changelog
new file mode 100644
index 0000000..93b0cbf
--- /dev/null
+++ b/abs/core/dvd+rw-tools/__changelog
@@ -0,0 +1 @@
+add growisofs shell script to get around sudo
diff --git a/abs/core/dvd+rw-tools/growisofs.sh b/abs/core/dvd+rw-tools/growisofs.sh
new file mode 100644
index 0000000..e0b287c
--- /dev/null
+++ b/abs/core/dvd+rw-tools/growisofs.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+unset SUDO_COMMAND
+export MKISOFS=/usr/bin/mkisofs
+exec growisofs.bin "$@"
+