Replicated copyright change to open embedded, and resolved multi-license ToDo by shaneallcroft · Pull Request #100 · ros-infrastructure/superflore

shaneallcroft · 2017-12-07T01:32:21Z

#100 Hooray!!!!!!

…nse to do

shaneallcroft · 2017-12-07T01:33:00Z

@tfoote @allenh1 rebased and ready for review 👍

tfoote · 2017-12-07T01:44:32Z

superflore/generators/bitbake/yocto_recipe.py

-                    ret += ' '
-                    first = False
-                ret += lic
+            ret += ' '.join(self.license)


This prints the licences twice, once in a list format and once joined by strings. It's probably worth removing the above print and joining on ', ' for human readability. @allenh1 I assume this is optimized for human readability so comma separated list is best?

@tfoote I'm actually not sure how Open Embedded wants multiple licenses to be handled... I think I'll just pull this change locally and try it out? I'm honestly unsure.

allenh1 · 2017-12-07T04:43:29Z

tests/ebuild/simple_expected.ebuild

 DESCRIPTION="an ebuild"
 HOMEPAGE="https://www.website.com"
-SRC_URI="https://www.website.com/download/${PN}/archive/${PN}/release/lunar/0.0.0.tar.gz -> ${PN}-lunar-release-${PV}.tar.gz"
+SRC_URI="https://www.website.com/download/stuff.tar.gz -> ${PN}-lunar-release-${PV}.tar.gz"


This change shouldn't be made -- perhaps this got pulled in during the rebase somehow?

Thats what probably happened, I'll revert that now 👍

… during the rebase

allenh1 · 2017-12-18T18:48:18Z

@shaneallcroft Ok, there's an odd way that OE wants this handled.

LICENSE = "GPLv2 & LGPLv2 & BSD & MIT"

Shouldn't be that difficult to adapt to, but lmk if you run into any issues.

allenh1 · 2017-12-18T18:50:19Z

superflore/generators/bitbake/yocto_recipe.py

@@ -136,16 +138,8 @@ def get_recipe_text(self, distributor, license_text, die_msg=None):
        elif isinstance(self.license, list):
            self.license = self.license[0].replace(' ', '-')


@shaneallcroft this hackyness needs to be killed with fire. This just removes the list entirely and replaces it with its first element.

Therefore, this line and the one that immediately follows should be removed.

You got it! 👍 🔥 🔥

…info for license as list

allenh1 · 2017-12-19T01:21:34Z

superflore/generators/bitbake/yocto_recipe.py

-                    ret += ' '
-                    first = False
-                ret += lic
+            ret += 'LICENSE = "' + ' & '.join(self.license)


This is very close. Make sure to call the getlicense function on each entry of the list! Something like the following would probably do the trick.

' & '.join([getlicense(l) for l in self.license])

OH yeah, that makes sense, cause the hackyness is gone so every item needs to be taken into account 👍 im on it 👍

allenh1 · 2017-12-19T17:31:55Z

superflore/generators/bitbake/yocto_recipe.py

@@ -134,18 +136,8 @@ def get_recipe_text(self, distributor, license_text, die_msg=None):
            self.license = self.license.replace(' ', '-')
            ret += 'LICENSE = "' + self.license + '"\n'


@shaneallcroft You might update this one as well.

Oh heck yeah! I'm on it 👍

shaneallcroft · 2017-12-19T17:34:46Z

:( wait i messed it up

allenh1 · 2017-12-19T17:40:24Z

:( wait i messed it up

It happens. Looks like you just missed an import for the getlicense function.

…ply with the 79 chararcter limit

shaneallcroft · 2017-12-19T17:49:31Z

I forgot the underscore i think just a sec

shaneallcroft · 2017-12-19T18:12:19Z

First try 😎 fixing the other thing now almost for got

…license

allenh1

You're very close.

allenh1 · 2017-12-19T21:15:14Z

superflore/generators/bitbake/yocto_recipe.py

-            ret += 'LICENSE = "' + self.license + '"\n'
+            ret += 'LICENSE = "'
+            ret += ' & '.join([get_license(l) for l in self.license]) + '"\n'
        elif isinstance(self.license, list):


So I don't think you need to use a join when self.license is a string. I think this line could just be

ret += 'LICENSE = "%s"\n' % getlicense(self.license)

Ahhh, i didnt see that '[0]' on the end of line 136, thought it was just being made into a list there so i treated it the same, as when it was a list my b!

allenh1

Lgtm. I'll let @tfoote merge.

shaneallcroft · 2017-12-20T04:46:48Z

Awesome!!! Thank you so much! : )

tfoote

@shaneallcroft Thanks for iterating on this. It looks good to me now.

allenh1 · 2017-12-20T13:58:56Z

(also woot #100 -- that's pretty cool)

…nse ToDo (ros-infrastructure#100) Replicated copyright change to open imbedded, and resolved multi license to do

Replicated copyright change to open imbedded, and resolved multi lice…

50a271c

…nse to do

tfoote reviewed Dec 7, 2017

View reviewed changes

allenh1 changed the title ~~Replicated copyright change to open imbedded, and resolved multi license to do~~ Replicated copyright change to open embedded, and resolved multi-license ToDo Dec 7, 2017

allenh1 reviewed Dec 7, 2017

View reviewed changes

Reverted an accidental change to simple_expected.ebuild that was made…

f296d34

… during the rebase

allenh1 reviewed Dec 18, 2017

View reviewed changes

Incinerated hackyness and implemented (hopefully) correct OE License …

1ed712e

…info for license as list

allenh1 suggested changes Dec 19, 2017

View reviewed changes

Changed to call getlicense for every item on the list

f1b310e

allenh1 reviewed Dec 19, 2017

View reviewed changes

Imported getlicense from superflore.util and rearranged a line to com…

bbb8e11

…ply with the 79 chararcter limit

shaneallcroft added 3 commits December 19, 2017 12:51

added_underscore

633e210

removed whitespace and fixed import

a16d96f

rearranged imports

b133831

allenh1 added enhancement in review labels Dec 19, 2017

Fixed when list is a str as well & corrected newline being after the …

4aeaac9

…license

allenh1 suggested changes Dec 19, 2017

View reviewed changes

shaneallcroft added 2 commits December 19, 2017 22:34

Fixed license when its a string

28d6f7e

added_underscore

49b2955

allenh1 approved these changes Dec 20, 2017

View reviewed changes

tfoote approved these changes Dec 20, 2017

View reviewed changes

Merge branch 'master' into master

58ba8da

tfoote merged commit ec69f2e into ros-infrastructure:master Dec 20, 2017

herb-kuta-lge removed the in review label Apr 22, 2020

zffgithub pushed a commit to zffgithub/superflore that referenced this pull request Apr 11, 2023

Replicated copyright change to open embedded, and resolved multi-lice…

9098658

…nse ToDo (ros-infrastructure#100) Replicated copyright change to open imbedded, and resolved multi license to do

		@@ -136,16 +138,8 @@ def get_recipe_text(self, distributor, license_text, die_msg=None):
		elif isinstance(self.license, list):
		self.license = self.license[0].replace(' ', '-')

		@@ -134,18 +136,8 @@ def get_recipe_text(self, distributor, license_text, die_msg=None):
		self.license = self.license.replace(' ', '-')
		ret += 'LICENSE = "' + self.license + '"\n'

Conversation

shaneallcroft commented Dec 7, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shaneallcroft commented Dec 7, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tfoote Dec 7, 2017

Choose a reason for hiding this comment

Uh oh!

allenh1 Dec 7, 2017

Choose a reason for hiding this comment

Uh oh!

allenh1 Dec 7, 2017

Choose a reason for hiding this comment

Uh oh!

shaneallcroft Dec 8, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

allenh1 commented Dec 18, 2017

Uh oh!

allenh1 Dec 18, 2017

Choose a reason for hiding this comment

Uh oh!

shaneallcroft Dec 18, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

allenh1 Dec 19, 2017

Choose a reason for hiding this comment

Uh oh!

shaneallcroft Dec 19, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

allenh1 Dec 19, 2017

Choose a reason for hiding this comment

Uh oh!

shaneallcroft Dec 19, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shaneallcroft commented Dec 19, 2017

Uh oh!

allenh1 commented Dec 19, 2017

Uh oh!

shaneallcroft commented Dec 19, 2017

Uh oh!

shaneallcroft commented Dec 19, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

allenh1 left a comment

Choose a reason for hiding this comment

Uh oh!

allenh1 Dec 19, 2017

Choose a reason for hiding this comment

Uh oh!

shaneallcroft Dec 20, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

allenh1 left a comment

Choose a reason for hiding this comment

Uh oh!

shaneallcroft commented Dec 20, 2017

Uh oh!

tfoote left a comment

Choose a reason for hiding this comment

Uh oh!

allenh1 commented Dec 20, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

shaneallcroft commented Dec 7, 2017 •

edited

Loading

shaneallcroft commented Dec 7, 2017 •

edited

Loading

shaneallcroft Dec 8, 2017 •

edited

Loading

shaneallcroft Dec 18, 2017 •

edited

Loading

shaneallcroft Dec 19, 2017 •

edited

Loading

shaneallcroft Dec 19, 2017 •

edited

Loading

shaneallcroft commented Dec 19, 2017 •

edited

Loading

shaneallcroft Dec 20, 2017 •

edited

Loading