Re: [PATCH] bitbake: Allow setting DL_DIR from environment

[Harald Seiler <hws@denx.de>]

On Wed, 2018-10-31 at 07:39 +0100, Jan Kiszka wrote:
> On 30.10.18 17:44, Harald Seiler wrote:
> > This patch allows adding DL_DIR to BB_ENV_EXTRAWHITE
> > and then specifying a custom DL_DIR in the environment.
> > 
> > This behavior mirrors the one in poky.
> > 
> > Signed-off-by: Harald Seiler <hws@denx.de>
> > ---
> >   bitbake/conf/bitbake.conf   | 2 +-
> 
> We do not patch bitbake so far. Is this fix in upstream already? Then let's 
> fast-forward bitbake to that revision. If not, send it upstream first. Local, 
> isar-specific changes go to isar-bitbake.conf.

Upstream (bitbake) does not have this fix.  The reason it works in poky is that
they have removed the `bitbake/conf/bitbake.conf` file completely and instead
use their own config in `meta/conf/bitbake.conf`.

I am not sure why this is done this way, though.

> 
> >   meta/conf/isar-bitbake.conf | 2 +-
> >   2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/bitbake/conf/bitbake.conf b/bitbake/conf/bitbake.conf
> > index a460df4..ba0d68b 100644
> > --- a/bitbake/conf/bitbake.conf
> > +++ b/bitbake/conf/bitbake.conf
> > @@ -23,7 +23,7 @@ CVSDIR = "${DL_DIR}/cvs"
> >   DEPENDS = ""
> >   DEPLOY_DIR = "${TMPDIR}/deploy"
> >   DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images"
> > -DL_DIR = "${TMPDIR}/downloads"
> > +DL_DIR ?= "${TMPDIR}/downloads"
> >   FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
> >   FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE', False))}"
> >   GITDIR = "${DL_DIR}/git"
> > diff --git a/meta/conf/isar-bitbake.conf b/meta/conf/isar-bitbake.conf
> > index 666c4a3..39e73f6 100644
> > --- a/meta/conf/isar-bitbake.conf
> > +++ b/meta/conf/isar-bitbake.conf
> > @@ -19,7 +19,7 @@
> >   # OTHER DEALINGS IN THE SOFTWARE.
> >   
> >   WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PF}"
> > -DL_DIR = "${TOPDIR}/downloads"
> > +DL_DIR ?= "${TOPDIR}/downloads"
> >   SSTATE_DIR ?= "${TMPDIR}/sstate-cache"
> >   BUILDCHROOT_HOST_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-host/rootfs"
> >   BUILDCHROOT_TARGET_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-target/rootfs"
> > --
> > 2.14.1
> > 
> 

-- 
Harald

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-62  Fax: +49-8142-66989-80   Email: hws@denx.de