diff options
author | Ross Burton <ross.burton@intel.com> | 2016-05-20 15:14:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-22 16:11:13 +0100 |
commit | 13df45b74e6f083856d27847398e7cfeffa59d32 (patch) | |
tree | 33e8f0a81e525c1cd910450b54106ed1ec443ad9 | |
parent | 456b222e0cbba0beff9c24b9519ba116fdf271d0 (diff) | |
download | poky-13df45b74e6f083856d27847398e7cfeffa59d32.tar.gz |
package_manager: no need to output Note: in bb.note() calls
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oe/package_manager.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 1eedeb8526..2d7da961cd 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -734,7 +734,7 @@ class RpmPM(PackageManager): | |||
734 | for uri in feed_uris: | 734 | for uri in feed_uris: |
735 | if arch_list: | 735 | if arch_list: |
736 | for arch in arch_list: | 736 | for arch in arch_list: |
737 | bb.note('Note: adding Smart channel url%d%s (%s)' % | 737 | bb.note('Adding Smart channel url%d%s (%s)' % |
738 | (uri_iterator, arch, channel_priority)) | 738 | (uri_iterator, arch, channel_priority)) |
739 | self._invoke_smart('channel --add url%d-%s type=rpm-md baseurl=%s/%s -y' | 739 | self._invoke_smart('channel --add url%d-%s type=rpm-md baseurl=%s/%s -y' |
740 | % (uri_iterator, arch, uri, arch)) | 740 | % (uri_iterator, arch, uri, arch)) |
@@ -742,7 +742,7 @@ class RpmPM(PackageManager): | |||
742 | (uri_iterator, arch, channel_priority)) | 742 | (uri_iterator, arch, channel_priority)) |
743 | channel_priority -= 5 | 743 | channel_priority -= 5 |
744 | else: | 744 | else: |
745 | bb.note('Note: adding Smart channel url%d (%s)' % | 745 | bb.note('Adding Smart channel url%d (%s)' % |
746 | (uri_iterator, channel_priority)) | 746 | (uri_iterator, channel_priority)) |
747 | self._invoke_smart('channel --add url%d type=rpm-md baseurl=%s -y' | 747 | self._invoke_smart('channel --add url%d type=rpm-md baseurl=%s -y' |
748 | % (uri_iterator, uri)) | 748 | % (uri_iterator, uri)) |
@@ -1018,7 +1018,7 @@ class RpmPM(PackageManager): | |||
1018 | arch = canonical_arch.split('-')[0] | 1018 | arch = canonical_arch.split('-')[0] |
1019 | arch_channel = os.path.join(self.deploy_dir, arch) | 1019 | arch_channel = os.path.join(self.deploy_dir, arch) |
1020 | if os.path.exists(arch_channel) and not arch in ch_already_added: | 1020 | if os.path.exists(arch_channel) and not arch in ch_already_added: |
1021 | bb.note('Note: adding Smart channel %s (%s)' % | 1021 | bb.note('Adding Smart channel %s (%s)' % |
1022 | (arch, channel_priority)) | 1022 | (arch, channel_priority)) |
1023 | self._invoke_smart('channel --add %s type=rpm-md baseurl=%s -y' | 1023 | self._invoke_smart('channel --add %s type=rpm-md baseurl=%s -y' |
1024 | % (arch, arch_channel)) | 1024 | % (arch, arch_channel)) |
@@ -1090,7 +1090,7 @@ class RpmPM(PackageManager): | |||
1090 | native_root) | 1090 | native_root) |
1091 | open(self.scriptlet_wrapper, 'w+').write(scriptlet_content) | 1091 | open(self.scriptlet_wrapper, 'w+').write(scriptlet_content) |
1092 | 1092 | ||
1093 | bb.note("Note: configuring RPM cross-install scriptlet_wrapper") | 1093 | bb.note("Configuring RPM cross-install scriptlet_wrapper") |
1094 | os.chmod(self.scriptlet_wrapper, 0755) | 1094 | os.chmod(self.scriptlet_wrapper, 0755) |
1095 | cmd = 'config --set rpm-extra-macros._cross_scriptlet_wrapper=%s' % \ | 1095 | cmd = 'config --set rpm-extra-macros._cross_scriptlet_wrapper=%s' % \ |
1096 | self.scriptlet_wrapper | 1096 | self.scriptlet_wrapper |
@@ -1710,12 +1710,12 @@ class OpkgPM(OpkgDpkgPM): | |||
1710 | for arch in archs: | 1710 | for arch in archs: |
1711 | if (self.feed_archs is None) and (not os.path.exists(os.path.join(self.deploy_dir, arch))): | 1711 | if (self.feed_archs is None) and (not os.path.exists(os.path.join(self.deploy_dir, arch))): |
1712 | continue | 1712 | continue |
1713 | bb.note('Note: adding opkg feed url-%s-%d (%s)' % | 1713 | bb.note('Adding opkg feed url-%s-%d (%s)' % |
1714 | (arch, uri_iterator, uri)) | 1714 | (arch, uri_iterator, uri)) |
1715 | config_file.write("src/gz uri-%s-%d %s/%s\n" % | 1715 | config_file.write("src/gz uri-%s-%d %s/%s\n" % |
1716 | (arch, uri_iterator, uri, arch)) | 1716 | (arch, uri_iterator, uri, arch)) |
1717 | else: | 1717 | else: |
1718 | bb.note('Note: adding opkg feed url-%d (%s)' % | 1718 | bb.note('Adding opkg feed url-%d (%s)' % |
1719 | (uri_iterator, uri)) | 1719 | (uri_iterator, uri)) |
1720 | config_file.write("src/gz uri-%d %s\n" % | 1720 | config_file.write("src/gz uri-%d %s\n" % |
1721 | (uri_iterator, uri)) | 1721 | (uri_iterator, uri)) |
@@ -2110,11 +2110,11 @@ class DpkgPM(OpkgDpkgPM): | |||
2110 | for uri in feed_uris: | 2110 | for uri in feed_uris: |
2111 | if arch_list: | 2111 | if arch_list: |
2112 | for arch in arch_list: | 2112 | for arch in arch_list: |
2113 | bb.note('Note: adding dpkg channel at (%s)' % uri) | 2113 | bb.note('Adding dpkg channel at (%s)' % uri) |
2114 | sources_file.write("deb %s/%s ./\n" % | 2114 | sources_file.write("deb %s/%s ./\n" % |
2115 | (uri, arch)) | 2115 | (uri, arch)) |
2116 | else: | 2116 | else: |
2117 | bb.note('Note: adding dpkg channel at (%s)' % uri) | 2117 | bb.note('Adding dpkg channel at (%s)' % uri) |
2118 | sources_file.write("deb %s ./\n" % uri) | 2118 | sources_file.write("deb %s ./\n" % uri) |
2119 | 2119 | ||
2120 | def _create_configs(self, archs, base_archs): | 2120 | def _create_configs(self, archs, base_archs): |