aredn: reset branch to develop

This commit is contained in:
Joe Ayers 2020-03-28 15:27:58 -07:00 committed by Joe AE6XE
parent e44e469b85
commit 0f7e378afb
3 changed files with 16 additions and 22 deletions

View File

@ -17,9 +17,9 @@ UMASK=umask 022
# set variables based on private or CircleCI build # set variables based on private or CircleCI build
ifeq ($(CIRCLECI),true) ifeq ($(CIRCLECI),true)
$(info CircleCI build ...) $(info CircleCI build ...)
FW_VERSION=$(PRIVATE_BUILD_VERSION) FW_VERSION=$(PRIVATE_BUILD_VERSION)-$(GIT_COMMIT)
else else
FW_VERSION=$(PRIVATE_BUILD_VERSION) FW_VERSION=$(PRIVATE_BUILD_VERSION)-$(GIT_BRANCH)-$(GIT_COMMIT)
endif endif
# test for existing $TARGET-config or abort # test for existing $TARGET-config or abort

View File

@ -28,26 +28,20 @@ license, please refer to http://www.arrl.org/getting-your-technician-license
### What to know about the images built with the instructions below ### What to know about the images built with the instructions below
This is the 3.20.3.0 release build. This is the active 'develop' branch with latest AREDN code.
At anytime a new change may be broken or break prior capabilities.
Here is a summary of the significant features added since 3.19.3.0 The Amateur Radio community is encouraged to participate in loading the
was released: images produced from a "nightly build" and run the AREDN firmware in a
variety of environments. Given new features may not yet be documented,
participants should already have a basic knowledge of Linux and Networking to
understand and provide useful feedback to the Developer submitting the
code.
* Upgrade to Openwrt 19.07.2 https://openwrt.org/releases/19.07/notes-19.07.0 The goal of participation is to obtain confidence that new
* Numerous Documentation updates and new sections features and the overall mesh node is stable. The more participation,
* Added Mikrotik LHG 2nD/2nD-XL/5HPnD the earlier an issue is found, the faster an enhancement will be
* Added Mikrotik LDF-2nD turned into a release.
* Added Mikrotik RBSXTsq 2nD/5HPnD
* Added Mikrotik RB911G-2HPnD mANTBox
* Added GL.iNet GL-USB150
* Added GL.iNet GL-AR150
* Added GL.iNet GL-AR300M16
* Added GL.iNet GL-AR750
* Added TpLink WBS510 v2
* Added TpLink CPE210 v3.1/v3.2
* Added auto distance feature
* Added Wan Wifi Client feature
* No longer require password on Wifi Scan changing to passive scan
Please refer to https://github.com/aredn/aredn_ar71xx/issues Please refer to https://github.com/aredn/aredn_ar71xx/issues
for a list of outstanding defects. for a list of outstanding defects.

View File

@ -1,7 +1,7 @@
# default parameters for Makefile # default parameters for Makefile
# What version will show in the AREDN firmware 'Node Status" UI page? # What version will show in the AREDN firmware 'Node Status" UI page?
PRIVATE_BUILD_VERSION=3.20.3.0 PRIVATE_BUILD_VERSION=NoCall
# build options: -j# for (# of cores +1) on build machine, V=s for verbose output # build options: -j# for (# of cores +1) on build machine, V=s for verbose output
# https://wiki.openwrt.org/doc/howto/build#make_options (archive) # https://wiki.openwrt.org/doc/howto/build#make_options (archive)
@ -12,7 +12,7 @@ MAKE_ARGS=-j3
# Where will the installed image find add-on Packages to download? # Where will the installed image find add-on Packages to download?
# This URL must contain the packages from this build # This URL must contain the packages from this build
# downloading packages within the AREDN UI uses signatures # downloading packages within the AREDN UI uses signatures
PRIVATE_BUILD_PACKAGES=http://downloads.arednmesh.org/releases/3/20/3.20.3.0 PRIVATE_BUILD_PACKAGES=http://downloads.arednmesh.org/snapshots/trunk
# These options are for more complex changes # These options are for more complex changes
SHELL:=$(shell which bash) SHELL:=$(shell which bash)