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:
parent
aab71071d7
commit
99dd3c0b2c
|
@ -213,7 +213,6 @@ log_check() {
|
||||||
}
|
}
|
||||||
|
|
||||||
MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|"
|
MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|"
|
||||||
MULTILIBRE_FORCE_SAME =. "${sysconfdir}|${datadir}|"
|
|
||||||
MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py"
|
MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py"
|
||||||
MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"
|
MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"
|
||||||
|
|
||||||
|
@ -223,7 +222,6 @@ import sys, os, os.path
|
||||||
import re,filecmp
|
import re,filecmp
|
||||||
|
|
||||||
allow_rep=re.compile(re.sub("\|$","","${MULTILIBRE_ALLOW_REP}"))
|
allow_rep=re.compile(re.sub("\|$","","${MULTILIBRE_ALLOW_REP}"))
|
||||||
force_same=re.compile(re.sub("\|$","","${MULTILIBRE_FORCE_SAME}"))
|
|
||||||
error_promt="Multilib check error:"
|
error_promt="Multilib check error:"
|
||||||
|
|
||||||
files={}
|
files={}
|
||||||
|
@ -236,19 +234,14 @@ for dir in dirs.split():
|
||||||
|
|
||||||
valid=True;
|
valid=True;
|
||||||
if files.has_key(key):
|
if files.has_key(key):
|
||||||
#check whether files are the same
|
#check whether the file is allow to replace
|
||||||
if force_same.match(key):
|
if allow_rep.match(key):
|
||||||
|
valid=True
|
||||||
|
else:
|
||||||
if not filecmp.cmp(files[key],item):
|
if not filecmp.cmp(files[key],item):
|
||||||
valid=False
|
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)
|
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
|
#pass the check, add to list
|
||||||
if valid:
|
if valid:
|
||||||
|
|
|
@ -1625,7 +1625,7 @@ python package_depchains() {
|
||||||
|
|
||||||
# Since bitbake can't determine which variables are accessed during package
|
# Since bitbake can't determine which variables are accessed during package
|
||||||
# iteration, we need to list them here:
|
# 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):
|
def gen_packagevar(d):
|
||||||
ret = []
|
ret = []
|
||||||
|
|
Loading…
Reference in New Issue