summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-12-12 20:27:47 +0000
committerKoen Kooi <koen@openembedded.org>2006-12-12 20:27:47 +0000
commit44fd0a5b1ae5367de691e3437ae9832d800c22e7 (patch)
tree109ae8782937b1d768db72b56496fe921bc912d4 /classes
parent33a1e2e14f1d92a015887d13ff228e2771573683 (diff)
parent3eda560ee66482cb9954d538b5c2743942dda260 (diff)
merge of '45fb4fa94d52a65c3a3fa636c6122139173dfa8d'
and 'aa6010d679e0e80d63f4e63191b66e5759482858'
Diffstat (limited to 'classes')
-rw-r--r--classes/base.bbclass12
-rw-r--r--classes/package.bbclass1
2 files changed, 7 insertions, 6 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index e1d0e8854a..249a25a218 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -770,12 +770,12 @@ ${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
-ftp://ftp.kernel.org/pub http://www.kernel.org/pub
-ftp://ftp.kernel.org/pub ftp://ftp.us.kernel.org/pub
-ftp://ftp.kernel.org/pub ftp://ftp.uk.kernel.org/pub
-ftp://ftp.kernel.org/pub ftp://ftp.hk.kernel.org/pub
-ftp://ftp.kernel.org/pub ftp://ftp.au.kernel.org/pub
-ftp://ftp.kernel.org/pub ftp://ftp.jp.kernel.org/pub
+${KERNELORG_MIRROR} http://www.kernel.org/pub
+${KERNELORG_MIRROR} ftp://ftp.us.kernel.org/pub
+${KERNELORG_MIRROR} ftp://ftp.uk.kernel.org/pub
+${KERNELORG_MIRROR} ftp://ftp.hk.kernel.org/pub
+${KERNELORG_MIRROR} ftp://ftp.au.kernel.org/pub
+${KERNELORG_MIRROR} ftp://ftp.jp.kernel.org/pub
ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/
ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.surfnet.nl/pub/security/gnupg/
ftp://ftp.gnupg.org/gcrypt/ http://gulus.USherbrooke.ca/pub/appl/GnuPG/
diff --git a/classes/package.bbclass b/classes/package.bbclass
index c53b3ee708..132fdcb37a 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -576,6 +576,7 @@ python package_do_shlibs() {
path = os.path.join(root, file)
if os.access(path, os.X_OK) or lib_re.match(file):
cmd = bb.data.getVar('OBJDUMP', d, 1) + " -p " + path + " 2>/dev/null"
+ cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', d, 1), cmd)
fd = os.popen(cmd)
lines = fd.readlines()
fd.close()