mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 05:29:32 +00:00
package/package_manager: multiprocess_exec -> multiprocess_launch
After this replacement, the parent exception handling works so we don't need subprocess wrapping with bb.error in the underlying functions. The underlying contexts also have better module handling so the imports can be cleaned up. (From OE-Core rev: aa8260adf53139d776a2affe6118d28b295c1fab) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -1105,7 +1105,7 @@ python split_and_strip_files () {
|
||||
for f in kernmods:
|
||||
sfiles.append((f, 16, strip))
|
||||
|
||||
oe.utils.multiprocess_exec(sfiles, oe.package.runstrip)
|
||||
oe.utils.multiprocess_launch(oe.package.runstrip, sfiles, d)
|
||||
|
||||
#
|
||||
# End of strip
|
||||
@@ -1541,7 +1541,7 @@ python package_do_filedeps() {
|
||||
for files in chunks(pkgfiles[pkg], 100):
|
||||
pkglist.append((pkg, files, rpmdeps, pkgdest))
|
||||
|
||||
processed = oe.utils.multiprocess_exec( pkglist, oe.package.filedeprunner)
|
||||
processed = oe.utils.multiprocess_launch(oe.package.filedeprunner, pkglist, d)
|
||||
|
||||
provides_files = {}
|
||||
requires_files = {}
|
||||
|
||||
+3
-10
@@ -1,3 +1,4 @@
|
||||
import stat
|
||||
import mmap
|
||||
import subprocess
|
||||
|
||||
@@ -11,8 +12,6 @@ def runstrip(arg):
|
||||
# 8 - shared library
|
||||
# 16 - kernel module
|
||||
|
||||
import stat, subprocess
|
||||
|
||||
(file, elftype, strip) = arg
|
||||
|
||||
newmode = None
|
||||
@@ -37,16 +36,11 @@ def runstrip(arg):
|
||||
stripcmd.append(file)
|
||||
bb.debug(1, "runstrip: %s" % stripcmd)
|
||||
|
||||
try:
|
||||
output = subprocess.check_output(stripcmd, stderr=subprocess.STDOUT)
|
||||
except subprocess.CalledProcessError as e:
|
||||
bb.error("runstrip: '%s' strip command failed with %s (%s)" % (stripcmd, e.returncode, e.output))
|
||||
output = subprocess.check_output(stripcmd, stderr=subprocess.STDOUT)
|
||||
|
||||
if newmode:
|
||||
os.chmod(file, origmode)
|
||||
|
||||
return
|
||||
|
||||
# Detect .ko module by searching for "vermagic=" string
|
||||
def is_kernel_module(path):
|
||||
with open(path) as f:
|
||||
@@ -164,8 +158,7 @@ def strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, d, qa_already_stripp
|
||||
elf_file = int(elffiles[file])
|
||||
sfiles.append((file, elf_file, strip_cmd))
|
||||
|
||||
oe.utils.multiprocess_exec(sfiles, runstrip)
|
||||
|
||||
oe.utils.multiprocess_launch(runstrip, sfiles, d)
|
||||
|
||||
|
||||
def file_translate(file):
|
||||
|
||||
@@ -3,7 +3,6 @@ import os
|
||||
import glob
|
||||
import subprocess
|
||||
import shutil
|
||||
import multiprocessing
|
||||
import re
|
||||
import collections
|
||||
import bb
|
||||
@@ -177,7 +176,7 @@ class OpkgIndexer(Indexer):
|
||||
bb.note("There are no packages in %s!" % self.deploy_dir)
|
||||
return
|
||||
|
||||
oe.utils.multiprocess_exec(index_cmds, create_index)
|
||||
oe.utils.multiprocess_launch(create_index, index_cmds, self.d)
|
||||
|
||||
if signer:
|
||||
feed_sig_type = self.d.getVar('PACKAGE_FEED_GPG_SIGNATURE_TYPE')
|
||||
@@ -258,7 +257,7 @@ class DpkgIndexer(Indexer):
|
||||
bb.note("There are no packages in %s" % self.deploy_dir)
|
||||
return
|
||||
|
||||
oe.utils.multiprocess_exec(index_cmds, create_index)
|
||||
oe.utils.multiprocess_launch(create_index, index_cmds, self.d)
|
||||
if self.d.getVar('PACKAGE_FEED_SIGN') == '1':
|
||||
raise NotImplementedError('Package feed signing not implementd for dpkg')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user