[2/6,meta-gnome] wv: Don't use ${PN}

Submitted by Richard Weinberger on Jan. 10, 2019, 9:42 a.m. | Patch ID: 157693

Details

Message ID 20190110094212.16763-2-richard@nod.at
State Accepted
Commit 43e63981a1d5b5d546da32f298ac7eae69dd71c8
Headers show

Commit Message

Richard Weinberger Jan. 10, 2019, 9:42 a.m.
Don't use ${PN} for the source dir, it will break multilib builds.
The correct variable is ${BPN}.

The bitbake defaults are:
BP = "${BPN}-${PV}"
S = "${WORKDIR}/${BP}"

Therefore we can remove this line.

Cc: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 meta-gnome/recipes-gnome/wv/wv_1.2.4.bb | 2 --
 1 file changed, 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb b/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
index 8ed1fcd15ca8..03ee5b4ac4aa 100644
--- a/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
+++ b/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
@@ -16,6 +16,4 @@  SRC_URI[sha256sum] = "673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d
 
 inherit autotools pkgconfig
 
-S = "${WORKDIR}/${PN}-${PV}"
-
 EXTRA_OECONF = ""

Comments

Andreas Müller Jan. 11, 2019, 12:59 a.m.
On Thu, Jan 10, 2019 at 10:42 AM Richard Weinberger <richard@nod.at> wrote:
>
> Don't use ${PN} for the source dir, it will break multilib builds.
> The correct variable is ${BPN}.
>
> The bitbake defaults are:
> BP = "${BPN}-${PV}"
> S = "${WORKDIR}/${BP}"
>
> Therefore we can remove this line.
>
> Cc: Andreas Müller <schnitzeltony@googlemail.com>
> Signed-off-by: Richard Weinberger <richard@nod.at>
> ---
>  meta-gnome/recipes-gnome/wv/wv_1.2.4.bb | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb b/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
> index 8ed1fcd15ca8..03ee5b4ac4aa 100644
> --- a/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
> +++ b/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
> @@ -16,6 +16,4 @@ SRC_URI[sha256sum] = "673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d
>
>  inherit autotools pkgconfig
>
> -S = "${WORKDIR}/${PN}-${PV}"
> -
>  EXTRA_OECONF = ""
> --
> 2.20.1
>
From a quick glance these patches look good to me - should invest more
on multilib tests...

Andreas
Khem Raj Jan. 11, 2019, 3:36 a.m.
On Thu, Jan 10, 2019 at 5:00 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Thu, Jan 10, 2019 at 10:42 AM Richard Weinberger <richard@nod.at> wrote:
> >
> > Don't use ${PN} for the source dir, it will break multilib builds.
> > The correct variable is ${BPN}.
> >
> > The bitbake defaults are:
> > BP = "${BPN}-${PV}"
> > S = "${WORKDIR}/${BP}"
> >
> > Therefore we can remove this line.
> >
> > Cc: Andreas Müller <schnitzeltony@googlemail.com>
> > Signed-off-by: Richard Weinberger <richard@nod.at>
> > ---
> >  meta-gnome/recipes-gnome/wv/wv_1.2.4.bb | 2 --
> >  1 file changed, 2 deletions(-)
> >
> > diff --git a/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb b/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
> > index 8ed1fcd15ca8..03ee5b4ac4aa 100644
> > --- a/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
> > +++ b/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
> > @@ -16,6 +16,4 @@ SRC_URI[sha256sum] = "673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d
> >
> >  inherit autotools pkgconfig
> >
> > -S = "${WORKDIR}/${PN}-${PV}"
> > -
> >  EXTRA_OECONF = ""
> > --
> > 2.20.1
> >
> From a quick glance these patches look good to me - should invest more
> on multilib tests...
>

Thanks for reviewing Andreas, I have already staged them in my master
and soon they will be in master-next
hopefully tonight.

> Andreas
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel