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

build: save and name images released

This commit is contained in:
Joe AE6XE 2018-08-09 21:54:16 +00:00
parent 87663614d5
commit 32c53500bb
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -14,13 +14,7 @@ OPENWRT_DIR=$(TOP_DIR)/openwrt
TARGET_CONFIG=$(TOP_DIR)/configs/common.config $(TOP_DIR)/configs/$(MAINTARGET)-$(SUBTARGET).config
UMASK=umask 022
# set variables based on private or travis-ci build
ifeq ($(TRAVIS),true)
$(info Travis-CI build ...)
FW_VERSION=$(TRAVIS_BUILD_NUMBER)-$(TRAVIS_COMMIT)
else
FW_VERSION=$(PRIVATE_BUILD_VERSION)-$(GIT_COMMIT)
endif
FW_VERSION=$(PRIVATE_BUILD_VERSION)
# test for existing $TARGET-config or abort
ifeq ($(wildcard $(TOP_DIR)/configs/$(TARGET).config),)
@ -130,11 +124,13 @@ compile: stamp-clean-compiled .stamp-compiled
rm -f $(TOP_DIR)/firmware/AREDN*
for FILE in $(TOP_DIR)/firmware/openwrt*; do \
[ -e "$$FILE" ] || continue; \
NEWNAME="$${FILE/openwrt-/AREDN-}"; \
NEWNAME="$${FILE/openwrt-/AREDN-$(FW_VERSION)-}"; \
NEWNAME="$${NEWNAME/ar71xx-generic-/}"; \
NEWNAME="$${NEWNAME/squashfs-/}"; \
mv "$$FILE" "$$NEWNAME"; \
done;
rm -f $(TOP_DIR)/firmware/AREDN-$(FW_VERSION)-[!cu]*;
rm -f $(TOP_DIR)/firmware/AREDN-$(FW_VERSION)-{ca,ubd,ubnt-air-,ubnt-ls-,ubnt-u,uI,ubnt-rs,ubnt-loco-x}*;
$(TOP_DIR)/scripts/tests-postbuild.sh
$(TOP_DIR)/firmware:

4
scripts/tests/postbuild/700-imagename.sh
View File

@ -38,10 +38,10 @@ LICENSE
## Values for count of final images
### This value should be updated as we add/remove device image types
NUMBEROFIMAGESCOUNT=60
NUMBEROFIMAGESCOUNT=7
### Static Files, only when buildroot changes adjust output files types.
### These are files such as vmlinux, uimage, etc.
STATICFILESCOUNT=141
STATICFILESCOUNT=0
# END Variables that may need adjusting