summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-05-24 12:36:44 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-29 21:07:16 +0100
commitce12d183bb0a3366d37855e18452ac6ee6215be3 (patch)
tree15b71f3ec0d0b836fd5298e0023a80ded4c7c3ee /meta
parent67e74b25d822c1d73045415f7dbbcb8ebe135d65 (diff)
downloadpoky-ce12d183bb0a3366d37855e18452ac6ee6215be3.tar.gz
package_manager.py: get rid of ROOTFS_RPM_DEBUG in RpmPM()
This was undocumented, and it's better to just always enable full debug output, as this allows immediate generation of logs with full diagnostics when things go not as expected. Also, change the output of dnf from note to debug level; this does not affect what is written to log file, but does reduce the verbosity of bitbake -v. (From OE-Core rev: 9128fd1396729a71b4832a597cf070c2be922d63) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/package_manager.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 1cba5ee968..5ac729455e 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -888,7 +888,7 @@ class RpmPM(PackageManager):
888 os.environ['RPM_ETCCONFIGDIR'] = self.target_rootfs 888 os.environ['RPM_ETCCONFIGDIR'] = self.target_rootfs
889 889
890 dnf_cmd = bb.utils.which(os.getenv('PATH'), "dnf") 890 dnf_cmd = bb.utils.which(os.getenv('PATH'), "dnf")
891 standard_dnf_args = (["-v", "--rpmverbosity=debug"] if self.d.getVar('ROOTFS_RPM_DEBUG') else []) + ["-y", 891 standard_dnf_args = ["-v", "--rpmverbosity=debug", "-y",
892 "-c", oe.path.join(self.target_rootfs, "etc/dnf/dnf.conf"), 892 "-c", oe.path.join(self.target_rootfs, "etc/dnf/dnf.conf"),
893 "--setopt=reposdir=%s" %(oe.path.join(self.target_rootfs, "etc/yum.repos.d")), 893 "--setopt=reposdir=%s" %(oe.path.join(self.target_rootfs, "etc/yum.repos.d")),
894 "--repofrompath=oe-repo,%s" % (self.rpm_repo_dir), 894 "--repofrompath=oe-repo,%s" % (self.rpm_repo_dir),
@@ -900,7 +900,7 @@ class RpmPM(PackageManager):
900 try: 900 try:
901 output = subprocess.check_output(cmd,stderr=subprocess.STDOUT).decode("utf-8") 901 output = subprocess.check_output(cmd,stderr=subprocess.STDOUT).decode("utf-8")
902 if print_output: 902 if print_output:
903 bb.note(output) 903 bb.debug(1, output)
904 return output 904 return output
905 except subprocess.CalledProcessError as e: 905 except subprocess.CalledProcessError as e:
906 if print_output: 906 if print_output: