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

Images are now placed in output/images

Browse Source
This commit is contained in:
Franz Pletz
2015-11-05 01:50:07 +01:00
parent a8d7aca312
commit d116887d1a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -41,15 +41,15 @@ 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} \ (cd ${GLUON_BUILD_DIR} \
&& git remote set-url origin ${GLUON_GIT_URL} \ && git remote set-url origin ${GLUON_GIT_URL} \
&& git fetch origin \ && git fetch origin \
@@ -60,7 +60,7 @@ gluon-prepare: images-clean ${GLUON_BUILD_DIR}
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