bitbake.conf: drop FETCHCMD, GITDIR, etc fetcher over-rides

PATCH In review Andre McCurdy 2 participants 5 messages Jun 15, 2018 – Oct 23, 2018

Share & tools

Andre McCurdy

author

2018-06-15 18:43 UTC #0 lore raw

PATCH 1/1 bitbake.conf: drop FETCHCMD, GITDIR, etc fetcher over-rides

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 <[email protected]>

---
 meta/conf/bitbake.conf | 12 ------------
 1 file changed, 12 deletions(-)

meta/conf/bitbake.conf +0 ~~-12~~

index 3b2ef9f..8588684 100644
@@ -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)}"

Signature · 1 line

1.9.1

Richard Purdie

2018-06-15 21:58 UTC #1 lore raw

Quoted 43 lines · Andre McCurdy

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 <[email protected]>
---
 meta/conf/bitbake.conf | 12 ------------
 1 file changed, 12 deletions(-)
meta/conf/bitbake.conf +0 -0
index 3b2ef9f..8588684 100644
@@ -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"
meta/conf/bitbake.conf +0 -6
-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}"
meta/conf/bitbake.conf +0 -1
@@ -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"
meta/conf/bitbake.conf +0 -2
-FETCHCMD_cvs = "/usr/bin/env cvs"
-FETCHCMD_wget = "/usr/bin/env wget -t 2 -T 30 --passive-ftp --no-
check-certificate"

meta/conf/bitbake.conf SRC_URI[vardepsexclude] += "\ · line 660

Quoted 6 lines

meta/conf/bitbake.conf +0 -3

-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

Andre McCurdy

author

2018-06-15 22:12 UTC #2 lore raw

Quoted 54 lines · Richard Purdie

Quoted 43 lines · Andre McCurdy
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 <[email protected]>
---
 meta/conf/bitbake.conf | 12 ------------
 1 file changed, 12 deletions(-)
meta/conf/bitbake.conf +0 -0
index 3b2ef9f..8588684 100644
@@ -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"
meta/conf/bitbake.conf +0 -6
-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}"
meta/conf/bitbake.conf +0 -1
@@ -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"
meta/conf/bitbake.conf +0 -2
-FETCHCMD_cvs = "/usr/bin/env cvs"
-FETCHCMD_wget = "/usr/bin/env wget -t 2 -T 30 --passive-ftp --no-
check-certificate"
meta/conf/bitbake.conf SRC_URI[vardepsexclude] += "\ · line 660
Quoted 6 lines
meta/conf/bitbake.conf +0 -3
-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.

Quoted 3 lines

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.

Andre McCurdy

author

2018-10-23 21:18 UTC #3 lore raw

Quoted 56 lines · Andre McCurdy

Quoted 54 lines · Richard Purdie
Quoted 43 lines · Andre McCurdy
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 <[email protected]>
---
 meta/conf/bitbake.conf | 12 ------------
 1 file changed, 12 deletions(-)
meta/conf/bitbake.conf +0 -0
index 3b2ef9f..8588684 100644
@@ -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"
meta/conf/bitbake.conf +0 -6
-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}"
meta/conf/bitbake.conf +0 -1
@@ -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"
meta/conf/bitbake.conf +0 -2
-FETCHCMD_cvs = "/usr/bin/env cvs"
-FETCHCMD_wget = "/usr/bin/env wget -t 2 -T 30 --passive-ftp --no-
check-certificate"
meta/conf/bitbake.conf SRC_URI[vardepsexclude] += "\ · line 660
Quoted 6 lines
meta/conf/bitbake.conf +0 -3
-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.

Quoted 7 lines

Quoted 3 lines
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?

[email protected]

2018-10-23 21:20 UTC #4 lore raw

Quoted 73 lines · Andre McCurdy

Quoted 71 lines · Andre McCurdy
Quoted 68 lines · Richard Purdie
Quoted 51 lines · Andre McCurdy
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 <[email protected]>
---
 meta/conf/bitbake.conf | 12 ------------
 1 file changed, 12 deletions(-)
meta/conf/bitbake.conf +0 -0
index 3b2ef9f..8588684 100644
@@ -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"
meta/conf/bitbake.conf +0 -6
-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}"
meta/conf/bitbake.conf +0 -0
@@ -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"
meta/conf/bitbake.conf +0 -2
-FETCHCMD_cvs = "/usr/bin/env cvs"
-FETCHCMD_wget = "/usr/bin/env wget -t 2 -T 30 --passive-ftp --
no-
check-certificate"
meta/conf/bitbake.conf SRC_URI[vardepsexclude] += "\ · line 660
Quoted 6 lines
meta/conf/bitbake.conf +0 -3
-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?

Quoted 5 lines

Quoted 3 lines
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