mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 00:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

base.bbclass: Further tweaks from OE

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2629 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2007-09-01 15:06:04 +00:00
parent 19e113c67f
commit 411cd0c6ae
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
meta/classes/base.bbclass
View File

@@ -784,20 +784,24 @@ python read_subpackage_metadata () {
def base_after_parse(d): def base_after_parse(d):
import bb, os, exceptions import bb, os, exceptions
need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1)
if need_host:
import re
this_host = bb.data.getVar('HOST_SYS', d, 1)
if not re.match(need_host, this_host):
raise bb.parse.SkipPackage("incompatible with host %s" % this_host)
need_machine = bb.data.getVar('COMPATIBLE_MACHINE', d, 1) source_mirror_fetch = bb.data.getVar('SOURCE_MIRROR_FETCH', d, 0)
if need_machine: if not source_mirror_fetch:
import re need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1)
this_machine = bb.data.getVar('MACHINE', d, 1) if need_host:
if this_machine and not re.match(need_machine, this_machine): import re
raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine) this_host = bb.data.getVar('HOST_SYS', d, 1)
if not re.match(need_host, this_host):
raise bb.parse.SkipPackage("incompatible with host %s" % this_host)
need_machine = bb.data.getVar('COMPATIBLE_MACHINE', d, 1)
if need_machine:
import re
this_machine = bb.data.getVar('MACHINE', d, 1)
if this_machine and not re.match(need_machine, this_machine):
raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine)
pn = bb.data.getVar('PN', d, 1) pn = bb.data.getVar('PN', d, 1)
@@ -840,11 +844,11 @@ def base_after_parse(d):
override = bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1) override = bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1)
if override == '0': if override == '0':
return return
paths = [] paths = []
for p in [ "${PF}", "${P}", "${PN}", "files", "" ]: for p in [ "${PF}", "${P}", "${PN}", "files", "" ]:
path = bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d) path = bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d)
if os.path.isdir(path): if os.path.isdir(path):
paths.append(path) paths.append(path)
if len(paths) == 0: if len(paths) == 0:
return return