summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-16 10:52:35 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-16 10:52:35 +0000
commit5f22458409d2e1672f5a71f0f7f51ea471a71355 (patch)
treee63dbc5b2189a9d6dbfdc0545cdddf092301aaea /meta/classes
parent01f75c1b48e1a087263427488245c0c79a2f87e3 (diff)
downloadpoky-5f22458409d2e1672f5a71f0f7f51ea471a71355.tar.gz
debian/kernel/gconf/gtk-icon-cache: PKGDESK/PKG fixes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/debian.bbclass4
-rw-r--r--meta/classes/gconf.bbclass3
-rw-r--r--meta/classes/gtk-icon-cache.bbclass3
-rw-r--r--meta/classes/kernel.bbclass6
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"
16python debian_package_name_hook () { 16python debian_package_name_hook () {
17 import glob, copy, stat, errno, re 17 import glob, copy, stat, errno, re
18 18
19 workdir = bb.data.getVar('WORKDIR', d, 1) 19 pkgdest = bb.data.getVar('PKGDEST', d, 1)
20 packages = bb.data.getVar('PACKAGES', d, 1) 20 packages = bb.data.getVar('PACKAGES', d, 1)
21 21
22 def socrunch(s): 22 def socrunch(s):
@@ -45,7 +45,7 @@ python debian_package_name_hook () {
45 sonames = [] 45 sonames = []
46 has_bins = 0 46 has_bins = 0
47 has_libs = 0 47 has_libs = 0
48 pkg_dir = os.path.join(workdir, "install", orig_pkg) 48 pkg_dir = os.path.join(pkgdest, orig_pkg)
49 for root, dirs, files in os.walk(pkg_dir): 49 for root, dirs, files in os.walk(pkg_dir):
50 if bin_re.match(root) and files: 50 if bin_re.match(root) and files:
51 has_bins = 1 51 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 () {
29 import re 29 import re
30 packages = bb.data.getVar('PACKAGES', d, 1).split() 30 packages = bb.data.getVar('PACKAGES', d, 1).split()
31 pkgdest = bb.data.getVar('PKGDEST', d, 1) 31 pkgdest = bb.data.getVar('PKGDEST', d, 1)
32 workdir = bb.data.getVar('WORKDIR', d, 1)
33 32
34 for pkg in packages: 33 for pkg in packages:
35 schema_dir = '%s/%s/%s/etc/gconf/schemas' % (workdir, pkgdest, pkg) 34 schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg)
36 schemas = [] 35 schemas = []
37 schema_re = re.compile(".*\.schemas$") 36 schema_re = re.compile(".*\.schemas$")
38 if os.path.exists(schema_dir): 37 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
29python populate_packages_append () { 29python populate_packages_append () {
30 packages = bb.data.getVar('PACKAGES', d, 1).split() 30 packages = bb.data.getVar('PACKAGES', d, 1).split()
31 pkgdest = bb.data.getVar('PKGDEST', d, 1) 31 pkgdest = bb.data.getVar('PKGDEST', d, 1)
32 workdir = bb.data.getVar('WORKDIR', d, 1)
33 32
34 for pkg in packages: 33 for pkg in packages:
35 icon_dir = '%s/%s/%s/%s/icons' % (workdir, pkgdest, pkg, bb.data.getVar('datadir', d, 1)) 34 icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, bb.data.getVar('datadir', d, 1))
36 if not os.path.exists(icon_dir): 35 if not os.path.exists(icon_dir):
37 continue 36 continue
38 37
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 () {
288 def parse_depmod(): 288 def parse_depmod():
289 import re 289 import re
290 290
291 dvar = bb.data.getVar('D', d, 1) 291 dvar = bb.data.getVar('PKGD', d, 1)
292 if not dvar: 292 if not dvar:
293 bb.error("D not defined") 293 bb.error("D not defined")
294 return 294 return
@@ -337,7 +337,7 @@ python populate_packages_prepend () {
337 return deps 337 return deps
338 338
339 def get_dependencies(file, pattern, format): 339 def get_dependencies(file, pattern, format):
340 file = file.replace(bb.data.getVar('D', d, 1) or '', '', 1) 340 file = file.replace(bb.data.getVar('PKGD', d, 1) or '', '', 1)
341 341
342 if module_deps.has_key(file): 342 if module_deps.has_key(file):
343 import re 343 import re
@@ -356,7 +356,7 @@ python populate_packages_prepend () {
356 import re 356 import re
357 vals = extract_modinfo(file) 357 vals = extract_modinfo(file)
358 358
359 dvar = bb.data.getVar('D', d, 1) 359 dvar = bb.data.getVar('PKGD', d, 1)
360 360
361 # If autoloading is requested, output /etc/modutils/<name> and append 361 # If autoloading is requested, output /etc/modutils/<name> and append
362 # appropriate modprobe commands to the postinst 362 # appropriate modprobe commands to the postinst