mirror of https://github.com/parazyd/arm-sdk.git
fixes to $os being called too early
This commit is contained in:
parent
6c0d0fde76
commit
19f090ea92
|
|
@ -26,14 +26,14 @@ arch="armhf"
|
||||||
size=1337
|
size=1337
|
||||||
extra_packages=()
|
extra_packages=()
|
||||||
# Ones below should not need changing
|
# Ones below should not need changing
|
||||||
workdir="$R/arm/${device_name}-build"
|
|
||||||
strapdir="${workdir}/${os}-${arch}"
|
|
||||||
parted_boot=(fat32 2048s 264191s)
|
parted_boot=(fat32 2048s 264191s)
|
||||||
parted_root=(ext4 264192s 100%)
|
parted_root=(ext4 264192s 100%)
|
||||||
inittab="T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100"
|
inittab="T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100"
|
||||||
custmodules=(sunxi_emac)
|
custmodules=(sunxi_emac)
|
||||||
# source common commands
|
# source common commands
|
||||||
source $common
|
source $common
|
||||||
|
workdir="$R/arm/${device_name}-build"
|
||||||
|
strapdir="${workdir}/${os}-${arch}"
|
||||||
image_name="${os}-${release}-${version}-${arch}-${device_name}"
|
image_name="${os}-${release}-${version}-${arch}-${device_name}"
|
||||||
# -- end settings --
|
# -- end settings --
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,6 @@ extra_packages=(wpasupplicant abootimg cgpt fake-hwclock u-boot-tools ntpdate)
|
||||||
extra_packages+=(vboot-utils vboot-kernel-utils)
|
extra_packages+=(vboot-utils vboot-kernel-utils)
|
||||||
extra_packages+=(laptop-mode-tools usbutils sudo vim)
|
extra_packages+=(laptop-mode-tools usbutils sudo vim)
|
||||||
# Ones below should not need changing
|
# Ones below should not need changing
|
||||||
workdir="$R/arm/${device_name}-build"
|
|
||||||
strapdir="${workdir}/${os}-${arch}"
|
|
||||||
gpt=1
|
gpt=1
|
||||||
#parted_boot=(fat32 2048s 264191s)
|
#parted_boot=(fat32 2048s 264191s)
|
||||||
#parted_root=(ext4 264192s 100%)
|
#parted_root=(ext4 264192s 100%)
|
||||||
|
|
@ -37,6 +35,8 @@ gpt=1
|
||||||
custmodules=()
|
custmodules=()
|
||||||
# source common commands
|
# source common commands
|
||||||
source $common
|
source $common
|
||||||
|
workdir="$R/arm/${device_name}-build"
|
||||||
|
strapdir="${workdir}/${os}-${arch}"
|
||||||
image_name="${os}-${release}-${version}-${arch}-${device_name}"
|
image_name="${os}-${release}-${version}-${arch}-${device_name}"
|
||||||
# -- end settings --
|
# -- end settings --
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,14 +26,14 @@ arch="armhf"
|
||||||
size=1337
|
size=1337
|
||||||
extra_packages=()
|
extra_packages=()
|
||||||
# Ones below should not need changing
|
# Ones below should not need changing
|
||||||
workdir="$R/arm/${device_name}-build"
|
|
||||||
strapdir="${workdir}/${os}-${arch}"
|
|
||||||
parted_boot=(fat32 2048s 264191s)
|
parted_boot=(fat32 2048s 264191s)
|
||||||
parted_root=(ext4 264192s 100%)
|
parted_root=(ext4 264192s 100%)
|
||||||
inittab="T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100"
|
inittab="T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100"
|
||||||
custmodules=(sunxi_emac)
|
custmodules=(sunxi_emac)
|
||||||
# source common commands
|
# source common commands
|
||||||
source $common
|
source $common
|
||||||
|
workdir="$R/arm/${device_name}-build"
|
||||||
|
strapdir="${workdir}/${os}-${arch}"
|
||||||
image_name="${os}-${release}-${version}-${arch}-${device_name}"
|
image_name="${os}-${release}-${version}-${arch}-${device_name}"
|
||||||
# -- end settings --
|
# -- end settings --
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,6 @@ arch="armhf"
|
||||||
size=1337
|
size=1337
|
||||||
extra_packages=(wpasupplicant ntpdate)
|
extra_packages=(wpasupplicant ntpdate)
|
||||||
# Ones below should not need changing
|
# 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)
|
#enable_qemu_wrapper=1 # Uncomment this to enable qemu-wrapper (consult the readme)
|
||||||
parted_boot=(fat32 0 64)
|
parted_boot=(fat32 0 64)
|
||||||
parted_root=(ext4 64 -1)
|
parted_root=(ext4 64 -1)
|
||||||
|
|
@ -35,6 +33,8 @@ inittab="T0:23:respawn:/sbin/agetty -L ttyAMA0 115200 vt100"
|
||||||
custmodules=()
|
custmodules=()
|
||||||
# source common commands
|
# source common commands
|
||||||
source $common
|
source $common
|
||||||
|
workdir="$R/arm/${armdev}-build"
|
||||||
|
strapdir="${workdir}/${os}-${arch}"
|
||||||
image_name="${os}-${release}-${version}-${arch}-${device_name}"
|
image_name="${os}-${release}-${version}-${arch}-${device_name}"
|
||||||
# -- end settings --
|
# -- end settings --
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue