summaryrefslogtreecommitdiffstats
path: root/abs
diff options
context:
space:
mode:
authorGreg Frost <gregfrost1@bigpond.com>2009-08-02 23:11:48 (GMT)
committerGreg Frost <gregfrost1@bigpond.com>2009-08-02 23:11:48 (GMT)
commit1c8d8e45ae539f9cc20df8eafa9b7c47582d297e (patch)
treee580ff462633618338428af3fd10c3175b6e4781 /abs
parent0972c74e3af4a78fcef1cc0675efb8da81e5b3b5 (diff)
parentd3cdc0010fb49666796001edcacbfc408e9b8ea6 (diff)
downloadlinhes_pkgbuild-1c8d8e45ae539f9cc20df8eafa9b7c47582d297e.zip
linhes_pkgbuild-1c8d8e45ae539f9cc20df8eafa9b7c47582d297e.tar.gz
linhes_pkgbuild-1c8d8e45ae539f9cc20df8eafa9b7c47582d297e.tar.bz2
LinHES-config: confilict merge
Diffstat (limited to 'abs')
-rwxr-xr-xabs/core-testing/LinHES-config/systemconfig.py12
-rwxr-xr-xabs/core-testing/hdhomerun/PKGBUILD15
-rw-r--r--abs/core-testing/hdhomerun/hdhomerun_firmware_20070716.binbin90112 -> 0 bytes
-rw-r--r--abs/core-testing/local-website/PKGBUILD2
4 files changed, 19 insertions, 10 deletions
diff --git a/abs/core-testing/LinHES-config/systemconfig.py b/abs/core-testing/LinHES-config/systemconfig.py
index 4418003..b2f8529 100755
--- a/abs/core-testing/LinHES-config/systemconfig.py
+++ b/abs/core-testing/LinHES-config/systemconfig.py
@@ -50,9 +50,9 @@ def main(argv):
global systemconfig
systemconfig["MVROOT"]=MVROOT
restartlcd = False
- cmdmodule={"misc":False , "sleep":False , "hostype":False , "hostypec":False , "advanced":False , "audio":False , "network":False , "advancedX":False , "webuser":False , "restartfe":False , "reloadfe":False , "ddns":False , "screensaver":False , "ir":False , "this_is_install":False , "user":False, "software":False, "plugins":False, "smolt":False, "all":False}
+ cmdmodule={"misc":False , "sleep":False , "hostype":False , "hostypec":False , "advanced":False , "audio":False , "network":False , "advancedX":False , "webuser":False , "restartfe":False , "reloadfe":False , "ddns":False , "screensaver":False , "ir":False , "this_is_install":False , "user":False, "software":False, "plugins":False, "smolt":False, "all":False, "dhcp_request":False }
try:
- opts, args = getopt.getopt(argv, 'c:hm:', ["help","modules" ] )
+ opts, args = getopt.getopt(argv, 'c:hm:d:', ["help","modules" ] )
except getopt.GetoptError, why:
print why
usage()
@@ -65,6 +65,9 @@ def main(argv):
elif opt in ("-m"):
for i in arg.split(","):
cmdmodule[i]=True
+ elif opt in ("-d"):
+ dhcp_dev = arg
+
if cmdmodule["this_is_install"] or cmdmodule["hostypec"]:
systemconfig["hostypec"] = True
@@ -185,6 +188,11 @@ def main(argv):
mv_common.runcmd(cmd)
logging.info("__End of ssh user\n")
+ if cmdmodule["dhcp_request"]:
+ cmd = '''dhcpcd -t4 -h' ' -Td %s > /tmp/mvnetwork.dhcpinfo ''' %dhcp_dev
+ mv_common.runcmd(cmd)
+
+
if __name__ == "__main__":
config_file = "mv_config"
diff --git a/abs/core-testing/hdhomerun/PKGBUILD b/abs/core-testing/hdhomerun/PKGBUILD
index 8c569d2..0a327b9 100755
--- a/abs/core-testing/hdhomerun/PKGBUILD
+++ b/abs/core-testing/hdhomerun/PKGBUILD
@@ -1,21 +1,22 @@
pkgname=hdhomerun
-pkgver=20070726
+pkgver=20090415
pkgrel=1
pkgdesc="utils and firmware needed for the hdhomerun"
arch=(i686 x86_64)
url="http://www.silicondust.com"
-firmware=hdhomerun_firmware_20070716.bin
-source=("http://download.silicondust.com/hdhomerun/libhdhomerun_20070726.tgz http://download.silicondust.com/hdhomerun/$firmware")
+firmware=hdhomerun_atsc_firmware_20090415.bin
+firmware2=hdhomerun_dvbt_firmware_20090415.bin
+firmware3=hdhomerun_tech_atsc_firmware_20090415.bin
+url=http://download.silicondust.com/hdhomerun
+source=("$url/libhdhomerun_20090415.tgz" "$url/$firmware" "$url/$firmware2" "$url/$firmware3" )
build() {
cd $startdir/src || return 1
- tar -xvf libhdhomerun_20070726.tgz
cd libhdhomerun
make || return 1
install -D -m755 hdhomerun_config $startdir/pkg/usr/bin/hdhomerun_config
cd ..
- install -D -m755 $firmware $startdir/pkg/lib/firmware/$firmware
-
-
+ mkdir -p $startdir/pkg/lib/firmware
+ cp $startdir/src/*.bin $startdir/pkg/lib/firmware/
}
diff --git a/abs/core-testing/hdhomerun/hdhomerun_firmware_20070716.bin b/abs/core-testing/hdhomerun/hdhomerun_firmware_20070716.bin
deleted file mode 100644
index 6ad51af..0000000
--- a/abs/core-testing/hdhomerun/hdhomerun_firmware_20070716.bin
+++ /dev/null
Binary files differ
diff --git a/abs/core-testing/local-website/PKGBUILD b/abs/core-testing/local-website/PKGBUILD
index c596881..564b238 100644
--- a/abs/core-testing/local-website/PKGBUILD
+++ b/abs/core-testing/local-website/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=local-website
pkgver=2
-pkgrel=9
+pkgrel=10
pkgdesc="Contents of http://localhost"
arch=(i686 x86_64)
license=('GPL')