From 1c24f7d18afebce98dc48373ad53be4d4372c87a Mon Sep 17 00:00:00 2001 From: dman776 Date: Mon, 29 Aug 2022 10:52:53 -0500 Subject: [PATCH] revert 3.22.8.0 back to development (#495) --- Makefile | 2 +- README.md | 19 ++++++++++++++++++- config.mk | 4 ++-- feeds.conf | 2 +- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d0915091..c8b6b15c 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/README.md b/README.md index 82fb3d92..4e5e762c 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,24 @@ 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.22.8.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. + ### Images built diff --git a/config.mk b/config.mk index b77d4d2e..9af765a7 100644 --- a/config.mk +++ b/config.mk @@ -1,7 +1,7 @@ # default parameters for Makefile # What version will show in the AREDN firmware 'Node Status" UI page? -PRIVATE_BUILD_VERSION=3.22.8.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/3/22/3.22.8.0 +PRIVATE_BUILD_PACKAGES=http://downloads.arednmesh.org/snapshots # These options are for more complex changes SHELL:=$(shell which bash) diff --git a/feeds.conf b/feeds.conf index b5a472b3..c4e5ef47 100644 --- a/feeds.conf +++ b/feeds.conf @@ -1 +1 @@ -src-git arednpackages https://github.com/aredn/aredn_packages;3.22.8.0 +src-git arednpackages https://github.com/aredn/aredn_packages;develop