From 7526c8946bd185e3f20610eb22bafdd2e313a2e4 Mon Sep 17 00:00:00 2001 From: dman776 Date: Wed, 14 Dec 2022 11:20:08 -0600 Subject: [PATCH] revert back for development (#566) --- Makefile | 2 +- README.md | 1 - config.mk | 2 +- feeds.conf | 2 +- 4 files changed, 3 insertions(+), 4 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 2eec1474..4e5e762c 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,6 @@ turned into a release. Please refer to https://github.com/aredn/aredn/issues for a list of outstanding defects. -This is the 3.22.12.0 release. ### Images built diff --git a/config.mk b/config.mk index 05af4d5f..a8a7be5e 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.12.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) diff --git a/feeds.conf b/feeds.conf index 5be07120..c4e5ef47 100644 --- a/feeds.conf +++ b/feeds.conf @@ -1 +1 @@ -src-git arednpackages https://github.com/aredn/aredn_packages;3.22.12.0 +src-git arednpackages https://github.com/aredn/aredn_packages;develop