summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/kernel-yocto.bbclass4
-rw-r--r--meta/classes/package.bbclass4
-rw-r--r--meta/classes/sanity.bbclass5
-rw-r--r--meta/lib/oe/patch.py4
-rw-r--r--meta/lib/oe/utils.py10
-rw-r--r--meta/recipes-core/psplash/psplash_git.bb4
6 files changed, 20 insertions, 11 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index c81e70e678..d513ad2b63 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -254,7 +254,7 @@ do_kernel_configme() {
254} 254}
255 255
256python do_kernel_configcheck() { 256python do_kernel_configcheck() {
257 import re, string, sys, subprocess 257 import re, string, sys
258 258
259 bb.plain("NOTE: validating kernel config, see log.do_kernel_configcheck for details") 259 bb.plain("NOTE: validating kernel config, see log.do_kernel_configcheck for details")
260 260
@@ -265,7 +265,7 @@ python do_kernel_configcheck() {
265 265
266 pathprefix = "export PATH=%s:%s; " % (d.getVar('PATH', True), "${S}/scripts/util/") 266 pathprefix = "export PATH=%s:%s; " % (d.getVar('PATH', True), "${S}/scripts/util/")
267 cmd = d.expand("cd ${S}; kconf_check -config- %s/meta-series ${S} ${B}" % kmeta) 267 cmd = d.expand("cd ${S}; kconf_check -config- %s/meta-series ${S} ${B}" % kmeta)
268 ret, result = subprocess.getstatusoutput("%s%s" % (pathprefix, cmd)) 268 ret, result = oe.utils.getstatusoutput("%s%s" % (pathprefix, cmd))
269 269
270 config_check_visibility = d.getVar( "KCONF_AUDIT_LEVEL", True ) or 1 270 config_check_visibility = d.getVar( "KCONF_AUDIT_LEVEL", True ) or 1
271 if config_check_visibility == 1: 271 if config_check_visibility == 1:
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 1dba185b3e..7d0684c95c 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -696,7 +696,7 @@ python fixup_perms () {
696} 696}
697 697
698python split_and_strip_files () { 698python split_and_strip_files () {
699 import stat, errno, subprocess 699 import stat, errno
700 700
701 dvar = d.getVar('PKGD', True) 701 dvar = d.getVar('PKGD', True)
702 pn = d.getVar('PN', True) 702 pn = d.getVar('PN', True)
@@ -732,7 +732,7 @@ python split_and_strip_files () {
732 # 16 - kernel module 732 # 16 - kernel module
733 def isELF(path): 733 def isELF(path):
734 type = 0 734 type = 0
735 ret, result = subprocess.getstatusoutput("file '%s'" % path) 735 ret, result = oe.utils.getstatusoutput("file '%s'" % path)
736 736
737 if ret: 737 if ret:
738 bb.error("split_and_strip_files: 'file %s' failed" % path) 738 bb.error("split_and_strip_files: 'file %s' failed" % path)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 3836c0404d..1fb4a6c629 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -342,13 +342,12 @@ def check_gcc_march(sanity_data):
342 f = open("gcc_test.c", "w") 342 f = open("gcc_test.c", "w")
343 f.write("int main (){ __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4; return 0;}\n") 343 f.write("int main (){ __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4; return 0;}\n")
344 f.close() 344 f.close()
345 import subprocess
346 345
347 # Check if GCC could work without march 346 # Check if GCC could work without march
348 status,result = subprocess.getstatusoutput("${BUILD_PREFIX}gcc gcc_test.c -o gcc_test") 347 status,result = oe.utils.getstatusoutput("${BUILD_PREFIX}gcc gcc_test.c -o gcc_test")
349 if status != 0: 348 if status != 0:
350 # Check if GCC could work with march 349 # Check if GCC could work with march
351 status,result = subprocess.getstatusoutput("${BUILD_PREFIX}gcc -march=native gcc_test.c -o gcc_test") 350 status,result = oe.utils.getstatusoutput("${BUILD_PREFIX}gcc -march=native gcc_test.c -o gcc_test")
352 if status == 0: 351 if status == 0:
353 result = True 352 result = True
354 else: 353 else:
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 8de73a7037..244f6c5cf2 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -17,7 +17,7 @@ class CmdError(bb.BBHandledException):
17 17
18 18
19def runcmd(args, dir = None): 19def runcmd(args, dir = None):
20 import subprocess, pipes 20 import pipes
21 21
22 if dir: 22 if dir:
23 olddir = os.path.abspath(os.curdir) 23 olddir = os.path.abspath(os.curdir)
@@ -30,7 +30,7 @@ def runcmd(args, dir = None):
30 args = [ pipes.quote(str(arg)) for arg in args ] 30 args = [ pipes.quote(str(arg)) for arg in args ]
31 cmd = " ".join(args) 31 cmd = " ".join(args)
32 # print("cmd: %s" % cmd) 32 # print("cmd: %s" % cmd)
33 (exitstatus, output) = subprocess.getstatusoutput(cmd) 33 (exitstatus, output) = oe.utils.getstatusoutput(cmd)
34 if exitstatus != 0: 34 if exitstatus != 0:
35 raise CmdError(exitstatus >> 8, output) 35 raise CmdError(exitstatus >> 8, output)
36 return output 36 return output
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index ed9409613a..ec8260d9bd 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -1,3 +1,10 @@
1try:
2 # Python 2
3 import commands as cmdstatus
4except ImportError:
5 # Python 3
6 import subprocess as cmdstatus
7
1def read_file(filename): 8def read_file(filename):
2 try: 9 try:
3 f = file( filename, "r" ) 10 f = file( filename, "r" )
@@ -123,3 +130,6 @@ def packages_filter_out_system(d):
123 if pkg not in blacklist and localepkg not in pkg: 130 if pkg not in blacklist and localepkg not in pkg:
124 pkgs.append(pkg) 131 pkgs.append(pkg)
125 return pkgs 132 return pkgs
133
134def getstatusoutput(cmd):
135 return cmdstatus.getstatusoutput(cmd)
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb
index 392fada689..fdb5e77896 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -71,7 +71,7 @@ ALTERNATIVE_PRIORITY = "100"
71ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash" 71ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash"
72 72
73python do_compile () { 73python do_compile () {
74 import shutil, subprocess 74 import shutil
75 75
76 # Build a separate executable for each splash image 76 # Build a separate executable for each splash image
77 convertscript = "%s/make-image-header.sh" % d.getVar('S', True) 77 convertscript = "%s/make-image-header.sh" % d.getVar('S', True)
@@ -80,7 +80,7 @@ python do_compile () {
80 outputfiles = d.getVar('SPLASH_INSTALL', True).split() 80 outputfiles = d.getVar('SPLASH_INSTALL', True).split()
81 for localfile, outputfile in zip(localfiles, outputfiles): 81 for localfile, outputfile in zip(localfiles, outputfiles):
82 if localfile.endswith(".png"): 82 if localfile.endswith(".png"):
83 outp = subprocess.getstatusoutput('%s %s POKY' % (convertscript, localfile)) 83 outp = oe.utils.getstatusoutput('%s %s POKY' % (convertscript, localfile))
84 print(outp[1]) 84 print(outp[1])
85 fbase = os.path.splitext(os.path.basename(localfile))[0] 85 fbase = os.path.splitext(os.path.basename(localfile))[0]
86 shutil.copyfile("%s-img.h" % fbase, destfile) 86 shutil.copyfile("%s-img.h" % fbase, destfile)