From 34627f1c7780d8c8578964c6594fef7a6640e727 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Thu, 12 Apr 2012 09:46:38 -0700
Subject: utils: card/net burner string decode

---
 host/utils/usrp2_card_burner.py    | 2 +-
 host/utils/usrp_n2xx_net_burner.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/host/utils/usrp2_card_burner.py b/host/utils/usrp2_card_burner.py
index 34c40d5a0..02d5c4b18 100755
--- a/host/utils/usrp2_card_burner.py
+++ b/host/utils/usrp2_card_burner.py
@@ -50,7 +50,7 @@ def command(*args):
         stderr=subprocess.STDOUT,
     )
     ret = p.wait()
-    verbose = p.stdout.read().decode()
+    verbose = p.stdout.read().decode('utf-8', errors='ignore')
     if ret != 0: raise Exception(verbose)
     return verbose
 
diff --git a/host/utils/usrp_n2xx_net_burner.py b/host/utils/usrp_n2xx_net_burner.py
index 31c94405b..ae6219524 100755
--- a/host/utils/usrp_n2xx_net_burner.py
+++ b/host/utils/usrp_n2xx_net_burner.py
@@ -134,7 +134,7 @@ def command(*args):
         stderr=subprocess.STDOUT,
     )
     ret = p.wait()
-    verbose = p.stdout.read().decode()
+    verbose = p.stdout.read().decode('utf-8', errors='ignore')
     if ret != 0: raise Exception(verbose)
     return verbose
 
-- 
cgit v1.2.3


From 44b68ee80adbfc70869a5fc20ec93c4843f039e0 Mon Sep 17 00:00:00 2001
From: Nicholas Corgan <nick.corgan@ettus.com>
Date: Thu, 12 Apr 2012 10:37:54 -0700
Subject: cmake: UHDVersion.cmake gets rid of git commit number if 'release' is
 specified in UHD_RELEASE_MODE

---
 host/cmake/Modules/UHDVersion.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake
index 734ef97e6..13d952353 100644
--- a/host/cmake/Modules/UHDVersion.cmake
+++ b/host/cmake/Modules/UHDVersion.cmake
@@ -68,4 +68,8 @@ IF(UHD_RELEASE_MODE)
 ENDIF()
 
 ########################################################################
-SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}-${UHD_GIT_COUNT}-${UHD_GIT_HASH}")
+IF(UHD_RELEASE_MODE STREQUAL "release")
+    SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}-${UHD_GIT_HASH}")
+ELSE()
+    SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}-${UHD_GIT_COUNT}-${UHD_GIT_HASH}")
+ENDIF()
-- 
cgit v1.2.3