sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

image/package.bbclass: Revise multilib support for DEBIAN_NAME. 

[YOCTO #1486]
1. image.bbclass: In multilib_sanity_check, duplicated files except
those matching to MULTILIBRE_ALLOW_REP are allowed if they're equal.

2. pacakge.bbclass: Allow DEBIAN_NOAUTONAMES variable to be
automatically mapped in multilib case.

(From OE-Core rev: 66f9045e17c39f5c64a0699b72ea460a0701717a)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Lianhao Lu 2011-09-16 20:41:36 +08:00 committed by Richard Purdie
parent aab71071d7
commit 99dd3c0b2c
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
meta/classes/image.bbclass
View File

@ -213,7 +213,6 @@ log_check() {
}
MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|"
MULTILIBRE_FORCE_SAME =. "${sysconfdir}|${datadir}|"
MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py"
MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"
@ -223,7 +222,6 @@ import sys, os, os.path
import re,filecmp
allow_rep=re.compile(re.sub("\|$","","${MULTILIBRE_ALLOW_REP}"))
force_same=re.compile(re.sub("\|$","","${MULTILIBRE_FORCE_SAME}"))
error_promt="Multilib check error:"
files={}
@ -236,19 +234,14 @@ for dir in dirs.split():
valid=True;
if files.has_key(key):
#check whether files are the same
if force_same.match(key):
#check whether the file is allow to replace
if allow_rep.match(key):
valid=True
else:
if not filecmp.cmp(files[key],item):
valid=False
print("%s %s is not the same as %s\n" % (error_promt, item, files[key]))
print("%s duplicate files %s %s is not the same\n" % (error_promt, item, files[key]))
sys.exit(1)
#check whether the file is allow to replace
elif allow_rep.match(key):
valid=True
else:
valid=False
print("%s duplicated files %s %s not allowed\n" % (error_promt, item, files[key]))
sys.exit(1)
#pass the check, add to list
if valid:

2
meta/classes/package.bbclass
View File

@ -1625,7 +1625,7 @@ python package_depchains() {
# Since bitbake can't determine which variables are accessed during package
# iteration, we need to list them here:
PACKAGEVARS = "FILES RDEPENDS RRECOMMENDS SUMMARY DESCRIPTION RSUGGESTS RPROVIDES RCONFLICTS PKG ALLOW_EMPTY pkg_postinst pkg_postrm INITSCRIPT_NAME INITSCRIPT_PARAMS"
PACKAGEVARS = "FILES RDEPENDS RRECOMMENDS SUMMARY DESCRIPTION RSUGGESTS RPROVIDES RCONFLICTS PKG ALLOW_EMPTY pkg_postinst pkg_postrm INITSCRIPT_NAME INITSCRIPT_PARAMS DEBIAN_NOAUTONAME"
def gen_packagevar(d):
ret = []