From b0393327217ccb3fbc911e389713c7595cd76391 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 12 Aug 2009 23:43:02 +0200 Subject: base.bbclass: ftp.matrix.com.br no longer exists * Acked-By: Holger Freyther * Acked-by: Phil Blundell --- classes/base.bbclass | 1 - 1 file changed, 1 deletion(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index ef6c0abf8f..5363e5c69f 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1279,7 +1279,6 @@ ${DEBIAN_MIRROR} ftp://ftp.es.debian.org/debian/pool ${DEBIAN_MIRROR} ftp://ftp.se.debian.org/debian/pool ${DEBIAN_MIRROR} ftp://ftp.tr.debian.org/debian/pool ${GNU_MIRROR} ftp://mirrors.kernel.org/gnu -${GNU_MIRROR} ftp://ftp.matrix.com.br/pub/gnu ${GNU_MIRROR} ftp://ftp.cs.ubc.ca/mirror2/gnu ${GNU_MIRROR} ftp://sunsite.ust.hk/pub/gnu ${GNU_MIRROR} ftp://ftp.ayamura.org/pub/gnu -- cgit v1.2.3 From ad0ba478018ac64598b6701df5a79b1f71f9b58f Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 14 Aug 2009 16:01:10 +0200 Subject: base.bbclass: introduce OE source mirror network as last resort for do_fetch Updating recipes and checksums.ini for vanishing upstream hosts or simple restructuring can quickly become a chore for OE devs if taken seriously. The OE user experience suffers severely when at any given point in time 4 to 5 recipes on average fail do_fetch for a simple image. The solution is for OE to provide its own caching of upstream sources. mirrors.openembedded.org is a swarm of possibly incomplete source mirrors provided by the community and load-balanced via DNS round robin. They act as a first line of defense and lower bandwidth load on melo which hosts sources.openembedded.org. The melo mirror aims to have a complete copy of free-to-publish sources used by the current org.oe.dev branch. More information at http://wiki.openembedded.net/index.php/Sources_mirror Acked-by: Holger Freyther Acked-by: Chris Larson --- classes/base.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 5363e5c69f..51648dae92 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1312,6 +1312,10 @@ ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://gd.tuwien.ac.at/utils/adm ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://sunsite.ualberta.ca/pub/Mirror/lsof/ ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://the.wiretapped.net/pub/security/host-security/lsof/ http://www.apache.org/dist http://archive.apache.org/dist +ftp://.*/.* http://mirrors.openembedded.org/ +https?$://.*/.* http://mirrors.openembedded.org/ +ftp://.*/.* http://sources.openembedded.org/ +https?$://.*/.* http://sources.openembedded.org/ } -- cgit v1.2.3 From aea9acb329d715db851c1bed8506c3d0f9b42ae1 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 10 Jul 2009 11:27:31 -0700 Subject: Let the distro control whether we include hostap or madwifi. - Add base_ifelse convenience function to base.bbclass. - Replace all conditionals in the recipes relating to hostap and madwifi to look for their name in COMBINED_FEATURES rather than looking for specific buses (pci, pcmcia). - Change the default COMBINED_FEATURES to enable: - madwifi, when: - distro has pci, wifi, and madwifi in its features - machine has pci in its features - hostap, when: - 'wifi' and 'hostap' are in distro features - either 'pci' or 'pcmcia' are in both distro and machine features Signed-off-by: Chris Larson --- classes/base.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 51648dae92..aed927404a 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -159,6 +159,12 @@ def base_read_file(filename): return f.read().strip() return None +def base_ifelse(condition, iftrue = True, iffalse = False): + if condition: + return iftrue + else: + return iffalse + def base_conditional(variable, checkvalue, truevalue, falsevalue, d): import bb if bb.data.getVar(variable,d,1) == checkvalue: -- cgit v1.2.3 From ac729cee6058e9e601af4869874213ccd129c732 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 7 Jul 2009 15:19:07 -0700 Subject: base.bbclass: catch bb.MalformedUrl in do_fetch. Signed-off-by: Chris Larson --- classes/base.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index aed927404a..598a7bb77f 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -620,6 +620,9 @@ python base_do_fetch() { except bb.fetch.NoMethodError: (type, value, traceback) = sys.exc_info() raise bb.build.FuncFailed("No method: %s" % value) + except bb.MalformedUrl: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("Malformed URL: %s" % value) try: bb.fetch.go(localdata) -- cgit v1.2.3 From f73c64e7295be1e1065f898b49f50a02e812161c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 23 Aug 2009 19:24:57 -0700 Subject: base.bbclass: Replace os.system with subprocess call. Often gzip is reporting broken pipe errors with do_unpack of tar.gz files. If you use the commands described above to extract a tar.gz file, gzip sometimes emits a Broken pipe error message. This can safely be ignored if tar extracted all files without any other error message. We do not let python install its SIGPIPE handler and use subprocess call to invoke the command. This is based on the following python bug report. http://bugs.python.org/issue1652 Signed-off-by: Khem Raj --- classes/base.bbclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 598a7bb77f..4e9b65c285 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -728,9 +728,14 @@ base_do_buildall() { : } +def subprocess_setup(): + import signal, subprocess + # Python installs a SIGPIPE handler by default. This is usually not what + # non-Python subprocesses expect. + signal.signal(signal.SIGPIPE, signal.SIG_DFL) def oe_unpack_file(file, data, url = None): - import bb, os + import bb, os, signal, subprocess if not url: url = "file://%s" % file dots = file.split(".") @@ -799,7 +804,7 @@ def oe_unpack_file(file, data, url = None): cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', data, 1), cmd) bb.note("Unpacking %s to %s/" % (base_path_out(file, data), base_path_out(os.getcwd(), data))) - ret = os.system(cmd) + ret = subprocess.call(cmd, preexec_fn=subprocess_setup, shell=True) os.chdir(save_cwd) -- cgit v1.2.3 From af56cd467bcc76f5499199fb1f14252abe1e1e2a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 26 Aug 2009 00:38:30 -0700 Subject: base.bbclass: Remove redundant import of subprocess and signal. Signed-off-by: Khem Raj --- classes/base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 4e9b65c285..a350b38850 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -729,13 +729,13 @@ base_do_buildall() { } def subprocess_setup(): - import signal, subprocess + import signal # Python installs a SIGPIPE handler by default. This is usually not what # non-Python subprocesses expect. signal.signal(signal.SIGPIPE, signal.SIG_DFL) def oe_unpack_file(file, data, url = None): - import bb, os, signal, subprocess + import bb, os, subprocess if not url: url = "file://%s" % file dots = file.split(".") -- cgit v1.2.3 From 4cd5e9101dbefdefa183e4103989819893b2ffea Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 26 Aug 2009 15:31:03 -0700 Subject: base.bbclass: add cleanall task. Can be particularly useful when using multiple srctree recipes. Signed-off-by: Chris Larson --- classes/base.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index a350b38850..97ccf5dfc3 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -523,6 +523,12 @@ python base_do_clean() { os.system('rm -f '+ dir) } +python do_cleanall() { + pass +} +do_cleanall[recrdeptask] = "do_clean" +addtask cleanall after do_clean + #Uncomment this for bitbake 1.8.12 #addtask rebuild after do_${BB_DEFAULT_TASK} addtask rebuild -- cgit v1.2.3 From e6bdc929a0281e3bc5d69c099d37bf4d1f2bae23 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 29 Aug 2009 14:42:42 -0700 Subject: base.bbclass: Pass in PATH to popen. On Mac OSX its not able to find md5sum if path is not passed to os.popen shell. Signed-off-by: Khem Raj Acked-by: Koen Kooi --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 97ccf5dfc3..d29ba4bfcf 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -84,7 +84,7 @@ def base_chk_file(parser, pn, pv, src_uri, localpath, data): # call md5(sum) and shasum try: - md5pipe = os.popen('md5sum ' + localpath) + md5pipe = os.popen('PATH=%s md5sum %s' % (bb.data.getVar('PATH', data, True), localpath)) md5data = (md5pipe.readline().split() or [ "" ])[0] md5pipe.close() except OSError: -- cgit v1.2.3