diff options
| author | Martin Braun <martin.braun@ettus.com> | 2014-10-28 19:41:00 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2014-10-28 20:29:06 +0100 |
| commit | 5d055ecf38e3ad5297c64e5786b5a73ff355074b (patch) | |
| tree | fd90899b64600087c9cbec03280584c594975e6a | |
| parent | fd61f0cc3360ad850f499de41a6701bbcdf29c98 (diff) | |
| download | uhd-5d055ecf38e3ad5297c64e5786b5a73ff355074b.tar.gz uhd-5d055ecf38e3ad5297c64e5786b5a73ff355074b.tar.bz2 uhd-5d055ecf38e3ad5297c64e5786b5a73ff355074b.zip | |
images: Updated utils (no more tgz, Python 2.6 compat)
| -rwxr-xr-x | images/create_imgs_package.py | 4 | ||||
| -rwxr-xr-x | images/make_zip.sh | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/images/create_imgs_package.py b/images/create_imgs_package.py index 4b49390ce..6b1d5580e 100755 --- a/images/create_imgs_package.py +++ b/images/create_imgs_package.py @@ -54,7 +54,7 @@ def parse_args(): def move_zip_to_repo(base_url, zipfilename): final_destination = os.path.join(base_url, zipfilename) if os.path.exists(final_destination): - print "WARNING: A file with name {} is already in the images repository.".format(zipfilename) + print "WARNING: A file with name {0} is already in the images repository.".format(zipfilename) print "Overwrite? [y/N]", ans = raw_input() if ans.strip().upper() != 'Y': @@ -85,7 +85,7 @@ def main(): print 'MD5: ', md5 base_url = uhdimgs.get_base_url() if uhdimgs.base_url_is_local(base_url) and os.access(base_url, os.W_OK): - print "== Moving ZIP file to {}...".format(base_url) + print "== Moving ZIP file to {0}...".format(base_url) move_zip_to_repo(base_url, zipfilename) print "== Updating CMakeLists.txt..." uhdimgs.update_main_cmake_file(md5, zipfilename) diff --git a/images/make_zip.sh b/images/make_zip.sh index b2e9645ef..f07507a94 100755 --- a/images/make_zip.sh +++ b/images/make_zip.sh @@ -29,11 +29,8 @@ cd build cmake .. -DCPACK_GENERATOR=ZIP -DUHD_RELEASE_MODE="$1" .. make package mv uhd-images*.zip .. -cmake .. -DCPACK_GENERATOR=TGZ -DUHD_RELEASE_MODE="$1" .. -make package # Move images to here and clean up after us: -mv uhd-images*.tar.gz .. cd .. rm -r build rm images/*.tag |