[PATCH 1/6] [meta-filesystems] fuse-exfat: Don't use ${PN}

[PATCH 1/6] [meta-filesystems] fuse-exfat: Don't use ${PN}

[Richard Weinberger]

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: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 .../recipes-filesystems/fuse-exfat/fuse-exfat_1.2.3.bb           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.2.3.bb b/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.2.3.bb
index 99bf2bed411f..18fc9cd6f13d 100644
--- a/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.2.3.bb
+++ b/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.2.3.bb
@@ -17,5 +17,4 @@ inherit autotools pkgconfig
 SRC_URI[md5sum] = "fca71e6598f79d037a3c7c969cb5710c"
 SRC_URI[sha256sum] = "f2e06eba5a21c621aac1d6da21b12a5a324fdd1e20f9c8acd357dd463c2355d9"
 
-S = "${WORKDIR}/${PN}-${PV}"
 EXTRA_OECONF += "sbindir=${base_sbindir}"
-- 
2.20.1

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

[Richard Weinberger]

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

[PATCH 3/6] [meta-multimedia] caps: Don't use ${PN}

[Richard Weinberger]

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-multimedia/recipes-multimedia/caps/caps_0.9.24.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb b/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb
index fe864c49cc23..0404bd51595f 100644
--- a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb
+++ b/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://quitte.de/dsp/caps.html"
 LICENSE = "GPL-3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = "http://quitte.de/dsp/${PN}_${PV}.tar.bz2 \
+SRC_URI = "http://quitte.de/dsp/${BPN}_${PV}.tar.bz2 \
            file://Avoid-ambiguity-in-div-invocation.patch \
            file://0001-basic.h-Use-c99-supported-stdint-types.patch \
            file://append_ldflags.patch \
@@ -13,8 +13,6 @@ SRC_URI = "http://quitte.de/dsp/${PN}_${PV}.tar.bz2 \
 SRC_URI[md5sum] = "c1d634038dcb54702306c0e30cb1c626"
 SRC_URI[sha256sum] = "f746feba57af316b159f0169de5d78b4fd1064c2c0c8017cb5856b2f22e83f20"
 
-S = "${WORKDIR}/${PN}-${PV}"
-
 EXTRA_OEMAKE = " \
     CC='${CXX}' \
     CFLAGS='${CFLAGS} -ffast-math -funroll-loops -fPIC -DPIC' \
-- 
2.20.1

[PATCH 4/6] [meta-multimedia] libdc1394: Don't use ${PN}

[Richard Weinberger]

Don't use ${PN} for the source dir, it will break multilib builds.
The correct variable is ${BPN}.

Cc: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb b/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb
index b6bb447bc2af..3b3ac83e2530 100755
--- a/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb
+++ b/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb
@@ -19,7 +19,7 @@ SRC_URI = "git://git.code.sf.net/p/libdc1394/code;branch=master;protocol=git \
            file://install_examples.patch \
           "
 
-S = "${WORKDIR}/git/${PN}"
+S = "${WORKDIR}/git/${BPN}"
 
 inherit autotools-brokensep pkgconfig
 
-- 
2.20.1

[PATCH 5/6] [meta-oe] mksh: Don't use ${PN}

[Richard Weinberger]

Don't use ${PN} for the source dir, it will break multilib builds.
The correct variable is ${BPN}.

Cc: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 meta-oe/recipes-shells/mksh/mksh_56.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-shells/mksh/mksh_56.bb b/meta-oe/recipes-shells/mksh/mksh_56.bb
index 324b5b61157f..e4eb54286a20 100644
--- a/meta-oe/recipes-shells/mksh/mksh_56.bb
+++ b/meta-oe/recipes-shells/mksh/mksh_56.bb
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "dd86ebc421215a7b44095dc13b056921ba81e61b9f6f4cdab08ca135d0
 
 inherit update-alternatives
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 
 ALTERNATIVE_${PN} = "sh"
 ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh"
-- 
2.20.1

[PATCH 6/6] [meta-oe] mini-iconv: Don't use ${PN}

[Richard Weinberger]

Don't use ${PN} for the source dir, it will break multilib builds.
The correct variable is ${BPN}.

Cc: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 meta-oe/recipes-support/mini-iconv/mini-iconv.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/mini-iconv/mini-iconv.bb b/meta-oe/recipes-support/mini-iconv/mini-iconv.bb
index 0f1548aa284f..44f55b58df94 100644
--- a/meta-oe/recipes-support/mini-iconv/mini-iconv.bb
+++ b/meta-oe/recipes-support/mini-iconv/mini-iconv.bb
@@ -13,7 +13,7 @@ SRC_URI[md5sum] = "84412221e26505a2b3855d4a1cdcd0e0"
 SRC_URI[sha256sum] = "3552262bf1bcf8e859a2a3a7adfb0367af8593383e730c492e981477aac0a0d4"
 
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 
 do_install() {
     oe_runmake install DESTDIR=${D} PREFIX=${prefix} LIB=${base_libdir}
-- 
2.20.1

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

[Andreas Müller]

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

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

[Khem Raj]

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