diff --git a/superflore/generators/bitbake/gen_packages.py b/superflore/generators/bitbake/gen_packages.py index cde1fc24..0995a6ca 100644 --- a/superflore/generators/bitbake/gen_packages.py +++ b/superflore/generators/bitbake/gen_packages.py @@ -28,8 +28,6 @@ from superflore.utils import ok from superflore.utils import retry_on_exception -org = "Open Source Robotics Foundation" - def regenerate_pkg( overlay, pkg, distro, preserve_existing, srcrev_cache, @@ -209,4 +207,4 @@ def __init__( ) def recipe_text(self): - return self.recipe.get_recipe_text(org) + return self.recipe.get_recipe_text() diff --git a/superflore/generators/bitbake/yocto_recipe.py b/superflore/generators/bitbake/yocto_recipe.py index 34b68c2b..92e3c2e6 100644 --- a/superflore/generators/bitbake/yocto_recipe.py +++ b/superflore/generators/bitbake/yocto_recipe.py @@ -27,7 +27,6 @@ import hashlib import re from subprocess import DEVNULL, PIPE, Popen -from time import gmtime, strftime from superflore.exceptions import NoPkgXml from superflore.exceptions import UnresolvedDependency @@ -375,14 +374,11 @@ def get_dependencies( return dependencies, system_dependencies - def get_recipe_text(self, distributor): + def get_recipe_text(self): """ - Generate the Yocto Recipe, given the distributor line - and the license text. + Generate the Yocto Recipe """ - ret = "# Generated by superflore -- DO NOT EDIT\n#\n" - ret += "# Copyright " + strftime("%Y", gmtime()) + " " - ret += distributor + "\n\n" + ret = "# Generated by superflore -- DO NOT EDIT\n\n" ret += self.get_top_inherit_line() # description if self.description: @@ -513,10 +509,8 @@ def generate_superflore_datetime_inc(basepath, dist, now): with open(datetime_path, 'w') as datetime_file: datetime_file.write('# {}/generated/{}\n'.format( dist, datetime_file_name)) - datetime_file.write('# Generated by superflore -- DO NOT EDIT') datetime_file.write( - '\n#\n# Copyright ' + strftime("%Y", gmtime()) - + ' Open Source Robotics Foundation\n\n') + '# Generated by superflore -- DO NOT EDIT\n\n') datetime_file.write( '\n# The time, in UTC, associated with the last superflore' + ' run that resulted in a change to the generated files.' @@ -546,10 +540,7 @@ def generate_ros_distro_inc( distro, conf_file_name)) conf_file.write('# Generated by superflore -- DO NOT EDIT') conf_file.write( - ' (except ROS_DISTRO_METADATA_VERSION_REVISION)\n#\n') - conf_file.write( - '# Copyright ' + strftime("%Y", gmtime()) - + ' Open Source Robotics Foundation\n\n') + ' (except ROS_DISTRO_METADATA_VERSION_REVISION)\n\n') conf_file.write( '# Increment every time meta-ros is released because of ' + 'a manually created change, ie, NOT as a result of a '