Patchwork [1/1] sysvinit-inittab: Fixed license warning.

login
register
mail settings
Submitter Lianhao Lu
Date March 19, 2012, 1:52 a.m.
Message ID <14ba30517e7ece9590e5ea76a963ed9b6720df09.1332121842.git.lianhao.lu@intel.com>
Download mbox | patch
Permalink /patch/23791/
State New
Headers show

Comments

Lianhao Lu - March 19, 2012, 1:52 a.m.
WARNING: .../sysvinit-inittab-2.88dsf-r6/sysvinit-2.88dsf/COPYING could
not be copied for some reason. It may not exist. WARN for now.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
 .../sysvinit/sysvinit-inittab_2.88dsf.bb           |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
Saul Wold - March 19, 2012, 4:07 p.m.
On 03/18/2012 06:52 PM, Lianhao Lu wrote:
> WARNING: .../sysvinit-inittab-2.88dsf-r6/sysvinit-2.88dsf/COPYING could
> not be copied for some reason. It may not exist. WARN for now.
>
> Signed-off-by: Lianhao Lu<lianhao.lu@intel.com>
> ---
>   .../sysvinit/sysvinit-inittab_2.88dsf.bb           |    6 +++++-
>   1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> index 3a716d7..85e34c8 100644
> --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> @@ -11,7 +11,11 @@ S = "${WORKDIR}/sysvinit-${PV}"
>
>   INHIBIT_DEFAULT_DEPS = "1"
>
> -do_configure() {
> +do_unpack_append() {
> +	bb.build.exec_func('do_copy_lic', d)
> +}
> +
I think it would be better to do the copy in a do_configure_prepend() Or 
can we set ${S} to ${WORKDIR} and not have to copy it at all?


> +do_copy_lic () {
>   	cp ${WORKDIR}/COPYING ${S}/
>   }
>
Richard Purdie - March 20, 2012, 12:44 a.m.
On Mon, 2012-03-19 at 09:07 -0700, Saul Wold wrote:
> On 03/18/2012 06:52 PM, Lianhao Lu wrote:
> > WARNING: .../sysvinit-inittab-2.88dsf-r6/sysvinit-2.88dsf/COPYING could
> > not be copied for some reason. It may not exist. WARN for now.
> >
> > Signed-off-by: Lianhao Lu<lianhao.lu@intel.com>
> > ---
> >   .../sysvinit/sysvinit-inittab_2.88dsf.bb           |    6 +++++-
> >   1 files changed, 5 insertions(+), 1 deletions(-)
> >
> > diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> > index 3a716d7..85e34c8 100644
> > --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> > +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> > @@ -11,7 +11,11 @@ S = "${WORKDIR}/sysvinit-${PV}"
> >
> >   INHIBIT_DEFAULT_DEPS = "1"
> >
> > -do_configure() {
> > +do_unpack_append() {
> > +	bb.build.exec_func('do_copy_lic', d)
> > +}
> > +
> I think it would be better to do the copy in a do_configure_prepend() Or 
> can we set ${S} to ${WORKDIR} and not have to copy it at all?
> 
> 
> > +do_copy_lic () {
> >   	cp ${WORKDIR}/COPYING ${S}/
> >   }
> >

How about changing the license URL to point at:

file://${COREBASE}/meta/files/common-licenses/GPL-2.0

?

Cheers,

Richard

Patch

diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index 3a716d7..85e34c8 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -11,7 +11,11 @@  S = "${WORKDIR}/sysvinit-${PV}"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-do_configure() {
+do_unpack_append() {
+	bb.build.exec_func('do_copy_lic', d)
+}
+
+do_copy_lic () {
 	cp ${WORKDIR}/COPYING ${S}/
 }