aredn: reset branch to develop

This commit is contained in:
Joe Ayers 2020-07-09 16:36:50 -07:00 committed by Joe AE6XE
parent dd3592f8ee
commit 437b4780ae
3 changed files with 15 additions and 19 deletions

View File

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

View File

@ -28,24 +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
This is the 3.20.3.1 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 changes since 3.20.3.0
was release:
The Amateur Radio community is encouraged to participate in loading the
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.
* Migrate all remaining TP-Link models to ath79 target
* Fix CPE510 v3 image not installing
* Fix Ethernet port to fully conform with AREDN expected usage on NanoStation M5 XW
* Added ability to change and revert firmware and package download paths
* Added target type info (ar71xx/ath79) to admin page
* Fix issue with the map on the setup page PR #501
* Added "aredn alerts" feature in header
* Fix firewall blocking traffic when using tunnel PR #524
* Added support for Mikrotik r2 hardware
* Bump to OpenWRT 19.07.3 https://openwrt.org/releases/19.07/notes-19.07.3
* Use "mode ether" for tunnel links reducing ETX to 0.1
* Change default map tile server url away from MapBox PR #527
* Allow ping from WAN to node
The goal of participation is to obtain confidence that new
features and the overall mesh node is stable. The more participation,
the earlier an issue is found, the faster an enhancement will be
turned into a release.
Please refer to https://github.com/aredn/aredn_ar71xx/issues
for a list of outstanding defects.

View File

@ -1,7 +1,7 @@
# default parameters for Makefile
# What version will show in the AREDN firmware 'Node Status" UI page?
PRIVATE_BUILD_VERSION=3.20.3.1
PRIVATE_BUILD_VERSION=NoCall
# 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)
@ -12,7 +12,7 @@ MAKE_ARGS=-j3
# Where will the installed image find add-on Packages to download?
# This URL must contain the packages from this build
# downloading packages within the AREDN UI uses signatures
PRIVATE_BUILD_PACKAGES=http://downloads.arednmesh.org/releases/3/20/3.20.3.1
PRIVATE_BUILD_PACKAGES=http://downloads.arednmesh.org/snapshots/trunk
# These options are for more complex changes
SHELL:=$(shell which bash)