summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Magnusson <mikma@users.sourceforge.net>2018-02-27 15:55:15 +0100
committerMikael Magnusson <mikma@users.sourceforge.net>2018-02-27 15:55:15 +0100
commit42bfaa149f6e6b83974651789a9595090619abdb (patch)
tree15b888ff9ec8368497ff8c33972034863555cfce
parent17587c19c5046760ef5e6353bb04180b3aa4269b (diff)
Remove arch_dash variable
-rwxr-xr-xbuild.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/build.sh b/build.sh
index ab818fa..0b4729c 100755
--- a/build.sh
+++ b/build.sh
@@ -4,7 +4,6 @@ set -e
arch=x86
subarch=64
-arch_dash=${arch}-${subarch}
ver=17.01.4
image=openwrt
dist=lede
@@ -16,14 +15,14 @@ sdk=build_dir/${sdk_name}
procd_url=https://github.com/openwrt/openwrt/branches/lede-17.01/package/system/procd
procd_extra_ver=lxd-3
-lxc_tar=bin/${dist}-${ver}-${arch_dash}-lxd.tar.gz
+lxc_tar=bin/${dist}-${ver}-${arch}-${subarch}-lxd.tar.gz
metadata=bin/metadata.yaml
download_rootfs() {
if test $ver = snapshot; then
- local rootfs_url=https://downloads.openwrt.org/snapshots/targets/${arch}/${subarch}/${dist}-${arch_dash}-generic-rootfs.tar.gz
+ local rootfs_url=https://downloads.openwrt.org/snapshots/targets/${arch}/${subarch}/${dist}-${arch}-${subarch}-generic-rootfs.tar.gz
else
- local rootfs_url=https://downloads.openwrt.org/releases/${ver}/targets/${arch}/${subarch}/${dist}-${ver}-${arch_dash}-generic-rootfs.tar.gz
+ local rootfs_url=https://downloads.openwrt.org/releases/${ver}/targets/${arch}/${subarch}/${dist}-${ver}-${arch}-${subarch}-generic-rootfs.tar.gz
fi
# global $rootfs