diff options
| author | Stephen Toub <stoub@microsoft.com> | 2017-01-18 15:10:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 15:10:11 +0300 |
| commit | ec750173dcd48b644e937e7cab2902fe7f53219c (patch) | |
| tree | bc2edad9978b51e2a88cdee832bd35b8a968d2e0 /cross | |
| parent | 68571734f84db4cebce5356bb3138569252caf19 (diff) | |
| parent | 247dc6bcd054cc6bed00828dbdb9d7c36e57b9ec (diff) | |
Merge pull request #15266 from hqueue/arm/cross
Change UbuntuCodeName to LinuxCodeName in build-rootfs.sh
Diffstat (limited to 'cross')
| -rwxr-xr-x | cross/build-rootfs.sh | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/cross/build-rootfs.sh b/cross/build-rootfs.sh index 107415ad43..cda175252c 100755 --- a/cross/build-rootfs.sh +++ b/cross/build-rootfs.sh @@ -2,9 +2,9 @@ usage() { - echo "Usage: $0 [BuildArch] [UbuntuCodeName]" + echo "Usage: $0 [BuildArch] [LinuxCodeName]" echo "BuildArch can be: arm, armel, arm64, x86" - echo "UbuntuCodeName - optional, Code name for Ubuntu, can be: trusty(default), vivid, wily, xenial. If BuildArch is armel, jessie(default) or tizen." + echo "LinuxCodeName - optional, Code name for Ubuntu, can be: trusty(default), vivid, wily, xenial. If BuildArch is armel, jessie(default) or tizen." exit 1 } @@ -35,7 +35,7 @@ fi __BuildArch=arm __UbuntuArch=armhf -__UbuntuCodeName=trusty +__LinuxCodeName=trusty __UbuntuRepo="http://ports.ubuntu.com/" __MachineTriple=arm-linux-gnueabihf @@ -67,25 +67,25 @@ for i in "$@" ; do __UbuntuArch=armel __UbuntuRepo="http://ftp.debian.org/debian/" __MachineTriple=arm-linux-gnueabi - __UbuntuCodeName=jessie + __LinuxCodeName=jessie ;; vivid) - if [ "$__UbuntuCodeName" != "jessie" ]; then - __UbuntuCodeName=vivid + if [ "$__LinuxCodeName" != "jessie" ]; then + __LinuxCodeName=vivid fi ;; wily) - if [ "$__UbuntuCodeName" != "jessie" ]; then - __UbuntuCodeName=wily + if [ "$__LinuxCodeName" != "jessie" ]; then + __LinuxCodeName=wily fi ;; xenial) - if [ "$__UbuntuCodeName" != "jessie" ]; then - __UbuntuCodeName=xenial + if [ "$__LinuxCodeName" != "jessie" ]; then + __LinuxCodeName=xenial fi ;; jessie) - __UbuntuCodeName=jessie + __LinuxCodeName=jessie __UbuntuRepo="http://ftp.debian.org/debian/" ;; tizen) @@ -94,7 +94,7 @@ for i in "$@" ; do usage; exit 1; fi - __UbuntuCodeName= + __LinuxCodeName= __UbuntuRepo= __Tizen=tizen ;; @@ -122,9 +122,9 @@ fi umount $__RootfsDir/* rm -rf $__RootfsDir -if [[ -n $__UbuntuCodeName ]]; then - qemu-debootstrap --arch $__UbuntuArch $__UbuntuCodeName $__RootfsDir $__UbuntuRepo - cp $__CrossDir/$__BuildArch/sources.list.$__UbuntuCodeName $__RootfsDir/etc/apt/sources.list +if [[ -n $__LinuxCodeName ]]; then + qemu-debootstrap --arch $__UbuntuArch $__LinuxCodeName $__RootfsDir $__UbuntuRepo + cp $__CrossDir/$__BuildArch/sources.list.$__LinuxCodeName $__RootfsDir/etc/apt/sources.list chroot $__RootfsDir apt-get update chroot $__RootfsDir apt-get -f -y install chroot $__RootfsDir apt-get -y install $__UbuntuPackages |