mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-08 01:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

python-*-manifest/generators: fix long line lengths

Browse Source 
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>
This commit is contained in:
Tim Orling
2017-11-23 21:14:42 -08:00
committed by Richard Purdie
parent 7d950b99bd
commit 69a910d2e7
4 changed files with 1538 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/contrib/python/generate-manifest-2.7.py
View File

@@ -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 ):

24
scripts/contrib/python/generate-manifest-3.5.py
View File

@@ -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 ):