aredn: reset branch to main

This commit is contained in:
Joe Ayers 2021-04-10 23:23:18 -07:00 committed by Joe AE6XE
parent 70287347b4
commit 745b15ee29
3 changed files with 17 additions and 4 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,7 +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.21.4.0 release.
This is the active 'main' branch with latest AREDN code.
At anytime a new change may be broken or break prior capabilities.
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.
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/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.21.4.0
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/21/3.21.4.0
PRIVATE_BUILD_PACKAGES=http://downloads.arednmesh.org/snapshots/trunk
# These options are for more complex changes
SHELL:=$(shell which bash)