Skip to contentSkip to conversation

Do not depend on BBFILES to compute scm dirs

PATCH Applied Khem Raj 2 participants 6 messages May 11, 2011

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

cover Do not depend on BBFILES to compute scm dirs

This fixes the problem that I described in
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-May/001966.html

Additionally we do not need directories with */packages/* in BBFILES anymore

use --no-check-certificate for wget otherwise tar downloads from github.com end up giving certificate errors

HTTP request sent, awaiting response... 301 Moved Permanently
Location: https://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz [following] --2011-05-10 23:16:17-- https://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz
Connecting to github.com|207.97.227.239|:443... connected.
ERROR: certificate common name *.github.com' doesn't match requested host name github.com'. To connect to github.com insecurely, use `--no-check-certificate'.

Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: kraj/misc-fixes
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/misc-fixes

Thanks,
Khem Raj <[email protected]>
---

Khem Raj (2):
metadata_scm.bbclass: Use COREBASE to grok for SCM operations meta/conf/layer.conf: Remove packages/*bb from BBFILES

Otavio Salvador (1):
conf/bitbake.conf: use --no-check-certificate to avoid errors when
wgetting from https

 meta/classes/metadata_scm.bbclass |    5 +----
 meta/conf/bitbake.conf            |    8 ++++----
 meta/conf/layer.conf              |    2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)
Signature · 1 line
1.7.4.1
author
#1 lore raw

PATCH 1/3 metadata_scm.bbclass: Use COREBASE to grok for SCM operations

Signed-off-by Khem Raj <[email protected]>
---
 meta/classes/metadata_scm.bbclass |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
meta/classes/metadata_scm.bbclass +1 -4
index 7112ad5..99ac05c 100644
@@ -25,12 +25,9 @@ def base_detect_branch(d):
 			return rev.strip()
 
 	return "<unknown>"	
-	
-	
 
 def base_get_scmbasepath(d):
-	path_to_bbfiles = bb.data.getVar( 'BBFILES', d, 1 ).split()
-	return path_to_bbfiles[0][:path_to_bbfiles[0].rindex( "packages" )]
+	return bb.data.getVar( 'COREBASE', d, 1 )
 
 def base_get_metadata_monotone_branch(path, d):
 	monotone_branch = "<unknown>"
Signature · 1 line
1.7.4.1
author
#2 lore raw

PATCH 2/3 meta/conf/layer.conf: Remove packages/*bb from BBFILES

In reply to Khem Raj

packages directory has been divided into recipes-*/ dirs

Signed-off-by Khem Raj <[email protected]>
---
 meta/conf/layer.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/layer.conf +1 -1
index 3f63c7d..ad95405 100644
@@ -2,7 +2,7 @@ BBPATH ?= ""
 # We have a conf and classes directory, add to BBPATH
 BBPATH .= ":${LAYERDIR}"
 # We have a packages directory, add to BBFILES
-BBFILES += "${LAYERDIR}/packages/*/*.bb ${LAYERDIR}/recipes-*/*/*.bb"
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb"
 
 BBFILE_COLLECTIONS += "normal"
 BBFILE_PATTERN_normal := "^${LAYERDIR}/"
Signature · 1 line
1.7.4.1
author
#3 lore raw

PATCH 3/3 conf/bitbake.conf: use --no-check-certificate to avoid errors when wgetting from https

In reply to Khem Raj

From: Otavio Salvador <[email protected]>

Signed-off-by Khem Raj <[email protected]>
---
 meta/conf/bitbake.conf |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
meta/conf/bitbake.conf +4 -4
index fb488ae..030a78b 100644
@@ -507,17 +507,17 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases"
 
 FETCHCMD_svn = "/usr/bin/env svn"
 FETCHCMD_cvs = "/usr/bin/env cvs"
-FETCHCMD_wget = "/usr/bin/env wget -t 5 -q"
+FETCHCMD_wget = "/usr/bin/env wget -t 5 -q --no-check-certificate"
 FETCHCMD_bzr = "/usr/bin/env bzr"
 FETCHCMD_hg = "/usr/bin/env hg"
 
 FETCHCOMMAND = "ERROR, this must be a BitBake bug"
-FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 -q --passive-ftp -P ${DL_DIR} '${URI}'"
+FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 -q --passive-ftp -P --no-check-certificate ${DL_DIR} '${URI}'"
 FETCHCOMMAND_cvs = "/usr/bin/env cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}"
 FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
-CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 5 --passive-ftp -P ${DL_DIR} '${URI}'"
+CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 5 --passive-ftp -P --no-check-certificate ${DL_DIR} '${URI}'"
 RESUMECOMMAND = "ERROR, this must be a BitBake bug"
-RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 -q --passive-ftp -P ${DL_DIR} '${URI}'"
+RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 -q --passive-ftp -P --no-check-certificate ${DL_DIR} '${URI}'"
 UPDATECOMMAND = "ERROR, this must be a BitBake bug"
 UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
 UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
Signature · 1 line
1.7.4.1
author
#4 lore raw

Re: [PATCH 3/3] conf/bitbake.conf: use --no-check-certificate to avoid errors when wgetting from https

Quoted 3 lines · Khem Raj

From: Otavio Salvador <[email protected]>

Signed-off-by Khem Raj <[email protected]>

well this patch is wrong since it adds --no-check-certificate between -P and its argument but I have fixed it and pushed the new patch to the pull tree.

Quoted 34 lines

---
 meta/conf/bitbake.conf |    8 ++++----

 1 files changed, 4 insertions(+), 4 deletions(-)
meta/conf/bitbake.conf +0 -0
index fb488ae..030a78b 100644
@@ -507,17 +507,17 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases"

 FETCHCMD_svn = "/usr/bin/env svn"
 FETCHCMD_cvs = "/usr/bin/env cvs"

meta/conf/bitbake.conf +1 -1
-FETCHCMD_wget = "/usr/bin/env wget -t 5 -q"
+FETCHCMD_wget = "/usr/bin/env wget -t 5 -q --no-check-certificate"

 FETCHCMD_bzr = "/usr/bin/env bzr"
 FETCHCMD_hg = "/usr/bin/env hg"

 FETCHCOMMAND = "ERROR, this must be a BitBake bug"

meta/conf/bitbake.conf +1 -1
-FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 -q --passive-ftp -P ${DL_DIR} '${URI}'"
+FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 -q --passive-ftp -P --no-check-certificate ${DL_DIR} '${URI}'"

 FETCHCOMMAND_cvs = "/usr/bin/env cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}" FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"

meta/conf/bitbake.conf +1 -1
-CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 5 --passive-ftp -P ${DL_DIR} '${URI}'"
+CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 5 --passive-ftp -P --no-check-certificate ${DL_DIR} '${URI}'"

 RESUMECOMMAND = "ERROR, this must be a BitBake bug"

meta/conf/bitbake.conf +1 -1
-RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 -q --passive-ftp -P ${DL_DIR} '${URI}'"
+RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 -q --passive-ftp -P --no-check-certificate ${DL_DIR} '${URI}'"

 UPDATECOMMAND = "ERROR, this must be a BitBake bug" UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
--
1.7.4.1