[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.
Signed-off-by: Lianhao Lu <lianhao...@intel.com>
---
meta/classes/image.bbclass | 17 +++++------------
meta/classes/package.bbclass | 2 +-
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 3cd5e7a..f17e989 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -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:
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 73e8f63..0e08394 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1622,7 +1622,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 = []
--
1.7.0.4
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
