commit bfca4da27fd929c09568fe4243fc07425f4caff0
parent 5bf8a3a10ce397dd3ef13f71600794b2194ec7ca
Author: parazyd <parazyd@dyne.org>
Date: Thu, 21 Apr 2016 18:11:13 +0200
even more
Diffstat:
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arm/profiles/common-devuan b/arm/profiles/common-devuan
@@ -36,7 +36,7 @@ base_packages=(bzip2 dialog apt-utils fakeroot e2fsprogs parted)
system_packages=(sysvinit ssh)
-writebase="$strapdir"
+writebase=${strapdir}
command -v dcfldd >/dev/null && DD=`command -v dcfldd`
DD=${DD:-/bin/dd}
# -- end settings --
diff --git a/arm/scripts/bananapi.sh b/arm/scripts/bananapi.sh
@@ -33,9 +33,9 @@ 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}"
+source $common
image_name="${os}-${release}-${version}-${arch}-${device_name}"
# -- end settings --
diff --git a/arm/scripts/chromebook-acer.sh b/arm/scripts/chromebook-acer.sh
@@ -36,9 +36,9 @@ gpt=1
#inittab="T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100"
custmodules=()
# source common commands
-source $common
workdir="$R/arm/${device_name}-build"
strapdir="${workdir}/${os}-${arch}"
+source $common
image_name="${os}-${release}-${version}-${arch}-${device_name}"
# -- end settings --
diff --git a/arm/scripts/cubieboard2.sh b/arm/scripts/cubieboard2.sh
@@ -33,9 +33,9 @@ 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}"
+source $common
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
@@ -34,9 +34,9 @@ parted_root=(ext4 64 -1)
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}"
+source $common
image_name="${os}-${release}-${version}-${arch}-${device_name}"
# -- end settings --
diff --git a/sdk b/sdk
@@ -41,7 +41,7 @@ vars+=(R sdk_loaded)
# script variables
vars+=(workdir strapdir writebase)
vars+=(loopdevice mappdevice)
-vars+=(arm_build_device)
+vars+=(arm_build_device armdev)
# script locals
vars+=(device_name image_name arch size)
vars+=(inittab)