arm-sdk

commit 19f090ea923525365bc28c23e6d95ddae372055b
parent 6c0d0fde7643996a7850bde596d86e94f25a16e7
Author: parazyd <parazyd@dyne.org>
Date:   Wed, 20 Apr 2016 14:50:40 +0200

fixes to $os being called too early

Diffstat:
M
arm/scripts/bananapi.sh
 | 
4
++--
M
arm/scripts/chromebook-acer.sh
 | 
4
++--
M
arm/scripts/cubieboard2.sh
 | 
4
++--
M
arm/scripts/raspberry-pi-2.sh
 | 
4
++--

4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arm/scripts/bananapi.sh b/arm/scripts/bananapi.sh
@@ -26,14 +26,14 @@ arch="armhf"
 size=1337
 extra_packages=()
 # Ones below should not need changing
-workdir="$R/arm/${device_name}-build"
-strapdir="${workdir}/${os}-${arch}"
 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
+workdir="$R/arm/${device_name}-build"
+strapdir="${workdir}/${os}-${arch}"
 image_name="${os}-${release}-${version}-${arch}-${device_name}"
 # -- end settings --
 
diff --git a/arm/scripts/chromebook-acer.sh b/arm/scripts/chromebook-acer.sh
@@ -28,8 +28,6 @@ extra_packages=(wpasupplicant abootimg cgpt fake-hwclock u-boot-tools ntpdate)
 extra_packages+=(vboot-utils vboot-kernel-utils)
 extra_packages+=(laptop-mode-tools usbutils sudo vim)
 # Ones below should not need changing
-workdir="$R/arm/${device_name}-build"
-strapdir="${workdir}/${os}-${arch}"
 gpt=1
 #parted_boot=(fat32 2048s 264191s)
 #parted_root=(ext4 264192s 100%)
@@ -37,6 +35,8 @@ gpt=1
 custmodules=()
 # source common commands
 source $common
+workdir="$R/arm/${device_name}-build"
+strapdir="${workdir}/${os}-${arch}"
 image_name="${os}-${release}-${version}-${arch}-${device_name}"
 # -- end settings --
 
diff --git a/arm/scripts/cubieboard2.sh b/arm/scripts/cubieboard2.sh
@@ -26,14 +26,14 @@ arch="armhf"
 size=1337
 extra_packages=()
 # Ones below should not need changing
-workdir="$R/arm/${device_name}-build"
-strapdir="${workdir}/${os}-${arch}"
 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
+workdir="$R/arm/${device_name}-build"
+strapdir="${workdir}/${os}-${arch}"
 image_name="${os}-${release}-${version}-${arch}-${device_name}"
 # -- end settings --
 
diff --git a/arm/scripts/raspberry-pi-2.sh b/arm/scripts/raspberry-pi-2.sh
@@ -26,8 +26,6 @@ arch="armhf"
 size=1337
 extra_packages=(wpasupplicant ntpdate)
 # Ones below should not need changing
-workdir="$R/arm/${armdev}-build"
-strapdir="${workdir}/${os}-${arch}"
 #enable_qemu_wrapper=1 # Uncomment this to enable qemu-wrapper (consult the readme)
 parted_boot=(fat32 0 64)
 parted_root=(ext4 64 -1)
@@ -35,6 +33,8 @@ inittab="T0:23:respawn:/sbin/agetty -L ttyAMA0 115200 vt100"
 custmodules=()
 # source common commands
 source $common
+workdir="$R/arm/${armdev}-build"
+strapdir="${workdir}/${os}-${arch}"
 image_name="${os}-${release}-${version}-${arch}-${device_name}"
 # -- end settings --