From 5d055ecf38e3ad5297c64e5786b5a73ff355074b Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Tue, 28 Oct 2014 19:41:00 +0100
Subject: images: Updated utils (no more tgz, Python 2.6 compat)

---
 images/create_imgs_package.py | 4 ++--
 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
-- 
cgit v1.2.3


From 57028ded0d685d1e102eea051781c34cc0b7c809 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Tue, 28 Oct 2014 19:42:05 +0100
Subject: cmake: Less strict cpack ignores to work on build machines

---
 host/cmake/Modules/UHDPackage.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake
index 0697b8c54..298b9d33a 100644
--- a/host/cmake/Modules/UHDPackage.cmake
+++ b/host/cmake/Modules/UHDPackage.cmake
@@ -123,7 +123,7 @@ SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
 ########################################################################
 
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "uhd-${TRIMMED_UHD_VERSION}")
-SET(CPACK_SOURCE_IGNORE_FILES "\\\\.git*;\\\\.swp$;build*")
+SET(CPACK_SOURCE_IGNORE_FILES "\\\\.git*;\\\\.swp$")
 
 ########################################################################
 # Setup CPack Components
-- 
cgit v1.2.3