* [PATCH] bitbake.conf: drop FETCHCMD, GITDIR, etc fetcher over-rides
@ 2018-06-15 18:43 Andre McCurdy
2018-06-15 21:58 ` Richard Purdie
0 siblings, 1 reply; 5+ messages in thread
From: Andre McCurdy @ 2018-06-15 18:43 UTC (permalink / raw)
To: openembedded-core
Following recent updates to the bitbake, the fetchers should now all
contain safe and correct defaults for the subdirectory within DL_DIR
to use and the base fetch command to run. It's no longer necessary
for bitbake.conf to specify these values.
This is cleanup which was originally proposed in 2012:
http://lists.openembedded.org/pipermail/openembedded-core/2012-July/064224.html
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/conf/bitbake.conf | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 3b2ef9f..8588684 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -349,12 +349,6 @@ CACHE = "${TMPDIR}/cache${@['', '/' + str(d.getVar('MACHINE'))][bool(d.getVar('M
# The persistent cache should be shared by all builds
PERSISTENT_DIR = "${TOPDIR}/cache"
LOG_DIR = "${TMPDIR}/log"
-CO_DIR = "${DL_DIR}"
-CVSDIR = "${CO_DIR}/cvs"
-SVNDIR = "${CO_DIR}/svn"
-GITDIR = "${CO_DIR}/git2"
-BZRDIR = "${CO_DIR}/bzr"
-HGDIR = "${CO_DIR}/hg"
STAMPS_DIR ?= "${TMPDIR}/stamps"
STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}"
@@ -661,12 +655,6 @@ SRC_URI[vardepsexclude] += "\
# export DEBIAN_MIRROR = "http://ftp.de.debian.org/debian/pool"
# into your local.conf
-FETCHCMD_svn = "/usr/bin/env svn --non-interactive --trust-server-cert"
-FETCHCMD_cvs = "/usr/bin/env cvs"
-FETCHCMD_wget = "/usr/bin/env wget -t 2 -T 30 --passive-ftp --no-check-certificate"
-FETCHCMD_bzr = "/usr/bin/env bzr"
-FETCHCMD_hg = "/usr/bin/env hg"
-
SRCDATE = "${DATE}"
SRCREV ??= "INVALID"
AUTOREV = "${@bb.fetch2.get_autorev(d)}"
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] bitbake.conf: drop FETCHCMD, GITDIR, etc fetcher over-rides
2018-06-15 18:43 [PATCH] bitbake.conf: drop FETCHCMD, GITDIR, etc fetcher over-rides Andre McCurdy
@ 2018-06-15 21:58 ` Richard Purdie
2018-06-15 22:12 ` Andre McCurdy
0 siblings, 1 reply; 5+ messages in thread
From: Richard Purdie @ 2018-06-15 21:58 UTC (permalink / raw)
To: Andre McCurdy, openembedded-core
On Fri, 2018-06-15 at 11:43 -0700, Andre McCurdy wrote:
> Following recent updates to the bitbake, the fetchers should now all
> contain safe and correct defaults for the subdirectory within DL_DIR
> to use and the base fetch command to run. It's no longer necessary
> for bitbake.conf to specify these values.
>
> This is cleanup which was originally proposed in 2012:
>
> http://lists.openembedded.org/pipermail/openembedded-core/2012-July
> /064224.html
>
> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> ---
> meta/conf/bitbake.conf | 12 ------------
> 1 file changed, 12 deletions(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 3b2ef9f..8588684 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -349,12 +349,6 @@ CACHE = "${TMPDIR}/cache${@['', '/' +
> str(d.getVar('MACHINE'))][bool(d.getVar('M
> # The persistent cache should be shared by all builds
> PERSISTENT_DIR = "${TOPDIR}/cache"
> LOG_DIR = "${TMPDIR}/log"
> -CO_DIR = "${DL_DIR}"
> -CVSDIR = "${CO_DIR}/cvs"
> -SVNDIR = "${CO_DIR}/svn"
> -GITDIR = "${CO_DIR}/git2"
> -BZRDIR = "${CO_DIR}/bzr"
> -HGDIR = "${CO_DIR}/hg"
>
> STAMPS_DIR ?= "${TMPDIR}/stamps"
> STAMP =
> "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}"
> @@ -661,12 +655,6 @@ SRC_URI[vardepsexclude] += "\
> # export DEBIAN_MIRROR = "http://ftp.de.debian.org/debian/pool"
> # into your local.conf
>
> -FETCHCMD_svn = "/usr/bin/env svn --non-interactive --trust-server-
> cert"
> -FETCHCMD_cvs = "/usr/bin/env cvs"
> -FETCHCMD_wget = "/usr/bin/env wget -t 2 -T 30 --passive-ftp --no-
> check-certificate"
> -FETCHCMD_bzr = "/usr/bin/env bzr"
> -FETCHCMD_hg = "/usr/bin/env hg"
> -
> SRCDATE = "${DATE}"
> SRCREV ??= "INVALID"
> AUTOREV = "${@bb.fetch2.get_autorev(d)}"
To make this work, we need to force everyone to upgrade their bitbake
beyond the point where these have been added to the fetcher.
We could do that with the minimum bitbake version but I'm tempted to
hold this for a but until we have another more pressing reason to bump
the minimum bitbake version and then do this at the same time?
Cheers,
Richard
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] bitbake.conf: drop FETCHCMD, GITDIR, etc fetcher over-rides
2018-06-15 21:58 ` Richard Purdie
@ 2018-06-15 22:12 ` Andre McCurdy
2018-10-23 21:18 ` Andre McCurdy
0 siblings, 1 reply; 5+ messages in thread
From: Andre McCurdy @ 2018-06-15 22:12 UTC (permalink / raw)
To: Richard Purdie; +Cc: OE Core mailing list
On Fri, Jun 15, 2018 at 2:58 PM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Fri, 2018-06-15 at 11:43 -0700, Andre McCurdy wrote:
>> Following recent updates to the bitbake, the fetchers should now all
>> contain safe and correct defaults for the subdirectory within DL_DIR
>> to use and the base fetch command to run. It's no longer necessary
>> for bitbake.conf to specify these values.
>>
>> This is cleanup which was originally proposed in 2012:
>>
>> http://lists.openembedded.org/pipermail/openembedded-core/2012-July
>> /064224.html
>>
>> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
>> ---
>> meta/conf/bitbake.conf | 12 ------------
>> 1 file changed, 12 deletions(-)
>>
>> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
>> index 3b2ef9f..8588684 100644
>> --- a/meta/conf/bitbake.conf
>> +++ b/meta/conf/bitbake.conf
>> @@ -349,12 +349,6 @@ CACHE = "${TMPDIR}/cache${@['', '/' +
>> str(d.getVar('MACHINE'))][bool(d.getVar('M
>> # The persistent cache should be shared by all builds
>> PERSISTENT_DIR = "${TOPDIR}/cache"
>> LOG_DIR = "${TMPDIR}/log"
>> -CO_DIR = "${DL_DIR}"
>> -CVSDIR = "${CO_DIR}/cvs"
>> -SVNDIR = "${CO_DIR}/svn"
>> -GITDIR = "${CO_DIR}/git2"
>> -BZRDIR = "${CO_DIR}/bzr"
>> -HGDIR = "${CO_DIR}/hg"
>>
>> STAMPS_DIR ?= "${TMPDIR}/stamps"
>> STAMP =
>> "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}"
>> @@ -661,12 +655,6 @@ SRC_URI[vardepsexclude] += "\
>> # export DEBIAN_MIRROR = "http://ftp.de.debian.org/debian/pool"
>> # into your local.conf
>>
>> -FETCHCMD_svn = "/usr/bin/env svn --non-interactive --trust-server-
>> cert"
>> -FETCHCMD_cvs = "/usr/bin/env cvs"
>> -FETCHCMD_wget = "/usr/bin/env wget -t 2 -T 30 --passive-ftp --no-
>> check-certificate"
>> -FETCHCMD_bzr = "/usr/bin/env bzr"
>> -FETCHCMD_hg = "/usr/bin/env hg"
>> -
>> SRCDATE = "${DATE}"
>> SRCREV ??= "INVALID"
>> AUTOREV = "${@bb.fetch2.get_autorev(d)}"
>
> To make this work, we need to force everyone to upgrade their bitbake
> beyond the point where these have been added to the fetcher.
>
> We could do that with the minimum bitbake version but I'm tempted to
> hold this for a but until we have another more pressing reason to bump
> the minimum bitbake version and then do this at the same time?
OK. I was assuming that anyone using master oe-core would be using
master bitbake too. Delaying the change going into oe-core is
certainly safer though.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] bitbake.conf: drop FETCHCMD, GITDIR, etc fetcher over-rides
2018-06-15 22:12 ` Andre McCurdy
@ 2018-10-23 21:18 ` Andre McCurdy
2018-10-23 21:20 ` richard.purdie
0 siblings, 1 reply; 5+ messages in thread
From: Andre McCurdy @ 2018-10-23 21:18 UTC (permalink / raw)
To: Richard Purdie; +Cc: OE Core mailing list
On Fri, Jun 15, 2018 at 3:12 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
> On Fri, Jun 15, 2018 at 2:58 PM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>> On Fri, 2018-06-15 at 11:43 -0700, Andre McCurdy wrote:
>>> Following recent updates to the bitbake, the fetchers should now all
>>> contain safe and correct defaults for the subdirectory within DL_DIR
>>> to use and the base fetch command to run. It's no longer necessary
>>> for bitbake.conf to specify these values.
>>>
>>> This is cleanup which was originally proposed in 2012:
>>>
>>> http://lists.openembedded.org/pipermail/openembedded-core/2012-July
>>> /064224.html
>>>
>>> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
>>> ---
>>> meta/conf/bitbake.conf | 12 ------------
>>> 1 file changed, 12 deletions(-)
>>>
>>> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
>>> index 3b2ef9f..8588684 100644
>>> --- a/meta/conf/bitbake.conf
>>> +++ b/meta/conf/bitbake.conf
>>> @@ -349,12 +349,6 @@ CACHE = "${TMPDIR}/cache${@['', '/' +
>>> str(d.getVar('MACHINE'))][bool(d.getVar('M
>>> # The persistent cache should be shared by all builds
>>> PERSISTENT_DIR = "${TOPDIR}/cache"
>>> LOG_DIR = "${TMPDIR}/log"
>>> -CO_DIR = "${DL_DIR}"
>>> -CVSDIR = "${CO_DIR}/cvs"
>>> -SVNDIR = "${CO_DIR}/svn"
>>> -GITDIR = "${CO_DIR}/git2"
>>> -BZRDIR = "${CO_DIR}/bzr"
>>> -HGDIR = "${CO_DIR}/hg"
>>>
>>> STAMPS_DIR ?= "${TMPDIR}/stamps"
>>> STAMP =
>>> "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}"
>>> @@ -661,12 +655,6 @@ SRC_URI[vardepsexclude] += "\
>>> # export DEBIAN_MIRROR = "http://ftp.de.debian.org/debian/pool"
>>> # into your local.conf
>>>
>>> -FETCHCMD_svn = "/usr/bin/env svn --non-interactive --trust-server-
>>> cert"
>>> -FETCHCMD_cvs = "/usr/bin/env cvs"
>>> -FETCHCMD_wget = "/usr/bin/env wget -t 2 -T 30 --passive-ftp --no-
>>> check-certificate"
>>> -FETCHCMD_bzr = "/usr/bin/env bzr"
>>> -FETCHCMD_hg = "/usr/bin/env hg"
>>> -
>>> SRCDATE = "${DATE}"
>>> SRCREV ??= "INVALID"
>>> AUTOREV = "${@bb.fetch2.get_autorev(d)}"
>>
>> To make this work, we need to force everyone to upgrade their bitbake
>> beyond the point where these have been added to the fetcher.
>>
>> We could do that with the minimum bitbake version but I'm tempted to
>> hold this for a but until we have another more pressing reason to bump
>> the minimum bitbake version and then do this at the same time?
>
> OK. I was assuming that anyone using master oe-core would be using
> master bitbake too. Delaying the change going into oe-core is
> certainly safer though.
Would now be a good time to merge this?
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] bitbake.conf: drop FETCHCMD, GITDIR, etc fetcher over-rides
2018-10-23 21:18 ` Andre McCurdy
@ 2018-10-23 21:20 ` richard.purdie
0 siblings, 0 replies; 5+ messages in thread
From: richard.purdie @ 2018-10-23 21:20 UTC (permalink / raw)
To: Andre McCurdy; +Cc: OE Core mailing list
On Tue, 2018-10-23 at 14:18 -0700, Andre McCurdy wrote:
> On Fri, Jun 15, 2018 at 3:12 PM, Andre McCurdy <armccurdy@gmail.com>
> wrote:
> > On Fri, Jun 15, 2018 at 2:58 PM, Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> > > On Fri, 2018-06-15 at 11:43 -0700, Andre McCurdy wrote:
> > > > Following recent updates to the bitbake, the fetchers should
> > > > now all
> > > > contain safe and correct defaults for the subdirectory within
> > > > DL_DIR
> > > > to use and the base fetch command to run. It's no longer
> > > > necessary
> > > > for bitbake.conf to specify these values.
> > > >
> > > > This is cleanup which was originally proposed in 2012:
> > > >
> > > >
> > > > http://lists.openembedded.org/pipermail/openembedded-core/2012-July
> > > > /064224.html
> > > >
> > > > Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> > > > ---
> > > > meta/conf/bitbake.conf | 12 ------------
> > > > 1 file changed, 12 deletions(-)
> > > >
> > > > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> > > > index 3b2ef9f..8588684 100644
> > > > --- a/meta/conf/bitbake.conf
> > > > +++ b/meta/conf/bitbake.conf
> > > > @@ -349,12 +349,6 @@ CACHE = "${TMPDIR}/cache${@['', '/' +
> > > > str(d.getVar('MACHINE'))][bool(d.getVar('M
> > > > # The persistent cache should be shared by all builds
> > > > PERSISTENT_DIR = "${TOPDIR}/cache"
> > > > LOG_DIR = "${TMPDIR}/log"
> > > > -CO_DIR = "${DL_DIR}"
> > > > -CVSDIR = "${CO_DIR}/cvs"
> > > > -SVNDIR = "${CO_DIR}/svn"
> > > > -GITDIR = "${CO_DIR}/git2"
> > > > -BZRDIR = "${CO_DIR}/bzr"
> > > > -HGDIR = "${CO_DIR}/hg"
> > > >
> > > > STAMPS_DIR ?= "${TMPDIR}/stamps"
> > > > STAMP =
> > > > "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-
> > > > ${PR}"
> > > > @@ -661,12 +655,6 @@ SRC_URI[vardepsexclude] += "\
> > > > # export DEBIAN_MIRROR = "
> > > > http://ftp.de.debian.org/debian/pool"
> > > > # into your local.conf
> > > >
> > > > -FETCHCMD_svn = "/usr/bin/env svn --non-interactive --trust-
> > > > server-
> > > > cert"
> > > > -FETCHCMD_cvs = "/usr/bin/env cvs"
> > > > -FETCHCMD_wget = "/usr/bin/env wget -t 2 -T 30 --passive-ftp --
> > > > no-
> > > > check-certificate"
> > > > -FETCHCMD_bzr = "/usr/bin/env bzr"
> > > > -FETCHCMD_hg = "/usr/bin/env hg"
> > > > -
> > > > SRCDATE = "${DATE}"
> > > > SRCREV ??= "INVALID"
> > > > AUTOREV = "${@bb.fetch2.get_autorev(d)}"
> > >
> > > To make this work, we need to force everyone to upgrade their
> > > bitbake
> > > beyond the point where these have been added to the fetcher.
> > >
> > > We could do that with the minimum bitbake version but I'm tempted
> > > to
> > > hold this for a but until we have another more pressing reason to
> > > bump
> > > the minimum bitbake version and then do this at the same time?
> >
> > OK. I was assuming that anyone using master oe-core would be using
> > master bitbake too. Delaying the change going into oe-core is
> > certainly safer though.
>
> Would now be a good time to merge this?
Last thing in 2.6 M4, no. First thing in 2.7, sure...
Cheers,
Richard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-10-23 21:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-15 18:43 [PATCH] bitbake.conf: drop FETCHCMD, GITDIR, etc fetcher over-rides Andre McCurdy
2018-06-15 21:58 ` Richard Purdie
2018-06-15 22:12 ` Andre McCurdy
2018-10-23 21:18 ` Andre McCurdy
2018-10-23 21:20 ` richard.purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox