Remove workbook dependency from download mgr
The download path for temporary files isn't a property
of the board. Hardcode /tmp into the application.
Change-Id: Ib375ddee9a4c50aa8817980562fbd5b1191b5542
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/configs/Barreleye.py b/configs/Barreleye.py
index 6403ed6..66eee6c 100644
--- a/configs/Barreleye.py
+++ b/configs/Barreleye.py
@@ -2,7 +2,6 @@
HOME_PATH = './'
CACHE_PATH = '/var/cache/obmc/'
-FLASH_DOWNLOAD_PATH = "/tmp"
GPIO_BASE = 320
SYSTEM_NAME = "Barreleye"
diff --git a/configs/Firestone.py b/configs/Firestone.py
index ba783aa..086e0b2 100644
--- a/configs/Firestone.py
+++ b/configs/Firestone.py
@@ -2,7 +2,6 @@
HOME_PATH = './'
CACHE_PATH = '/var/cache/obmc/'
-FLASH_DOWNLOAD_PATH = "/tmp"
GPIO_BASE = 320
SYSTEM_NAME = "Firestone"
diff --git a/configs/Garrison.py b/configs/Garrison.py
index 98d1a86..acc80e8 100644
--- a/configs/Garrison.py
+++ b/configs/Garrison.py
@@ -2,7 +2,6 @@
HOME_PATH = './'
CACHE_PATH = '/var/cache/obmc/'
-FLASH_DOWNLOAD_PATH = "/tmp"
GPIO_BASE = 320
SYSTEM_NAME = "Garrison"
diff --git a/configs/Palmetto.py b/configs/Palmetto.py
index 1eed30d..99a8e23 100644
--- a/configs/Palmetto.py
+++ b/configs/Palmetto.py
@@ -2,7 +2,6 @@
HOME_PATH = './'
CACHE_PATH = '/var/cache/obmc/'
-FLASH_DOWNLOAD_PATH = "/tmp"
GPIO_BASE = 320
SYSTEM_NAME = "Palmetto"
diff --git a/configs/Witherspoon.py b/configs/Witherspoon.py
index 0eac8e6..a7d06ff 100644
--- a/configs/Witherspoon.py
+++ b/configs/Witherspoon.py
@@ -2,7 +2,6 @@
HOME_PATH = './'
CACHE_PATH = '/var/cache/obmc/'
-FLASH_DOWNLOAD_PATH = "/tmp"
GPIO_BASE = 320
SYSTEM_NAME = "Witherspoon"
diff --git a/pydownloadmgr/download_manager.py b/pydownloadmgr/download_manager.py
index aeb85c7..5b2b92d 100644
--- a/pydownloadmgr/download_manager.py
+++ b/pydownloadmgr/download_manager.py
@@ -7,9 +7,9 @@
import dbus.mainloop.glib
import subprocess
from obmc.dbuslib.bindings import get_dbus
-import obmc_system_config as System
+FLASH_DOWNLOAD_PATH = '/tmp'
DBUS_NAME = 'org.openbmc.managers.Download'
OBJ_NAME = '/org/openbmc/managers/Download'
TFTP_PORT = 69
@@ -37,7 +37,7 @@
try:
filename = str(filename)
print "Downloading: "+filename+" from "+ip
- outfile = System.FLASH_DOWNLOAD_PATH+"/"+filename
+ outfile = FLASH_DOWNLOAD_PATH+"/"+filename
rc = subprocess.call(["tftp", "-l",outfile,"-r",filename,"-g",ip])
if (rc == 0):
self.DownloadComplete(outfile,filename)
@@ -55,7 +55,7 @@
try:
filename = str(filename)
print "Downloading: "+filename+" from "+url
- outfile = System.FLASH_DOWNLOAD_PATH+"/"+filename
+ outfile = FLASH_DOWNLOAD_PATH+"/"+filename
subprocess.call(["tftp", "-l",outfile,"-r",filename,"-g",url])
obj = bus.get_object("org.openbmc.control.Flash",path)
intf = dbus.Interface(obj,"org.openbmc.Flash")