nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: add GLUON_OUTPUTDIR, move GLUON_IMAGEDIR default below it

Browse Source 
We'll soon have other output besides the images, having a single directory
for all output makes sense.
This commit is contained in:
Matthias Schiffer 2015-10-13 01:18:03 +02:00
parent 515dfa2b50
commit 53a7cf31f9
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,6 +1,6 @@
*~ *~
/build /build
/images /output
/site /site
/openwrt /openwrt
/packages /packages

4
docs/features/autoupdater.rst
View File

@ -30,10 +30,10 @@ A fully automated nightly build could use the following commands:
make clean make clean
make -j5 GLUON_TARGET=ar71xx-generic GLUON_BRANCH=experimental make -j5 GLUON_TARGET=ar71xx-generic GLUON_BRANCH=experimental
make manifest GLUON_BRANCH=experimental make manifest GLUON_BRANCH=experimental
contrib/sign.sh $SECRETKEY images/sysupgrade/experimental.manifest contrib/sign.sh $SECRETKEY output/images/sysupgrade/experimental.manifest
rm -rf /where/to/put/this/experimental rm -rf /where/to/put/this/experimental
cp -r images /where/to/put/this/experimental cp -r output/images /where/to/put/this/experimental
Infrastructure Infrastructure

11
docs/user/getting_started.rst
View File

@ -86,7 +86,7 @@ In case of errors read the messages carefully and try to fix the stated issues (
``ar71xx-generic`` is the most common target and will generated images for most of the supported hardware. ``ar71xx-generic`` is the most common target and will generated images for most of the supported hardware.
To see a complete list of supported targets, call ``make`` without setting ``GLUON_TARGET``. To see a complete list of supported targets, call ``make`` without setting ``GLUON_TARGET``.
The built images can be found in the directory `images`. Of these, the factory The built images can be found in the directory `output/images`. Of these, the factory
images are to be used when flashing from the original firmware a device came with, images are to be used when flashing from the original firmware a device came with,
and sysupgrade is to upgrade from other versions of Gluon or any other OpenWRT-based and sysupgrade is to upgrade from other versions of Gluon or any other OpenWRT-based
system. system.
@ -117,12 +117,15 @@ Gluon's build process can be controlled by various environment variables.
GLUON_SITEDIR GLUON_SITEDIR
Path to the site configuration. Defaults to ``site/``. Path to the site configuration. Defaults to ``site/``.
GLUON_IMAGEDIR
Path where images will be stored. Defaults to ``images/``.
GLUON_BUILDDIR GLUON_BUILDDIR
Working directory during build. Defaults to ``build/``. Working directory during build. Defaults to ``build/``.
GLUON_OUTPUTDIR
Path where output files will be stored. Defaults to ``output/``.
GLUON_IMAGEDIR
Path where images will be stored. Defaults to ``$(GLUON_OUTPUTDIR)/images/``.
So all in all, to update and rebuild a Gluon build tree, the following commands should be used (repeat the So all in all, to update and rebuild a Gluon build tree, the following commands should be used (repeat the
``make clean`` and ``make`` for all targets you want to build): ``make clean`` and ``make`` for all targets you want to build):

6
include/gluon.mk
View File

@ -2,13 +2,15 @@ ifneq ($(__gluon_inc),1)
__gluon_inc=1 __gluon_inc=1
GLUON_SITEDIR ?= $(GLUONDIR)/site GLUON_SITEDIR ?= $(GLUONDIR)/site
GLUON_IMAGEDIR ?= $(GLUONDIR)/images
GLUON_BUILDDIR ?= $(GLUONDIR)/build GLUON_BUILDDIR ?= $(GLUONDIR)/build
GLUON_ORIGOPENWRTDIR := $(GLUONDIR)/openwrt GLUON_ORIGOPENWRTDIR := $(GLUONDIR)/openwrt
GLUON_SITE_CONFIG := $(GLUON_SITEDIR)/site.conf GLUON_SITE_CONFIG := $(GLUON_SITEDIR)/site.conf
export GLUONDIR GLUON_SITEDIR GLUON_SITE_CONFIG GLUON_IMAGEDIR GLUON_BUILDDIR GLUON_OUTPUTDIR ?= $(GLUONDIR)/output
GLUON_IMAGEDIR ?= $(GLUON_OUTPUTDIR)/images
export GLUONDIR GLUON_SITEDIR GLUON_BUILDDIR GLUON_SITE_CONFIG GLUON_OUTPUTDIR GLUON_IMAGEDIR
BOARD_BUILDDIR = $(GLUON_BUILDDIR)/$(GLUON_TARGET) BOARD_BUILDDIR = $(GLUON_BUILDDIR)/$(GLUON_TARGET)