krombel/site-ffmuc
1
0
Fork 0
forked from remote/site-ffmuc
Code Issues 4 Pull Requests 1 Releases Wiki Activity

Makefile: Misc release-releated build fixes

Browse Source
This commit is contained in:
Franz Pletz
2014-11-16 00:31:00 +01:00
parent f7a5afa264
commit 4879de98eb
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@@ -2,23 +2,29 @@ GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := git://github.com/freifunk-gluon/gluon.git GLUON_GIT_URL := git://github.com/freifunk-gluon/gluon.git
GLUON_GIT_REF := 08ecab23dec1e43b02fdca4caa86d2b7940b2f12 GLUON_GIT_REF := 08ecab23dec1e43b02fdca4caa86d2b7940b2f12
JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) _GIT_DESCRIBE = $(shell git describe --tags 2>/dev/null)
_GIT_DESCRIBE = $(shell git describe --tags 2>&1)
ifneq (,${_GIT_DESCRIBE}) ifneq (,${_GIT_DESCRIBE})
GLUON_RELEASE := ${_GIT_DESCRIBE} GLUON_RELEASE := ${_GIT_DESCRIBE}
GLUON_BRANCH ?= stable GLUON_BRANCH := stable
else else
GLUON_BRANCH ?= nightly GLUON_RELEASE ?= snapshot~$(shell date '+%Y%m%d')~$(shell git describe --always)
endif endif
JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
GLUON_RELEASE=${GLUON_RELEASE} \
GLUON_BRANCH=${GLUON_BRANCH}
all: build all: build
build: gluon-prepare build: gluon-prepare
cd ${GLUON_BUILD_DIR} \ echo '${GLUON_RELEASE} (${GLUON_BRANCH})'
&& make update \ ${GLUON_MAKE} update
&& make -j ${JOBS} \ ${GLUON_MAKE} images
&& make manifest
manifest: gluon-prepare
${GLUON_MAKE} manifest
${GLUON_BUILD_DIR}: ${GLUON_BUILD_DIR}:
git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR} git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}

2
site.mk
View File

@@ -23,7 +23,7 @@ GLUON_SITE_PACKAGES := \
haveged haveged
DEFAULT_GLUON_RELEASE := nightly~$(shell date '+%Y%m%d')~$(shell cd ../../../.. && git describe --always --abbrev=8) DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d')
# Allow overriding the release number from the command line # Allow overriding the release number from the command line
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)