From c03be99c7478e3fc7b17abf6564244a00b60edba Mon Sep 17 00:00:00 2001
From: Catherine Garabedian <catherine@kubos.co>
Date: Thu, 23 May 2019 19:35:55 +0000
Subject: [PATCH] Updating scripts for latests BR version

---
 tools/format-image.sh      |  4 ++--
 tools/format-sd.sh         |  2 +-
 tools/kpack-NOR.its        |  2 +-
 tools/kubos-kernel.sh      |  4 ++--
 tools/kubos-nor-package.sh |  4 ++--
 tools/kubos-package.sh     |  4 ++--
 tools/patch-buildroot.sh   | 26 --------------------------
 7 files changed, 10 insertions(+), 36 deletions(-)
 delete mode 100755 tools/patch-buildroot.sh

diff --git a/tools/format-image.sh b/tools/format-image.sh
index 6cb8a7eb..a7867651 100755
--- a/tools/format-image.sh
+++ b/tools/format-image.sh
@@ -31,7 +31,7 @@
  
 device=""
 image=kubos-linux.img
-branch=master
+branch=1.0
 package=0
 size=3800
 output=output
@@ -69,7 +69,7 @@ do
       	  ;;
     esac
 done
-: ${BASE_DIR:=../../buildroot-2017.02.8/${output}}
+: ${BASE_DIR:=../../buildroot-2019.02.2/${output}}
 
 if [ "${package}" -gt "1" ] && [ ! ${rflag} ]; then
     echo "-t target must be specified in order to build kernel" >&2
diff --git a/tools/format-sd.sh b/tools/format-sd.sh
index 9e004fb7..bd655d89 100755
--- a/tools/format-sd.sh
+++ b/tools/format-sd.sh
@@ -60,7 +60,7 @@ do
       	  ;;
     esac
 done
-: ${BASE_DIR:=../../buildroot-2017.02.8/output}
+: ${BASE_DIR:=../../buildroot-2019.02.2/output}
 
 if ${wipe}; then
   echo '\nWiping SD card. This may take a while...'
diff --git a/tools/kpack-NOR.its b/tools/kpack-NOR.its
index 34292646..ee6f637d 100644
--- a/tools/kpack-NOR.its
+++ b/tools/kpack-NOR.its
@@ -25,7 +25,7 @@
 
 	images {
 		dtb@1 {
-			data = /incbin/("./../../buildroot-2017.02.8/output/images/at91sam9g20isis.dtb");
+			data = /incbin/("./../../buildroot-2019.02.2/output/images/at91sam9g20isis.dtb");
 			type = "firmware";
 			arch = "arm";
 			os = "linux";
diff --git a/tools/kubos-kernel.sh b/tools/kubos-kernel.sh
index 13d09f88..b550aacd 100755
--- a/tools/kubos-kernel.sh
+++ b/tools/kubos-kernel.sh
@@ -18,7 +18,7 @@
 #
  
 input=kubos-kernel.its
-branch=master
+branch=1.0
 output=output
 
 # Process command arguments
@@ -40,7 +40,7 @@ do
 	    ;;
     esac
 done
-: ${BASE_DIR:=../../buildroot-2017.02.8/${output}}
+: ${BASE_DIR:=../../buildroot-2019.02.2/${output}}
 
 # Build the package
 ${BASE_DIR}/build/uboot-${branch}/tools/mkimage -f ${input} kubos-kernel.itb
diff --git a/tools/kubos-nor-package.sh b/tools/kubos-nor-package.sh
index 96685a1b..e6def296 100755
--- a/tools/kubos-nor-package.sh
+++ b/tools/kubos-nor-package.sh
@@ -19,7 +19,7 @@
  
 version=$(date +%Y.%m.%d)
 input=kpack-NOR.its
-branch=master
+branch=1.0
 
 # Process command arguments
 
@@ -40,7 +40,7 @@ do
 	    ;;
     esac
 done
-: ${BASE_DIR:=../../buildroot-2017.02.8/output}
+: ${BASE_DIR:=../../buildroot-2019.02.2/output}
 
 # Build the package
 ${BASE_DIR}/build/uboot-${branch}/tools/mkimage -f ${input} kpack-nor-${version}.itb
diff --git a/tools/kubos-package.sh b/tools/kubos-package.sh
index 6763e8c0..10cb803a 100755
--- a/tools/kubos-package.sh
+++ b/tools/kubos-package.sh
@@ -19,7 +19,7 @@
  
 version=$(date +%Y.%m.%d)
 input=kpack.its
-branch=master
+branch=1.0
 rflag=false
 kernel=false
 output=output
@@ -58,7 +58,7 @@ do
 	    ;;
     esac
 done
-: ${BASE_DIR:=../../buildroot-2017.02.8/${output}}
+: ${BASE_DIR:=../../buildroot-2019.02.2/${output}}
 
 if ! ${rflag}
 then
diff --git a/tools/patch-buildroot.sh b/tools/patch-buildroot.sh
deleted file mode 100755
index 6eeef80c..00000000
--- a/tools/patch-buildroot.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2017 Kubos Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# The current version of BuildRoot that we use doesn't properly verify
-# the Python modules as part of the build process. It attempts to compile
-# everything, which includes Python3 modules. Since we don't support
-# Python3 at the moment, this process fails. The latest version of
-# the pycompile.py script fixes this issue. For the sake of time, we'll
-# just update that single file, rather than attempting to upgrade to the
-# latest version of BuildRoot
-#
-
-cp pycompile.py ../../buildroot-2017.02.8/support/scripts
\ No newline at end of file