From 69a910d2e7e440760d02e22f8fce90ee87e15d1d Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Thu, 23 Nov 2017 21:14:42 -0800 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/contrib/python/generate-manifest-2.7.py | 24 +++++++++++++----------- scripts/contrib/python/generate-manifest-3.5.py | 24 +++++++++++++----------- 2 files changed, 26 insertions(+), 22 deletions(-) (limited to 'scripts') 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: # generate provides line # - provideLine = 'PROVIDES+="' + provideLine = 'PROVIDES+=" \\\n' for name in sorted(self.packages): - provideLine += "%s " % name + provideLine += " %s \\\n" % name provideLine += '"' self.out( provideLine ) @@ -100,14 +100,15 @@ class MakefileMaker: # generate package line # - packageLine = 'PACKAGES="${PN}-dbg ' + packageLine = 'PACKAGES=" \\\n' + packageLine += ' ${PN}-dbg \\\n' for name in sorted(self.packages): if name.startswith("${PN}-distutils"): if name == "${PN}-distutils": - packageLine += "%s-staticdev %s " % (name, name) + packageLine += " %s-staticdev %s \\\n" % (name, name) elif name != '${PN}-dbg': - packageLine += "%s " % name - packageLine += '${PN}-modules"' + packageLine += " %s \\\n" % name + packageLine += ' ${PN}-modules\\\n"' self.out( packageLine ) self.out( "" ) @@ -125,7 +126,7 @@ class MakefileMaker: self.out( 'SUMMARY_%s="%s"' % ( name, desc ) ) self.out( 'RDEPENDS_%s="%s"' % ( name, deps ) ) - line = 'FILES_%s="' % name + line = 'FILES_%s=" \\\n' % name # # check which directories to make in the temporary directory @@ -140,20 +141,21 @@ class MakefileMaker: # for target in files: - line += "%s " % target + line += " %s \\\n" % target line += '"' self.out( line ) self.out( "" ) self.out( 'SUMMARY_${PN}-modules="All Python modules"' ) - line = 'RDEPENDS_${PN}-modules="' + line = 'RDEPENDS_${PN}-modules=" \\\n' for name, data in sorted(self.packages.items()): if name not in ['${PN}-dev', '${PN}-distutils-staticdev'] and name not in self.excluded_pkgs: - line += "%s " % name + line += " %s \\\n" % name - self.out( "%s \"" % line ) + line += '"' + self.out( line ) self.out( 'ALLOW_EMPTY_${PN}-modules = "1"' ) 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: # generate provides line # - provideLine = 'PROVIDES+="' + provideLine = 'PROVIDES+="\\\n' for name in sorted(self.packages): - provideLine += "%s " % name + provideLine += " %s \\\n" % name provideLine += '"' self.out( provideLine ) @@ -113,14 +113,15 @@ class MakefileMaker: # generate package line # - packageLine = 'PACKAGES="${PN}-dbg ' + packageLine = 'PACKAGES="\\\n' + packageLine += ' ${PN}-dbg \\\n' for name in sorted(self.packages): if name.startswith("${PN}-distutils"): if name == "${PN}-distutils": - packageLine += "%s-staticdev %s " % (name, name) + packageLine += "%s \\\n %s-staticdev \\\n" % (name, name) elif name != '${PN}-dbg': - packageLine += "%s " % name - packageLine += '${PN}-modules"' + packageLine += " %s \\\n" % name + packageLine += ' ${PN}-modules \\\n"' self.out( packageLine ) self.out( "" ) @@ -138,7 +139,7 @@ class MakefileMaker: self.out( 'SUMMARY_%s="%s"' % ( name, desc ) ) self.out( 'RDEPENDS_%s="%s"' % ( name, deps ) ) - line = 'FILES_%s="' % name + line = 'FILES_%s="\\\n' % name # # check which directories to make in the temporary directory @@ -153,20 +154,21 @@ class MakefileMaker: # for target in files: - line += "%s " % target + line += " %s \\\n" % target line += '"' self.out( line ) self.out( "" ) self.out( 'SUMMARY_${PN}-modules="All Python modules"' ) - line = 'RDEPENDS_${PN}-modules="' + line = 'RDEPENDS_${PN}-modules=" \\\n' for name, data in sorted(self.packages.items()): if name not in ['${PN}-dev', '${PN}-distutils-staticdev'] and name not in self.excluded_pkgs: - line += "%s " % name + line += " %s \\\n" % name - self.out( "%s \"" % line ) + line += '"' + self.out( line ) self.out( 'ALLOW_EMPTY_${PN}-modules = "1"' ) def doEpilog( self ): -- cgit v1.2.3-54-g00ecf