From d5739c5a269eb212686ccbaece88da5f2f77e640 Mon Sep 17 00:00:00 2001 From: dman776 Date: Sun, 16 Apr 2023 18:36:39 -0500 Subject: [PATCH] revert back to develop branch (#788) --- Makefile | 2 +- config.mk | 4 ++-- feeds.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ee5b2dca..2f9f58fd 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,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/config.mk b/config.mk index fcb39fa6..dca8854b 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.23.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/23/3.23.4.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 7054e99e..c4e5ef47 100644 --- a/feeds.conf +++ b/feeds.conf @@ -1 +1 @@ -src-git arednpackages https://github.com/aredn/aredn_packages;3.23.4.0 +src-git arednpackages https://github.com/aredn/aredn_packages;develop