From 99dd3c0b2c0a3b116baa5bbd5e390768d699865b Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Fri, 16 Sep 2011 20:41:36 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'meta/classes/image.bbclass') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 3cd5e7aae0..f17e989289 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: -- cgit v1.2.3-54-g00ecf