Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert back to develop branch (#788)

This commit is contained in:
dman776 2023-04-16 18:36:39 -05:00 committed by GitHub
parent 8110869088
commit d5739c5a26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

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

4
config.mk
View File

@ -1,7 +1,7 @@
# default parameters for Makefile # default parameters for Makefile
# What version will show in the AREDN firmware 'Node Status" UI page? # 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 # 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) # 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? # Where will the installed image find add-on Packages to download?
# This URL must contain the packages from this build # This URL must contain the packages from this build
# downloading packages within the AREDN UI uses signatures # 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 # These options are for more complex changes
SHELL:=$(shell which bash) SHELL:=$(shell which bash)

2
feeds.conf
View File

@ -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