sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

debian/kernel/gconf/gtk-icon-cache: PKGDESK/PKG fixes 

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2009-11-16 10:52:35 +00:00
parent 01f75c1b48
commit 5f22458409
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/classes/debian.bbclass
View File

@ -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

3
meta/classes/gconf.bbclass
View File

@ -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):

3
meta/classes/gtk-icon-cache.bbclass
View File

@ -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

6
meta/classes/kernel.bbclass
View File

@ -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