From 6c0d0fde7643996a7850bde596d86e94f25a16e7 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Sun, 17 Apr 2016 12:20:30 +0200
Subject: [PATCH] vars fix

---
 arm/scripts/bananapi.sh        | 6 +++---
 arm/scripts/chromebook-acer.sh | 7 +++----
 arm/scripts/cubieboard2.sh     | 6 +++---
 arm/scripts/raspberry-pi-2.sh  | 7 +++----
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/arm/scripts/bananapi.sh b/arm/scripts/bananapi.sh
index e243cf4..2c4835b 100755
--- a/arm/scripts/bananapi.sh
+++ b/arm/scripts/bananapi.sh
@@ -23,7 +23,6 @@
 # -- settings --
 device_name="bananapi"
 arch="armhf"
-image_name="${os}-${release}-${version}-${arch}-${device_name}"
 size=1337
 extra_packages=()
 # Ones below should not need changing
@@ -33,10 +32,11 @@ parted_boot=(fat32 2048s 264191s)
 parted_root=(ext4 264192s 100%)
 inittab="T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100"
 custmodules=(sunxi_emac)
+# source common commands
+source $common
+image_name="${os}-${release}-${version}-${arch}-${device_name}"
 # -- end settings --
 
-# source common commands and add toolchain to PATH
-source $common
 
 ${device_name}-build-kernel() {
 	fn ${device_name}-build-kernel
diff --git a/arm/scripts/chromebook-acer.sh b/arm/scripts/chromebook-acer.sh
index 755c065..0bc7a8b 100755
--- a/arm/scripts/chromebook-acer.sh
+++ b/arm/scripts/chromebook-acer.sh
@@ -23,7 +23,6 @@
 # -- settings --
 device_name="chromeacer"
 arch="armhf"
-image_name="${os}-${release}-${version}-${arch}-${device_name}"
 size=1730
 extra_packages=(wpasupplicant abootimg cgpt fake-hwclock u-boot-tools ntpdate)
 extra_packages+=(vboot-utils vboot-kernel-utils)
@@ -36,10 +35,10 @@ gpt=1
 #parted_root=(ext4 264192s 100%)
 #inittab="T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100"
 custmodules=()
-# -- end settings --
-
-# source common commands and add toolchain to PATH
+# source common commands
 source $common
+image_name="${os}-${release}-${version}-${arch}-${device_name}"
+# -- end settings --
 
 ${device_name}-build-kernel() {
 	fn ${device_name}-build-kernel
diff --git a/arm/scripts/cubieboard2.sh b/arm/scripts/cubieboard2.sh
index 595daa7..71b2821 100755
--- a/arm/scripts/cubieboard2.sh
+++ b/arm/scripts/cubieboard2.sh
@@ -23,7 +23,6 @@
 # -- settings --
 device_name="cubieboard2"
 arch="armhf"
-image_name="${os}-${release}-${version}-${arch}-${device_name}"
 size=1337
 extra_packages=()
 # Ones below should not need changing
@@ -33,10 +32,11 @@ parted_boot=(fat32 2048s 264191s)
 parted_root=(ext4 264192s 100%)
 inittab="T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100"
 custmodules=(sunxi_emac)
+# source common commands
+source $common
+image_name="${os}-${release}-${version}-${arch}-${device_name}"
 # -- end settings --
 
-# source common commands and add toolchain to PATH
-source $common
 
 ${device_name}-build-kernel() {
 	fn ${device_name}-build-kernel
diff --git a/arm/scripts/raspberry-pi-2.sh b/arm/scripts/raspberry-pi-2.sh
index e78bf1d..6fb62e9 100755
--- a/arm/scripts/raspberry-pi-2.sh
+++ b/arm/scripts/raspberry-pi-2.sh
@@ -23,7 +23,6 @@
 # -- settings --
 device_name="raspi2"
 arch="armhf"
-image_name="${os}-${release}-${version}-${arch}-${device_name}"
 size=1337
 extra_packages=(wpasupplicant ntpdate)
 # Ones below should not need changing
@@ -34,10 +33,10 @@ parted_boot=(fat32 0 64)
 parted_root=(ext4 64 -1)
 inittab="T0:23:respawn:/sbin/agetty -L ttyAMA0 115200 vt100"
 custmodules=()
-# -- end settings --
-
-# source common commands and add toolchain to PATH
+# source common commands
 source $common
+image_name="${os}-${release}-${version}-${arch}-${device_name}"
+# -- end settings --
 
 ${device_name}-build-kernel() {
 	fn ${device_name}-build-kernel