classes: Drop none package specific packaging variable accesses
(From OE-Core rev: 24cbe88429ba021d7c461e0271b67106d11d5eb2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
68ceb02e98
commit
069a332d1c
|
@ -56,18 +56,15 @@ python populate_packages_append () {
|
||||||
if schemas != []:
|
if schemas != []:
|
||||||
bb.note("adding gconf postinst and prerm scripts to %s" % pkg)
|
bb.note("adding gconf postinst and prerm scripts to %s" % pkg)
|
||||||
d.setVar('SCHEMA_FILES', " ".join(schemas))
|
d.setVar('SCHEMA_FILES', " ".join(schemas))
|
||||||
postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True)
|
postinst = d.getVar('pkg_postinst_%s' % pkg, True)
|
||||||
if not postinst:
|
if not postinst:
|
||||||
postinst = '#!/bin/sh\n'
|
postinst = '#!/bin/sh\n'
|
||||||
postinst += d.getVar('gconf_postinst', True)
|
postinst += d.getVar('gconf_postinst', True)
|
||||||
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
||||||
prerm = d.getVar('pkg_prerm_%s' % pkg, True) or d.getVar('pkg_prerm', True)
|
prerm = d.getVar('pkg_prerm_%s' % pkg, True)
|
||||||
if not prerm:
|
if not prerm:
|
||||||
prerm = '#!/bin/sh\n'
|
prerm = '#!/bin/sh\n'
|
||||||
prerm += d.getVar('gconf_prerm', True)
|
prerm += d.getVar('gconf_prerm', True)
|
||||||
d.setVar('pkg_prerm_%s' % pkg, prerm)
|
d.setVar('pkg_prerm_%s' % pkg, prerm)
|
||||||
rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or ""
|
d.appendVar("RDEPENDS_%s" % pkg, ' ' + d.getVar('MLPREFIX') + 'gconf')
|
||||||
rdepends += ' ' + d.getVar('MLPREFIX') + 'gconf'
|
|
||||||
d.setVar("RDEPENDS_%s" % pkg, rdepends)
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,13 +51,13 @@ python populate_packages_append () {
|
||||||
|
|
||||||
bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg)
|
bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg)
|
||||||
|
|
||||||
postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True)
|
postinst = d.getVar('pkg_postinst_%s' % pkg, True)
|
||||||
if not postinst:
|
if not postinst:
|
||||||
postinst = '#!/bin/sh\n'
|
postinst = '#!/bin/sh\n'
|
||||||
postinst += d.getVar('gtk_icon_cache_postinst', True)
|
postinst += d.getVar('gtk_icon_cache_postinst', True)
|
||||||
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
||||||
|
|
||||||
postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True)
|
postrm = d.getVar('pkg_postrm_%s' % pkg, True)
|
||||||
if not postrm:
|
if not postrm:
|
||||||
postrm = '#!/bin/sh\n'
|
postrm = '#!/bin/sh\n'
|
||||||
postrm += d.getVar('gtk_icon_cache_postrm', True)
|
postrm += d.getVar('gtk_icon_cache_postrm', True)
|
||||||
|
|
|
@ -60,13 +60,13 @@ python populate_packages_append () {
|
||||||
for pkg in gtkimmodules_pkgs:
|
for pkg in gtkimmodules_pkgs:
|
||||||
bb.note("adding gtk-immodule-cache postinst and postrm scripts to %s" % pkg)
|
bb.note("adding gtk-immodule-cache postinst and postrm scripts to %s" % pkg)
|
||||||
|
|
||||||
postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True)
|
postinst = d.getVar('pkg_postinst_%s' % pkg, True)
|
||||||
if not postinst:
|
if not postinst:
|
||||||
postinst = '#!/bin/sh\n'
|
postinst = '#!/bin/sh\n'
|
||||||
postinst += d.getVar('gtk_immodule_cache_postinst', True)
|
postinst += d.getVar('gtk_immodule_cache_postinst', True)
|
||||||
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
||||||
|
|
||||||
postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True)
|
postrm = d.getVar('pkg_postrm_%s' % pkg, True)
|
||||||
if not postrm:
|
if not postrm:
|
||||||
postrm = '#!/bin/sh\n'
|
postrm = '#!/bin/sh\n'
|
||||||
postrm += d.getVar('gtk_immodule_cache_postrm', True)
|
postrm += d.getVar('gtk_immodule_cache_postrm', True)
|
||||||
|
|
|
@ -43,18 +43,16 @@ python populate_packages_append () {
|
||||||
mimes.append(f)
|
mimes.append(f)
|
||||||
if mimes:
|
if mimes:
|
||||||
bb.note("adding mime postinst and postrm scripts to %s" % pkg)
|
bb.note("adding mime postinst and postrm scripts to %s" % pkg)
|
||||||
postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True)
|
postinst = d.getVar('pkg_postinst_%s' % pkg, True)
|
||||||
if not postinst:
|
if not postinst:
|
||||||
postinst = '#!/bin/sh\n'
|
postinst = '#!/bin/sh\n'
|
||||||
postinst += d.getVar('mime_postinst', True)
|
postinst += d.getVar('mime_postinst', True)
|
||||||
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
||||||
postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True)
|
postrm = d.getVar('pkg_postrm_%s' % pkg, True)
|
||||||
if not postrm:
|
if not postrm:
|
||||||
postrm = '#!/bin/sh\n'
|
postrm = '#!/bin/sh\n'
|
||||||
postrm += d.getVar('mime_postrm', True)
|
postrm += d.getVar('mime_postrm', True)
|
||||||
d.setVar('pkg_postrm_%s' % pkg, postrm)
|
d.setVar('pkg_postrm_%s' % pkg, postrm)
|
||||||
bb.note("adding shared-mime-info-data dependency to %s" % pkg)
|
bb.note("adding shared-mime-info-data dependency to %s" % pkg)
|
||||||
rdepends = explode_deps(d.getVar('RDEPENDS_' + pkg, False) or d.getVar('RDEPENDS', False) or "" )
|
d.appendVar('RDEPENDS_' + pkg, " shared-mime-info-data")
|
||||||
rdepends.append("shared-mime-info-data")
|
|
||||||
d.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends))
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -418,7 +418,7 @@ python package_do_split_locales() {
|
||||||
# glibc-localedata-translit* won't install as a dependency
|
# glibc-localedata-translit* won't install as a dependency
|
||||||
# for some other package which breaks meta-toolchain
|
# for some other package which breaks meta-toolchain
|
||||||
# Probably breaks since virtual-locale- isn't provided anywhere
|
# Probably breaks since virtual-locale- isn't provided anywhere
|
||||||
#rdep = (d.getVar('RDEPENDS_%s' % pn, True) or d.getVar('RDEPENDS', True) or "").split()
|
#rdep = (d.getVar('RDEPENDS_%s' % pn, True) or "").split()
|
||||||
#rdep.append('%s-locale*' % pn)
|
#rdep.append('%s-locale*' % pn)
|
||||||
#d.setVar('RDEPENDS_%s' % pn, ' '.join(rdep))
|
#d.setVar('RDEPENDS_%s' % pn, ' '.join(rdep))
|
||||||
}
|
}
|
||||||
|
@ -901,7 +901,7 @@ python populate_packages () {
|
||||||
root = os.path.join(pkgdest, pkg)
|
root = os.path.join(pkgdest, pkg)
|
||||||
bb.utils.mkdirhier(root)
|
bb.utils.mkdirhier(root)
|
||||||
|
|
||||||
filesvar = d.getVar('FILES_%s' % pkg, True) or d.getVar('FILES', True) or ""
|
filesvar = d.getVar('FILES_%s' % pkg, True) or ""
|
||||||
if "//" in filesvar:
|
if "//" in filesvar:
|
||||||
bb.warn("FILES variable for package %s contains '//' which is invalid. Attempting to fix this but you should correct the metadata.\n" % pkg)
|
bb.warn("FILES variable for package %s contains '//' which is invalid. Attempting to fix this but you should correct the metadata.\n" % pkg)
|
||||||
filesvar.replace("//", "/")
|
filesvar.replace("//", "/")
|
||||||
|
@ -1023,7 +1023,7 @@ python package_fixsymlinks () {
|
||||||
bb.note("%s contains dangling symlink to %s" % (pkg, l))
|
bb.note("%s contains dangling symlink to %s" % (pkg, l))
|
||||||
|
|
||||||
for pkg in newrdepends:
|
for pkg in newrdepends:
|
||||||
rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS_' + pkg, True) or d.getVar('RDEPENDS', True) or "")
|
rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS_' + pkg, True) or "")
|
||||||
for p in newrdepends[pkg]:
|
for p in newrdepends[pkg]:
|
||||||
if p not in rdepends:
|
if p not in rdepends:
|
||||||
rdepends[p] = []
|
rdepends[p] = []
|
||||||
|
@ -1408,7 +1408,7 @@ python package_do_shlibs() {
|
||||||
fd.close()
|
fd.close()
|
||||||
if needs_ldconfig and use_ldconfig:
|
if needs_ldconfig and use_ldconfig:
|
||||||
bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg)
|
bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg)
|
||||||
postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True)
|
postinst = d.getVar('pkg_postinst_%s' % pkg, True)
|
||||||
if not postinst:
|
if not postinst:
|
||||||
postinst = '#!/bin/sh\n'
|
postinst = '#!/bin/sh\n'
|
||||||
postinst += d.getVar('ldconfig_postinst_fragment', True)
|
postinst += d.getVar('ldconfig_postinst_fragment', True)
|
||||||
|
@ -1595,7 +1595,7 @@ python read_shlibdeps () {
|
||||||
|
|
||||||
packages = d.getVar('PACKAGES', True).split()
|
packages = d.getVar('PACKAGES', True).split()
|
||||||
for pkg in packages:
|
for pkg in packages:
|
||||||
rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS_' + pkg, True) or d.getVar('RDEPENDS', True) or "")
|
rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS_' + pkg, True) or "")
|
||||||
for dep in pkglibdeps[pkg]:
|
for dep in pkglibdeps[pkg]:
|
||||||
# Add the dep if it's not already there, or if no comparison is set
|
# Add the dep if it's not already there, or if no comparison is set
|
||||||
if dep not in rdepends:
|
if dep not in rdepends:
|
||||||
|
@ -1627,7 +1627,7 @@ python package_depchains() {
|
||||||
def pkg_adddeprrecs(pkg, base, suffix, getname, depends, d):
|
def pkg_adddeprrecs(pkg, base, suffix, getname, depends, d):
|
||||||
|
|
||||||
#bb.note('depends for %s is %s' % (base, depends))
|
#bb.note('depends for %s is %s' % (base, depends))
|
||||||
rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg, True) or d.getVar('RRECOMMENDS', True) or "")
|
rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg, True) or "")
|
||||||
|
|
||||||
for depend in depends:
|
for depend in depends:
|
||||||
if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'):
|
if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'):
|
||||||
|
@ -1648,7 +1648,7 @@ python package_depchains() {
|
||||||
def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d):
|
def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d):
|
||||||
|
|
||||||
#bb.note('rdepends for %s is %s' % (base, rdepends))
|
#bb.note('rdepends for %s is %s' % (base, rdepends))
|
||||||
rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg, True) or d.getVar('RRECOMMENDS', True) or "")
|
rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg, True) or "")
|
||||||
|
|
||||||
for depend in rdepends:
|
for depend in rdepends:
|
||||||
if depend.find('virtual-locale-') != -1:
|
if depend.find('virtual-locale-') != -1:
|
||||||
|
@ -1675,9 +1675,6 @@ python package_depchains() {
|
||||||
add_dep(depends, dep)
|
add_dep(depends, dep)
|
||||||
|
|
||||||
rdepends = []
|
rdepends = []
|
||||||
for dep in bb.utils.explode_deps(d.getVar('RDEPENDS', True) or ""):
|
|
||||||
add_dep(rdepends, dep)
|
|
||||||
|
|
||||||
for pkg in packages.split():
|
for pkg in packages.split():
|
||||||
for dep in bb.utils.explode_deps(d.getVar('RDEPENDS_' + pkg, True) or ""):
|
for dep in bb.utils.explode_deps(d.getVar('RDEPENDS_' + pkg, True) or ""):
|
||||||
add_dep(rdepends, dep)
|
add_dep(rdepends, dep)
|
||||||
|
@ -1727,7 +1724,7 @@ python package_depchains() {
|
||||||
pkg_addrrecs(pkg, base, suffix, func, rdepends, d)
|
pkg_addrrecs(pkg, base, suffix, func, rdepends, d)
|
||||||
else:
|
else:
|
||||||
rdeps = []
|
rdeps = []
|
||||||
for dep in bb.utils.explode_deps(d.getVar('RDEPENDS_' + base, True) or d.getVar('RDEPENDS', True) or ""):
|
for dep in bb.utils.explode_deps(d.getVar('RDEPENDS_' + base, True) or ""):
|
||||||
add_dep(rdeps, dep)
|
add_dep(rdeps, dep)
|
||||||
pkg_addrrecs(pkg, base, suffix, func, rdeps, d)
|
pkg_addrrecs(pkg, base, suffix, func, rdeps, d)
|
||||||
}
|
}
|
||||||
|
|
|
@ -324,12 +324,12 @@ python populate_packages_updatealternatives () {
|
||||||
|
|
||||||
bb.note('adding update-alternatives calls to postinst/postrm for %s' % pkg)
|
bb.note('adding update-alternatives calls to postinst/postrm for %s' % pkg)
|
||||||
bb.note('%s' % alt_setup_links)
|
bb.note('%s' % alt_setup_links)
|
||||||
postinst = (d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True)) or '#!/bin/sh\n'
|
postinst = d.getVar('pkg_postinst_%s' % pkg, True) or '#!/bin/sh\n'
|
||||||
postinst += alt_setup_links
|
postinst += alt_setup_links
|
||||||
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
||||||
|
|
||||||
bb.note('%s' % alt_remove_links)
|
bb.note('%s' % alt_remove_links)
|
||||||
postrm = (d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True)) or '#!/bin/sh\n'
|
postrm = d.getVar('pkg_postrm_%s' % pkg, True) or '#!/bin/sh\n'
|
||||||
postrm += alt_remove_links
|
postrm += alt_remove_links
|
||||||
d.setVar('pkg_postrm_%s' % pkg, postrm)
|
d.setVar('pkg_postrm_%s' % pkg, postrm)
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,19 +57,19 @@ python populate_packages_updatercd () {
|
||||||
execute on the target. Not doing so may cause update_rc.d postinst invoked
|
execute on the target. Not doing so may cause update_rc.d postinst invoked
|
||||||
twice to cause unwanted warnings.
|
twice to cause unwanted warnings.
|
||||||
"""
|
"""
|
||||||
postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True)
|
postinst = d.getVar('pkg_postinst_%s' % pkg, True)
|
||||||
if not postinst:
|
if not postinst:
|
||||||
postinst = '#!/bin/sh\n'
|
postinst = '#!/bin/sh\n'
|
||||||
postinst += d.getVar('updatercd_postinst', True)
|
postinst += d.getVar('updatercd_postinst', True)
|
||||||
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
||||||
|
|
||||||
prerm = d.getVar('pkg_prerm_%s' % pkg, True) or d.getVar('pkg_prerm', True)
|
prerm = d.getVar('pkg_prerm_%s' % pkg, True)
|
||||||
if not prerm:
|
if not prerm:
|
||||||
prerm = '#!/bin/sh\n'
|
prerm = '#!/bin/sh\n'
|
||||||
prerm += d.getVar('updatercd_prerm', True)
|
prerm += d.getVar('updatercd_prerm', True)
|
||||||
d.setVar('pkg_prerm_%s' % pkg, prerm)
|
d.setVar('pkg_prerm_%s' % pkg, prerm)
|
||||||
|
|
||||||
postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True)
|
postrm = d.getVar('pkg_postrm_%s' % pkg, True)
|
||||||
if not postrm:
|
if not postrm:
|
||||||
postrm = '#!/bin/sh\n'
|
postrm = '#!/bin/sh\n'
|
||||||
postrm += d.getVar('updatercd_postrm', True)
|
postrm += d.getVar('updatercd_postrm', True)
|
||||||
|
|
Loading…
Reference in New Issue