debian/kernel/gconf/gtk-icon-cache: PKGDESK/PKG fixes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
01f75c1b48
commit
5f22458409
|
@ -16,7 +16,7 @@ do_package_write_rpm[rdeptask] = "do_package"
|
||||||
python debian_package_name_hook () {
|
python debian_package_name_hook () {
|
||||||
import glob, copy, stat, errno, re
|
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)
|
packages = bb.data.getVar('PACKAGES', d, 1)
|
||||||
|
|
||||||
def socrunch(s):
|
def socrunch(s):
|
||||||
|
@ -45,7 +45,7 @@ python debian_package_name_hook () {
|
||||||
sonames = []
|
sonames = []
|
||||||
has_bins = 0
|
has_bins = 0
|
||||||
has_libs = 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):
|
for root, dirs, files in os.walk(pkg_dir):
|
||||||
if bin_re.match(root) and files:
|
if bin_re.match(root) and files:
|
||||||
has_bins = 1
|
has_bins = 1
|
||||||
|
|
|
@ -29,10 +29,9 @@ python populate_packages_append () {
|
||||||
import re
|
import re
|
||||||
packages = bb.data.getVar('PACKAGES', d, 1).split()
|
packages = bb.data.getVar('PACKAGES', d, 1).split()
|
||||||
pkgdest = bb.data.getVar('PKGDEST', d, 1)
|
pkgdest = bb.data.getVar('PKGDEST', d, 1)
|
||||||
workdir = bb.data.getVar('WORKDIR', d, 1)
|
|
||||||
|
|
||||||
for pkg in packages:
|
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 = []
|
schemas = []
|
||||||
schema_re = re.compile(".*\.schemas$")
|
schema_re = re.compile(".*\.schemas$")
|
||||||
if os.path.exists(schema_dir):
|
if os.path.exists(schema_dir):
|
||||||
|
|
|
@ -29,10 +29,9 @@ done
|
||||||
python populate_packages_append () {
|
python populate_packages_append () {
|
||||||
packages = bb.data.getVar('PACKAGES', d, 1).split()
|
packages = bb.data.getVar('PACKAGES', d, 1).split()
|
||||||
pkgdest = bb.data.getVar('PKGDEST', d, 1)
|
pkgdest = bb.data.getVar('PKGDEST', d, 1)
|
||||||
workdir = bb.data.getVar('WORKDIR', d, 1)
|
|
||||||
|
|
||||||
for pkg in packages:
|
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):
|
if not os.path.exists(icon_dir):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
|
|
@ -288,7 +288,7 @@ python populate_packages_prepend () {
|
||||||
def parse_depmod():
|
def parse_depmod():
|
||||||
import re
|
import re
|
||||||
|
|
||||||
dvar = bb.data.getVar('D', d, 1)
|
dvar = bb.data.getVar('PKGD', d, 1)
|
||||||
if not dvar:
|
if not dvar:
|
||||||
bb.error("D not defined")
|
bb.error("D not defined")
|
||||||
return
|
return
|
||||||
|
@ -337,7 +337,7 @@ python populate_packages_prepend () {
|
||||||
return deps
|
return deps
|
||||||
|
|
||||||
def get_dependencies(file, pattern, format):
|
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):
|
if module_deps.has_key(file):
|
||||||
import re
|
import re
|
||||||
|
@ -356,7 +356,7 @@ python populate_packages_prepend () {
|
||||||
import re
|
import re
|
||||||
vals = extract_modinfo(file)
|
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
|
# If autoloading is requested, output /etc/modutils/<name> and append
|
||||||
# appropriate modprobe commands to the postinst
|
# appropriate modprobe commands to the postinst
|
||||||
|
|
Loading…
Reference in New Issue