mirror of
https://github.com/ffrgb/site-ffrgb.git
synced 2024-11-14 18:15:29 +01:00
Images are now placed in output/images
This commit is contained in:
parent
23b0188570
commit
40acb4b49e
18
Makefile
18
Makefile
@ -16,7 +16,6 @@ else
|
|||||||
GLUON_BRANCH := experimental
|
GLUON_BRANCH := experimental
|
||||||
endif
|
endif
|
||||||
|
|
||||||
JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
|
|
||||||
JOBS = 1
|
JOBS = 1
|
||||||
|
|
||||||
GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
|
GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
|
||||||
@ -42,23 +41,26 @@ build: gluon-prepare
|
|||||||
|
|
||||||
manifest: build
|
manifest: build
|
||||||
${GLUON_MAKE} manifest
|
${GLUON_MAKE} manifest
|
||||||
mv ${GLUON_BUILD_DIR}/images .
|
mv ${GLUON_BUILD_DIR}/output .
|
||||||
|
|
||||||
sign: manifest
|
sign: manifest
|
||||||
${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.manifest
|
${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} output/images/sysupgrade/${GLUON_BRANCH}.manifest
|
||||||
|
|
||||||
${GLUON_BUILD_DIR}:
|
${GLUON_BUILD_DIR}:
|
||||||
git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
|
git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
|
||||||
|
|
||||||
gluon-prepare: images-clean ${GLUON_BUILD_DIR}
|
gluon-prepare: output-clean ${GLUON_BUILD_DIR}
|
||||||
(cd ${GLUON_BUILD_DIR} && git fetch origin && git checkout -q ${GLUON_GIT_REF})
|
(cd ${GLUON_BUILD_DIR} \
|
||||||
|
&& git remote set-url origin ${GLUON_GIT_URL} \
|
||||||
|
&& git fetch origin \
|
||||||
|
&& git checkout -q ${GLUON_GIT_REF})
|
||||||
ln -sfT .. ${GLUON_BUILD_DIR}/site
|
ln -sfT .. ${GLUON_BUILD_DIR}/site
|
||||||
${GLUON_MAKE} update
|
${GLUON_MAKE} update
|
||||||
|
|
||||||
gluon-clean:
|
gluon-clean:
|
||||||
rm -rf ${GLUON_BUILD_DIR}
|
rm -rf ${GLUON_BUILD_DIR}
|
||||||
|
|
||||||
images-clean:
|
output-clean:
|
||||||
rm -rf images
|
rm -rf output
|
||||||
|
|
||||||
clean: gluon-clean images-clean
|
clean: gluon-clean output-clean
|
||||||
|
Loading…
Reference in New Issue
Block a user