diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2009-11-16 10:52:35 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-16 10:52:35 +0000 |
| commit | 5f22458409d2e1672f5a71f0f7f51ea471a71355 (patch) | |
| tree | e63dbc5b2189a9d6dbfdc0545cdddf092301aaea | |
| parent | 01f75c1b48e1a087263427488245c0c79a2f87e3 (diff) | |
| download | openembedded-core-contrib-5f22458409d2e1672f5a71f0f7f51ea471a71355.tar.gz | |
debian/kernel/gconf/gtk-icon-cache: PKGDESK/PKG fixes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/classes/debian.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/gconf.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/gtk-icon-cache.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/kernel.bbclass | 6 |
4 files changed, 7 insertions, 9 deletions
diff --git a/meta/classes/debian.bbclass b/meta/classes/debian.bbclass index 0afe9fcc39..8f6e7d88cf 100644 --- a/meta/classes/debian.bbclass +++ b/meta/classes/debian.bbclass @@ -16,7 +16,7 @@ do_package_write_rpm[rdeptask] = "do_package" python debian_package_name_hook () { import glob, copy, stat, errno, re - workdir = bb.data.getVar('WORKDIR', d, 1) + pkgdest = bb.data.getVar('PKGDEST', d, 1) packages = bb.data.getVar('PACKAGES', d, 1) def socrunch(s): @@ -45,7 +45,7 @@ python debian_package_name_hook () { sonames = [] has_bins = 0 has_libs = 0 - pkg_dir = os.path.join(workdir, "install", orig_pkg) + pkg_dir = os.path.join(pkgdest, orig_pkg) for root, dirs, files in os.walk(pkg_dir): if bin_re.match(root) and files: has_bins = 1 diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass index 0b42e3ed75..67986787d7 100644 --- a/meta/classes/gconf.bbclass +++ b/meta/classes/gconf.bbclass @@ -29,10 +29,9 @@ python populate_packages_append () { import re packages = bb.data.getVar('PACKAGES', d, 1).split() pkgdest = bb.data.getVar('PKGDEST', d, 1) - workdir = bb.data.getVar('WORKDIR', d, 1) for pkg in packages: - schema_dir = '%s/%s/%s/etc/gconf/schemas' % (workdir, pkgdest, pkg) + schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg) schemas = [] schema_re = re.compile(".*\.schemas$") if os.path.exists(schema_dir): diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index d1aeee5f89..524c2f0c46 100644 --- a/meta/classes/gtk-icon-cache.bbclass +++ b/meta/classes/gtk-icon-cache.bbclass @@ -29,10 +29,9 @@ done python populate_packages_append () { packages = bb.data.getVar('PACKAGES', d, 1).split() pkgdest = bb.data.getVar('PKGDEST', d, 1) - workdir = bb.data.getVar('WORKDIR', d, 1) for pkg in packages: - icon_dir = '%s/%s/%s/%s/icons' % (workdir, pkgdest, pkg, bb.data.getVar('datadir', d, 1)) + icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, bb.data.getVar('datadir', d, 1)) if not os.path.exists(icon_dir): continue diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 74ec7d56b1..74f1b7527f 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -288,7 +288,7 @@ python populate_packages_prepend () { def parse_depmod(): import re - dvar = bb.data.getVar('D', d, 1) + dvar = bb.data.getVar('PKGD', d, 1) if not dvar: bb.error("D not defined") return @@ -337,7 +337,7 @@ python populate_packages_prepend () { return deps def get_dependencies(file, pattern, format): - file = file.replace(bb.data.getVar('D', d, 1) or '', '', 1) + file = file.replace(bb.data.getVar('PKGD', d, 1) or '', '', 1) if module_deps.has_key(file): import re @@ -356,7 +356,7 @@ python populate_packages_prepend () { import re vals = extract_modinfo(file) - dvar = bb.data.getVar('D', d, 1) + dvar = bb.data.getVar('PKGD', d, 1) # If autoloading is requested, output /etc/modutils/<name> and append # appropriate modprobe commands to the postinst |