diff options
| author | Tim Orling <timothy.t.orling@linux.intel.com> | 2017-11-23 21:14:42 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-13 14:00:51 +0000 |
| commit | 69a910d2e7e440760d02e22f8fce90ee87e15d1d (patch) | |
| tree | 2c18be59bb07e9701be74d4f68231dbff459f7ae /scripts/contrib/python | |
| parent | 7d950b99bdb0f3c91eb060d31711243a7d3366fc (diff) | |
| download | poky-69a910d2e7e440760d02e22f8fce90ee87e15d1d.tar.gz | |
python-*-manifest/generators: fix long line lengths
The generators create python-*-manifest.inc files with
lines over 2500 characters long which breaks sending
patches via git send-email (because of smtp limitation).
This patchset formats all the long lines into multiple lines.
(From OE-Core rev: 3a1900a5691466a04b24907067f43117b318ca7e)
Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/contrib/python')
| -rwxr-xr-x | scripts/contrib/python/generate-manifest-2.7.py | 24 | ||||
| -rwxr-xr-x | scripts/contrib/python/generate-manifest-3.5.py | 24 |
2 files changed, 26 insertions, 22 deletions
diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py index 586b329c19..2491bd0bc4 100755 --- a/scripts/contrib/python/generate-manifest-2.7.py +++ b/scripts/contrib/python/generate-manifest-2.7.py | |||
| @@ -88,9 +88,9 @@ class MakefileMaker: | |||
| 88 | # generate provides line | 88 | # generate provides line |
| 89 | # | 89 | # |
| 90 | 90 | ||
| 91 | provideLine = 'PROVIDES+="' | 91 | provideLine = 'PROVIDES+=" \\\n' |
| 92 | for name in sorted(self.packages): | 92 | for name in sorted(self.packages): |
| 93 | provideLine += "%s " % name | 93 | provideLine += " %s \\\n" % name |
| 94 | provideLine += '"' | 94 | provideLine += '"' |
| 95 | 95 | ||
| 96 | self.out( provideLine ) | 96 | self.out( provideLine ) |
| @@ -100,14 +100,15 @@ class MakefileMaker: | |||
| 100 | # generate package line | 100 | # generate package line |
| 101 | # | 101 | # |
| 102 | 102 | ||
| 103 | packageLine = 'PACKAGES="${PN}-dbg ' | 103 | packageLine = 'PACKAGES=" \\\n' |
| 104 | packageLine += ' ${PN}-dbg \\\n' | ||
| 104 | for name in sorted(self.packages): | 105 | for name in sorted(self.packages): |
| 105 | if name.startswith("${PN}-distutils"): | 106 | if name.startswith("${PN}-distutils"): |
| 106 | if name == "${PN}-distutils": | 107 | if name == "${PN}-distutils": |
| 107 | packageLine += "%s-staticdev %s " % (name, name) | 108 | packageLine += " %s-staticdev %s \\\n" % (name, name) |
| 108 | elif name != '${PN}-dbg': | 109 | elif name != '${PN}-dbg': |
| 109 | packageLine += "%s " % name | 110 | packageLine += " %s \\\n" % name |
| 110 | packageLine += '${PN}-modules"' | 111 | packageLine += ' ${PN}-modules\\\n"' |
| 111 | 112 | ||
| 112 | self.out( packageLine ) | 113 | self.out( packageLine ) |
| 113 | self.out( "" ) | 114 | self.out( "" ) |
| @@ -125,7 +126,7 @@ class MakefileMaker: | |||
| 125 | self.out( 'SUMMARY_%s="%s"' % ( name, desc ) ) | 126 | self.out( 'SUMMARY_%s="%s"' % ( name, desc ) ) |
| 126 | self.out( 'RDEPENDS_%s="%s"' % ( name, deps ) ) | 127 | self.out( 'RDEPENDS_%s="%s"' % ( name, deps ) ) |
| 127 | 128 | ||
| 128 | line = 'FILES_%s="' % name | 129 | line = 'FILES_%s=" \\\n' % name |
| 129 | 130 | ||
| 130 | # | 131 | # |
| 131 | # check which directories to make in the temporary directory | 132 | # check which directories to make in the temporary directory |
| @@ -140,20 +141,21 @@ class MakefileMaker: | |||
| 140 | # | 141 | # |
| 141 | 142 | ||
| 142 | for target in files: | 143 | for target in files: |
| 143 | line += "%s " % target | 144 | line += " %s \\\n" % target |
| 144 | 145 | ||
| 145 | line += '"' | 146 | line += '"' |
| 146 | self.out( line ) | 147 | self.out( line ) |
| 147 | self.out( "" ) | 148 | self.out( "" ) |
| 148 | 149 | ||
| 149 | self.out( 'SUMMARY_${PN}-modules="All Python modules"' ) | 150 | self.out( 'SUMMARY_${PN}-modules="All Python modules"' ) |
| 150 | line = 'RDEPENDS_${PN}-modules="' | 151 | line = 'RDEPENDS_${PN}-modules=" \\\n' |
| 151 | 152 | ||
| 152 | for name, data in sorted(self.packages.items()): | 153 | for name, data in sorted(self.packages.items()): |
| 153 | if name not in ['${PN}-dev', '${PN}-distutils-staticdev'] and name not in self.excluded_pkgs: | 154 | if name not in ['${PN}-dev', '${PN}-distutils-staticdev'] and name not in self.excluded_pkgs: |
| 154 | line += "%s " % name | 155 | line += " %s \\\n" % name |
| 155 | 156 | ||
| 156 | self.out( "%s \"" % line ) | 157 | line += '"' |
| 158 | self.out( line ) | ||
| 157 | self.out( 'ALLOW_EMPTY_${PN}-modules = "1"' ) | 159 | self.out( 'ALLOW_EMPTY_${PN}-modules = "1"' ) |
| 158 | 160 | ||
| 159 | def doEpilog( self ): | 161 | def doEpilog( self ): |
diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py index 6352f8f120..33779cffab 100755 --- a/scripts/contrib/python/generate-manifest-3.5.py +++ b/scripts/contrib/python/generate-manifest-3.5.py | |||
| @@ -101,9 +101,9 @@ class MakefileMaker: | |||
| 101 | # generate provides line | 101 | # generate provides line |
| 102 | # | 102 | # |
| 103 | 103 | ||
| 104 | provideLine = 'PROVIDES+="' | 104 | provideLine = 'PROVIDES+="\\\n' |
| 105 | for name in sorted(self.packages): | 105 | for name in sorted(self.packages): |
| 106 | provideLine += "%s " % name | 106 | provideLine += " %s \\\n" % name |
| 107 | provideLine += '"' | 107 | provideLine += '"' |
| 108 | 108 | ||
| 109 | self.out( provideLine ) | 109 | self.out( provideLine ) |
| @@ -113,14 +113,15 @@ class MakefileMaker: | |||
| 113 | # generate package line | 113 | # generate package line |
| 114 | # | 114 | # |
| 115 | 115 | ||
| 116 | packageLine = 'PACKAGES="${PN}-dbg ' | 116 | packageLine = 'PACKAGES="\\\n' |
| 117 | packageLine += ' ${PN}-dbg \\\n' | ||
| 117 | for name in sorted(self.packages): | 118 | for name in sorted(self.packages): |
| 118 | if name.startswith("${PN}-distutils"): | 119 | if name.startswith("${PN}-distutils"): |
| 119 | if name == "${PN}-distutils": | 120 | if name == "${PN}-distutils": |
| 120 | packageLine += "%s-staticdev %s " % (name, name) | 121 | packageLine += "%s \\\n %s-staticdev \\\n" % (name, name) |
| 121 | elif name != '${PN}-dbg': | 122 | elif name != '${PN}-dbg': |
| 122 | packageLine += "%s " % name | 123 | packageLine += " %s \\\n" % name |
| 123 | packageLine += '${PN}-modules"' | 124 | packageLine += ' ${PN}-modules \\\n"' |
| 124 | 125 | ||
| 125 | self.out( packageLine ) | 126 | self.out( packageLine ) |
| 126 | self.out( "" ) | 127 | self.out( "" ) |
| @@ -138,7 +139,7 @@ class MakefileMaker: | |||
| 138 | self.out( 'SUMMARY_%s="%s"' % ( name, desc ) ) | 139 | self.out( 'SUMMARY_%s="%s"' % ( name, desc ) ) |
| 139 | self.out( 'RDEPENDS_%s="%s"' % ( name, deps ) ) | 140 | self.out( 'RDEPENDS_%s="%s"' % ( name, deps ) ) |
| 140 | 141 | ||
| 141 | line = 'FILES_%s="' % name | 142 | line = 'FILES_%s="\\\n' % name |
| 142 | 143 | ||
| 143 | # | 144 | # |
| 144 | # check which directories to make in the temporary directory | 145 | # check which directories to make in the temporary directory |
| @@ -153,20 +154,21 @@ class MakefileMaker: | |||
| 153 | # | 154 | # |
| 154 | 155 | ||
| 155 | for target in files: | 156 | for target in files: |
| 156 | line += "%s " % target | 157 | line += " %s \\\n" % target |
| 157 | 158 | ||
| 158 | line += '"' | 159 | line += '"' |
| 159 | self.out( line ) | 160 | self.out( line ) |
| 160 | self.out( "" ) | 161 | self.out( "" ) |
| 161 | 162 | ||
| 162 | self.out( 'SUMMARY_${PN}-modules="All Python modules"' ) | 163 | self.out( 'SUMMARY_${PN}-modules="All Python modules"' ) |
| 163 | line = 'RDEPENDS_${PN}-modules="' | 164 | line = 'RDEPENDS_${PN}-modules=" \\\n' |
| 164 | 165 | ||
| 165 | for name, data in sorted(self.packages.items()): | 166 | for name, data in sorted(self.packages.items()): |
| 166 | if name not in ['${PN}-dev', '${PN}-distutils-staticdev'] and name not in self.excluded_pkgs: | 167 | if name not in ['${PN}-dev', '${PN}-distutils-staticdev'] and name not in self.excluded_pkgs: |
| 167 | line += "%s " % name | 168 | line += " %s \\\n" % name |
| 168 | 169 | ||
| 169 | self.out( "%s \"" % line ) | 170 | line += '"' |
| 171 | self.out( line ) | ||
| 170 | self.out( 'ALLOW_EMPTY_${PN}-modules = "1"' ) | 172 | self.out( 'ALLOW_EMPTY_${PN}-modules = "1"' ) |
| 171 | 173 | ||
| 172 | def doEpilog( self ): | 174 | def doEpilog( self ): |
