diff --git a/Makefile b/Makefile index 9ab9684..4e5a2b7 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,11 @@ all: its -OPENWRT_VERSION=18.06.4 - -its-tl-wr841-v10: - IMAGEBUILDER_URL='https://downloads.openwrt.org/releases/$(OPENWRT_VERSION)/targets/ar71xx/tiny/openwrt-imagebuilder-$(OPENWRT_VERSION)-ar71xx-tiny.Linux-x86_64.tar.xz' ./build-image.sh control/tl-wr841-v10 +OPENWRT_VERSION=19.07.3 its-ubnt-unifiac-lite: - IMAGEBUILDER_URL='https://downloads.openwrt.org/releases/$(OPENWRT_VERSION)/targets/ar71xx/generic/openwrt-imagebuilder-$(OPENWRT_VERSION)-ar71xx-generic.Linux-x86_64.tar.xz' ./build-image.sh control/ubnt-unifiac-lite + IMAGEBUILDER_URL='https://downloads.openwrt.org/releases/$(OPENWRT_VERSION)/targets/ath79/generic/openwrt-imagebuilder-$(OPENWRT_VERSION)-ath79-generic.Linux-x86_64.tar.xz' ./build-image.sh control/ubnt-unifiac-lite -its: its-ubnt-unifiac-lite its-tl-wr841-v10 +its: its-ubnt-unifiac-lite DATE = $(shell date +'%Y%m%d') VERSION = v0.$(DATE) diff --git a/build-image.sh b/build-image.sh index 49bc1dc..e227c82 100755 --- a/build-image.sh +++ b/build-image.sh @@ -1,8 +1,10 @@ #!/bin/sh +set -e + [ $# -ge 1 ] || exit 1 CONTROL="$1"; shift -IMAGEBUILDER_URL=${IMAGEBUILDER_URL:-https://downloads.openwrt.org/snapshots/targets/ar71xx/generic/openwrt-imagebuilder-ar71xx-generic.Linux-x86_64.tar.xz} +IMAGEBUILDER_URL=${IMAGEBUILDER_URL:-https://downloads.openwrt.org/snapshots/targets/ath79/generic/openwrt-imagebuilder-ath79-generic.Linux-x86_64.tar.xz} TOPDIR="$PWD" DLDIR=${DLDIR:-"dl"} @@ -53,11 +55,11 @@ subtarget=$(. "$CONTROL"; echo "${SUBTARGET}") mkdir -p "$tmp"/etc mkdir -p "$tmp"/etc/its-access-point/ - printf '%s\n' "$VERSION" > "$tmp"/etc/its-access-point-version # legacy printf '%s\n' "$VERSION" > "$tmp"/etc/its-access-point/version printf '%s\n' "$IMAGEBUILDER_URL" \ > "$tmp"/etc/its-access-point/imagebuilder-url - sha512sum "$imagebuilder" > "$tmp"/etc/its-access-point/imagebuilder-hash + sha512sum "$DLDIR/$imagebuilder" \ + > "$tmp"/etc/its-access-point/imagebuilder-hash cat "$CONTROL" > "$tmp"/etc/its-access-point/control if [ -n "$COMMON_FILES" ]; then @@ -73,7 +75,7 @@ subtarget=$(. "$CONTROL"; echo "${SUBTARGET}") make image FILES="$tmp" 1>&2 ) -cp "$IMAGEBUILDER_DIR"/bin/targets/ar71xx/"${subtarget}"/openwrt*-"${target}-${subtarget}-${profile}"-squashfs-sysupgrade.bin "$IMAGEDIR"/ +cp "$IMAGEBUILDER_DIR"/bin/targets/ath79/"${subtarget}"/openwrt*-"${target}-${subtarget}-${profile}"-squashfs-sysupgrade.bin "$IMAGEDIR"/ ln -snf "$VERSION" images/latest diff --git a/control/ubnt-unifiac-lite b/control/ubnt-unifiac-lite index 9537dcf..6019612 100644 --- a/control/ubnt-unifiac-lite +++ b/control/ubnt-unifiac-lite @@ -1,6 +1,6 @@ -PROFILE=ubnt-unifiac-lite +PROFILE=ubnt_unifiac-lite FILES=files/ubnt-unifiac-lite -TARGET=ar71xx +TARGET=ath79 SUBTARGET=generic COMMON_FILES=files/common/its PACKAGES='