From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6618191789727678464 Date: Tue, 30 Oct 2018 23:13:36 -0700 (PDT) From: chombourger@gmail.com To: isar-users Message-Id: <9b3d1c8c-8115-4a0f-8c9f-e796ef36b372@googlegroups.com> In-Reply-To: <106c00a92881b8fefff5616e27c7c434c2c4983e.camel@denx.de> References: <106c00a92881b8fefff5616e27c7c434c2c4983e.camel@denx.de> Subject: Re: [PATCH] bitbake: Allow setting DL_DIR from environment MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_2479_1553744080.1540966416249" X-Google-Token: EJCQ5d4FwCVGLirAn7U0 X-Google-IP: 192.94.31.2 X-TUID: nsPAh8dO2Pox ------=_Part_2479_1553744080.1540966416249 Content-Type: multipart/alternative; boundary="----=_Part_2480_107849148.1540966416249" ------=_Part_2480_107849148.1540966416249 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Looks good to me On Tuesday, October 30, 2018 at 5:44:14 PM UTC+1, 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 > > --- > bitbake/conf/bitbake.conf | 2 +- > 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 > > ------=_Part_2480_107849148.1540966416249 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
Looks good to me

On Tuesday, October 30, 2018 at 5:= 44:14 PM UTC+1, 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 <h...@denx.de>
---
=C2=A0bitbake/conf/bitbake.conf =C2=A0 | 2 +-
=C2=A0meta/conf/isar-bitbake.conf | 2 +-
=C2=A02 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 =3D "${DL_DIR}/cvs"
=C2=A0DEPENDS =3D ""
=C2=A0DEPLOY_DIR =3D "${TMPDIR}/deploy"
=C2=A0DEPLOY_DIR_IMAGE =3D "${DEPLOY_DIR}/images"
-DL_DIR =3D "${TMPDIR}/downloads"
+DL_DIR ?=3D "${TMPDIR}/downloads"
=C2=A0FILESPATH =3D "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${= P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}&qu= ot;
=C2=A0FILE_DIRNAME =3D "${@os.path.dirname(d.getVar('FILE= ', False))}"
=C2=A0GITDIR =3D "${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 @@
=C2=A0# OTHER DEALINGS IN THE SOFTWARE.
=C2=A0
=C2=A0WORKDIR =3D "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${= PF}"
-DL_DIR =3D "${TOPDIR}/downloads"
+DL_DIR ?=3D "${TOPDIR}/downloads"
=C2=A0SSTATE_DIR ?=3D "${TMPDIR}/sstate-cache"
=C2=A0BUILDCHROOT_HOST_DIR =3D "${TMPDIR}/work/${DISTRO}-${DI= STRO_ARCH}/buildchroot-host/rootfs"
=C2=A0BUILDCHROOT_TARGET_DIR =3D "${TMPDIR}/work/${DISTRO}-${= DISTRO_ARCH}/buildchroot-target/rootfs"
--
2.14.1

------=_Part_2480_107849148.1540966416249-- ------=_Part_2479_1553744080.1540966416249--