Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Adding patch file support for Open Embedded. #129

Merged
merged 6 commits into from
Feb 6, 2018
Merged

Conversation

allenh1
Copy link
Contributor

@allenh1 allenh1 commented Feb 4, 2018

This includes fies in the files directory as patches within the generated recipe text.

connects to #129

@allenh1
Copy link
Contributor Author

allenh1 commented Feb 4, 2018

current result is allenh1/meta-ros#28

@allenh1
Copy link
Contributor Author

allenh1 commented Feb 4, 2018

Note that I don't expect the CI to pass until after #128 is merged (or, rather, after we fix the tests).

Copy link
Member

@tfoote tfoote left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few quick comments.

' %s from ROS distro %s from allenh1\'s fork of Meta-ROS ' +
'from commit %s.' % (
'Superflore yocto generator began regeneration of package(s)'
' %s from ROS distro %s from allenh1\'s fork of Meta-ROS'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is missing a parameterization based on #128

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly, I think the allenh1 part can be removed.

if self.patch_files:
ret += 'SRC_URI += "\\\n'
ret += ' \\\n'.join(self.patch_files) + '"\n\n'
if self.name == 'catkin':
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can these be integrated into patches?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the normal sense, no. I think I could, however, just detect an existing .inc file and include it.

@allenh1 allenh1 requested a review from tfoote February 6, 2018 02:48
Copy link
Member

@tfoote tfoote left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks much cleaner

@allenh1 allenh1 merged commit 7131950 into master Feb 6, 2018
@allenh1 allenh1 deleted the oe-patch-support branch February 6, 2018 19:31
zffgithub pushed a commit to zffgithub/superflore that referenced this pull request Apr 11, 2023
* Adding patch file support for Open Embedded.

* Remap distro parameter for bitbake.

* Fix commit string.

* Use .inc files for catkin FILES appendages instead of hardcoding.
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants