summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/package.bbclass14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 8a4731be3c..679055ff1b 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -253,7 +253,7 @@ def splitdebuginfo(file, debugfile, debugsrcdir, d):
253 if debugsrcdir: 253 if debugsrcdir:
254 subprocess.call("'%s' -b '%s' -d '%s' -i -l '%s' '%s'" % (debugedit, workparentdir, debugsrcdir, sourcefile, file), shell=True) 254 subprocess.call("'%s' -b '%s' -d '%s' -i -l '%s' '%s'" % (debugedit, workparentdir, debugsrcdir, sourcefile, file), shell=True)
255 255
256 bb.mkdirhier(os.path.dirname(debugfile)) 256 bb.utils.mkdirhier(os.path.dirname(debugfile))
257 257
258 subprocess.call("'%s' --only-keep-debug '%s' '%s'" % (objcopy, file, debugfile), shell=True) 258 subprocess.call("'%s' --only-keep-debug '%s' '%s'" % (objcopy, file, debugfile), shell=True)
259 259
@@ -287,7 +287,7 @@ def copydebugsources(debugsrcdir, d):
287 basepath = basepath + "/" + p 287 basepath = basepath + "/" + p
288 if not os.path.exists(basepath): 288 if not os.path.exists(basepath):
289 nosuchdir.append(basepath) 289 nosuchdir.append(basepath)
290 bb.mkdirhier(basepath) 290 bb.utils.mkdirhier(basepath)
291 291
292 processdebugsrc = "LC_ALL=C ; sort -z -u '%s' | egrep -v -z '(<internal>|<built-in>)$' | " 292 processdebugsrc = "LC_ALL=C ; sort -z -u '%s' | egrep -v -z '(<internal>|<built-in>)$' | "
293 # We need to ignore files that are not actually ours 293 # We need to ignore files that are not actually ours
@@ -644,7 +644,7 @@ python fixup_perms () {
644 continue 644 continue
645 645
646 # Create path to move directory to, move it, and then setup the symlink 646 # Create path to move directory to, move it, and then setup the symlink
647 bb.mkdirhier(os.path.dirname(target)) 647 bb.utils.mkdirhier(os.path.dirname(target))
648 #bb.note("Fixup Perms: Rename %s -> %s" % (dir, ptarget)) 648 #bb.note("Fixup Perms: Rename %s -> %s" % (dir, ptarget))
649 os.rename(origin, target) 649 os.rename(origin, target)
650 #bb.note("Fixup Perms: Link %s -> %s" % (dir, link)) 650 #bb.note("Fixup Perms: Link %s -> %s" % (dir, link))
@@ -891,7 +891,7 @@ python populate_packages () {
891 packages = d.getVar('PACKAGES', True) 891 packages = d.getVar('PACKAGES', True)
892 pn = d.getVar('PN', True) 892 pn = d.getVar('PN', True)
893 893
894 bb.mkdirhier(outdir) 894 bb.utils.mkdirhier(outdir)
895 os.chdir(dvar) 895 os.chdir(dvar)
896 896
897 # Sanity check PACKAGES for duplicates and for LICENSE_EXCLUSION 897 # Sanity check PACKAGES for duplicates and for LICENSE_EXCLUSION
@@ -914,7 +914,7 @@ python populate_packages () {
914 914
915 for pkg in package_list: 915 for pkg in package_list:
916 root = os.path.join(pkgdest, pkg) 916 root = os.path.join(pkgdest, pkg)
917 bb.mkdirhier(root) 917 bb.utils.mkdirhier(root)
918 918
919 filesvar = d.getVar('FILES_%s' % pkg, True) or d.getVar('FILES', True) or "" 919 filesvar = d.getVar('FILES_%s' % pkg, True) or d.getVar('FILES', True) or ""
920 if "//" in filesvar: 920 if "//" in filesvar:
@@ -945,7 +945,7 @@ python populate_packages () {
945 def mkdir(src, dest, p): 945 def mkdir(src, dest, p):
946 src = os.path.join(src, p) 946 src = os.path.join(src, p)
947 dest = os.path.join(dest, p) 947 dest = os.path.join(dest, p)
948 bb.mkdirhier(dest) 948 bb.utils.mkdirhier(dest)
949 fstat = os.stat(src) 949 fstat = os.stat(src)
950 os.chmod(dest, fstat.st_mode) 950 os.chmod(dest, fstat.st_mode)
951 os.chown(dest, fstat.st_uid, fstat.st_gid) 951 os.chown(dest, fstat.st_uid, fstat.st_gid)
@@ -975,7 +975,7 @@ python populate_packages () {
975 os.chmod(fpath, fstat.st_mode) 975 os.chmod(fpath, fstat.st_mode)
976 os.chown(fpath, fstat.st_uid, fstat.st_gid) 976 os.chown(fpath, fstat.st_uid, fstat.st_gid)
977 continue 977 continue
978 ret = bb.copyfile(file, fpath) 978 ret = bb.utils.copyfile(file, fpath)
979 if ret is False or ret == 0: 979 if ret is False or ret == 0:
980 raise bb.build.FuncFailed("File population failed") 980 raise bb.build.FuncFailed("File population failed")
981 981