[meta-oe][PATCH 01/20] smstools: fix PN -> BPN for multilib

[meta-oe][PATCH 01/20] smstools: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../smstools3/smstools3_3.1.15.bb                  |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
index 7a72a1e..c4b6b60 100644
--- a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
+++ b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
@@ -12,7 +12,7 @@ SRC_URI[md5sum] = "0241ef60e646fac1a06254a848e61ed7"
 SRC_URI[sha256sum] = "ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59"
 
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 
 RDEPENDS_${PN} = "bash"
 INITSCRIPT_NAME = "sms3"
-- 
1.7.9.5

[meta-oe][PATCH 02/20] hexedit: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb b/meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb
index c2f0630..39df5b2 100644
--- a/meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb
+++ b/meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb
@@ -14,4 +14,4 @@ SRC_URI[sha256sum] = "6a126da30a77f5c0b08038aa7a881d910e3b65d13767fb54c58c983963
 
 inherit autotools-brokensep
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
-- 
1.7.9.5

[meta-oe][PATCH 03/20] p7zip: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-extended/p7zip/p7zip_9.20.1.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/p7zip/p7zip_9.20.1.bb b/meta-oe/recipes-extended/p7zip/p7zip_9.20.1.bb
index 8905ae9..be706e1 100644
--- a/meta-oe/recipes-extended/p7zip/p7zip_9.20.1.bb
+++ b/meta-oe/recipes-extended/p7zip/p7zip_9.20.1.bb
@@ -9,7 +9,7 @@ SRC_URI = "http://downloads.sourceforge.net/p7zip/p7zip/${PV}/p7zip_${PV}_src_al
 SRC_URI[md5sum] = "bd6caaea567dc0d995c990c5cc883c89"
 SRC_URI[sha256sum] = "49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782"
 
-S = "${WORKDIR}/${PN}_${PV}"
+S = "${WORKDIR}/${BPN}_${PV}"
 
 do_install() {
     install -d ${D}${bindir}
-- 
1.7.9.5

[meta-oe][PATCH 04/20] fbgrab: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-graphics/fbgrab/fbgrab_1.2.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.2.bb b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.2.bb
index 2ff331c..1d87b86 100644
--- a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.2.bb
+++ b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.2.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://fbgrab.monells.se/${BP}.tar.gz"
 
 inherit autotools-brokensep
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 
 SRC_URI[md5sum] = "15b432735d6efd0373722bb96577b945"
 SRC_URI[sha256sum] = "61e0772ad6ea744ee597ae478398ddd0ba6fceee2cf343859bebde2c15bafb91"
-- 
1.7.9.5

[meta-oe][PATCH 05/20] takao-fonts: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../takao-fonts/takao-fonts_003.02.01.bb           |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/takao-fonts/takao-fonts_003.02.01.bb b/meta-oe/recipes-graphics/takao-fonts/takao-fonts_003.02.01.bb
index 0a0f6d1..ed875fa 100644
--- a/meta-oe/recipes-graphics/takao-fonts/takao-fonts_003.02.01.bb
+++ b/meta-oe/recipes-graphics/takao-fonts/takao-fonts_003.02.01.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://launchpad.net/takao-fonts/003.02/${PV}/+download/takao-fonts-t
 SRC_URI[md5sum] = "ca480e5edb9f26d871bf6df6cb910306"
 SRC_URI[sha256sum] = "2f526a16c7931958f560697d494d8304949b3ce0aef246fb0c727fbbcc39089e"
 
-S = "${WORKDIR}/${PN}-ttf-${PV}"
+S = "${WORKDIR}/${BPN}-ttf-${PV}"
 
 do_install() {
     install -m 0755 -d ${D}/${datadir}/fonts
-- 
1.7.9.5

[meta-oe][PATCH 06/20] xbitmaps: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../xorg-data/xorg-data-common.inc                 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc b/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc
index 1bcfd5a..b230962 100644
--- a/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc
+++ b/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/data"
 LICENSE = "MIT-X"
 
-XORG_PN = "${PN}"
+XORG_PN = "${BPN}"
 
 SRC_URI = "${XORG_MIRROR}/individual/data/${BP}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
-- 
1.7.9.5

[meta-oe][PATCH 07/20] gpsd: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
index 93cf1ae..b37fc15 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
@@ -85,8 +85,8 @@ do_install_append() {
 
     #support for systemd
     install -d ${D}${systemd_unitdir}/system/
-    install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
-    install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
+    install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service
+    install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket
 }
 
 pkg_postinst_${PN}-conf() {
-- 
1.7.9.5

Re: [meta-oe][PATCH 07/20] gpsd: fix PN -> BPN for multilib

[Philip Balister]

I've alos got an update in flight for gpsd. We are having trouble with
it, because the update brkoe navit. Now the bluez4 - 5 updte broke
another of the packages navit needs.

Martin, any chance we can combine this patch with my update and
blacklist navit?

Philip

On 05/08/2015 03:42 AM, Yi Zhao wrote:
> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> ---
>  meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
> index 93cf1ae..b37fc15 100644
> --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
> +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
> @@ -85,8 +85,8 @@ do_install_append() {
>  
>      #support for systemd
>      install -d ${D}${systemd_unitdir}/system/
> -    install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
> -    install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
> +    install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service
> +    install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket
>  }
>  
>  pkg_postinst_${PN}-conf() {
> 

Re: [meta-oe][PATCH 07/20] gpsd: fix PN -> BPN for multilib

[Martin Jansa]

On Mon, May 11, 2015 at 07:48:58AM -0400, Philip Balister wrote:
> I've alos got an update in flight for gpsd. We are having trouble with
> it, because the update brkoe navit. Now the bluez4 - 5 updte broke
> another of the packages navit needs.
> 
> Martin, any chance we can combine this patch with my update and
> blacklist navit?

Yes, I've already did that in master-next.

> 
> Philip
> 
> On 05/08/2015 03:42 AM, Yi Zhao wrote:
> > Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> > ---
> >  meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb |    4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
> > index 93cf1ae..b37fc15 100644
> > --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
> > +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
> > @@ -85,8 +85,8 @@ do_install_append() {
> >  
> >      #support for systemd
> >      install -d ${D}${systemd_unitdir}/system/
> > -    install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
> > -    install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
> > +    install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service
> > +    install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket
> >  }
> >  
> >  pkg_postinst_${PN}-conf() {
> > 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[meta-oe][PATCH 08/20] navit: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-navigation/navit/navit.inc    |   24 ++++++++++++------------
 meta-oe/recipes-navigation/navit/navit_svn.bb |    2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meta-oe/recipes-navigation/navit/navit.inc b/meta-oe/recipes-navigation/navit/navit.inc
index 9d4f4ec..e39008e 100644
--- a/meta-oe/recipes-navigation/navit/navit.inc
+++ b/meta-oe/recipes-navigation/navit/navit.inc
@@ -57,19 +57,19 @@ SRC_URI += "file://navit.xml \
             file://plugins.xml \
 "
 
-FILES_${PN} += "${libdir}/${PN}/*/*.so ${datadir}/icons"
-FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
+FILES_${PN} += "${libdir}/${BPN}/*/*.so ${datadir}/icons"
+FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug"
 FILES_${PN}-maptool = " ${bindir}/maptool "
 FILES_${PN}-config = " ${datadir}/navit/*.xml "
-FILES_${PN}-dbus = " ${datadir}/dbus-1/services/ ${libdir}/${PN}/binding/libbinding_dbus.so "
-FILES_${PN}-speech-cmdline = " ${libdir}/${PN}/speech/libspeech_cmdline.so "
-FILES_${PN}-speech-dbus = " ${libdir}/${PN}/speech/libspeech_dbus.so "
-FILES_${PN}-gui-gtk = " ${libdir}/${PN}/gui/libgui_gtk.so "
-FILES_${PN}-gui-qml = " ${libdir}/${PN}/gui/libgui_qml.so ${datadir}/navit/skins/ "
-FILES_${PN}-gui-internal = " ${libdir}/${PN}/gui/libgui_internal.so "
-FILES_${PN}-graphics-sdl = " ${libdir}/${PN}/graphics/libgraphics_sdl.so "
-FILES_${PN}-graphics-qt = " ${libdir}/${PN}/graphics/libgraphics_qt_qpainter.so "
-FILES_${PN}-graphics-gtk = " ${libdir}/${PN}/graphics/libgraphics_gtk_drawing_area.so "
+FILES_${PN}-dbus = " ${datadir}/dbus-1/services/ ${libdir}/${BPN}/binding/libbinding_dbus.so "
+FILES_${PN}-speech-cmdline = " ${libdir}/${BPN}/speech/libspeech_cmdline.so "
+FILES_${PN}-speech-dbus = " ${libdir}/${BPN}/speech/libspeech_dbus.so "
+FILES_${PN}-gui-gtk = " ${libdir}/${BPN}/gui/libgui_gtk.so "
+FILES_${PN}-gui-qml = " ${libdir}/${BPN}/gui/libgui_qml.so ${datadir}/navit/skins/ "
+FILES_${PN}-gui-internal = " ${libdir}/${BPN}/gui/libgui_internal.so "
+FILES_${PN}-graphics-sdl = " ${libdir}/${BPN}/graphics/libgraphics_sdl.so "
+FILES_${PN}-graphics-qt = " ${libdir}/${BPN}/graphics/libgraphics_qt_qpainter.so "
+FILES_${PN}-graphics-gtk = " ${libdir}/${BPN}/graphics/libgraphics_gtk_drawing_area.so "
 FILES_${PN}-icons = "/usr/share/navit/xpm/"
 
 do_configure_prepend() {
@@ -81,7 +81,7 @@ do_install_append() {
     # fix QA issue
     sed -i 's#Categories=GTK;Utility;Geography;#Categories=Graphics;#g' ${D}${datadir}/applications/navit.desktop
 
-    rm ${D}${libdir}/${PN}/*/*.la
+    rm ${D}${libdir}/${BPN}/*/*.la
 
     #Use split config
     mv ${D}${datadir}/navit/navit.xml ${D}${datadir}/navit/navit.default.xml
diff --git a/meta-oe/recipes-navigation/navit/navit_svn.bb b/meta-oe/recipes-navigation/navit/navit_svn.bb
index eff1eb3..bdfbb4b 100644
--- a/meta-oe/recipes-navigation/navit/navit_svn.bb
+++ b/meta-oe/recipes-navigation/navit/navit_svn.bb
@@ -4,7 +4,7 @@ SRCREV = "5310"
 PV = "0.2.0+svnr${SRCPV}"
 PR = "${INC_PR}.3"
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;protocol=http \
     file://freetype-include-path.patch \
     file://configure.add.imlib2.option.patch \
-- 
1.7.9.5

[meta-oe][PATCH 09/20] omgps: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-navigation/omgps/omgps_svn.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-navigation/omgps/omgps_svn.bb b/meta-oe/recipes-navigation/omgps/omgps_svn.bb
index 391545e..696e863 100644
--- a/meta-oe/recipes-navigation/omgps/omgps_svn.bb
+++ b/meta-oe/recipes-navigation/omgps/omgps_svn.bb
@@ -7,7 +7,7 @@ DEPENDS = "gtk+ python-pygobject dbus-glib libcap"
 SRCREV = "109"
 PV = "0.1+svnr${SRCPV}"
 PR = "r2"
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 
 do_configure_prepend() {
     sed -i "s#PY_VERSION = 2.6#PY_VERSION = ${PYTHON_BASEVERSION}#g" ${S}/Makefile.am
-- 
1.7.9.5

[meta-oe][PATCH 10/20] orrery: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-navigation/orrery/orrery_2.7.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
index e6cbffc..b3372b1 100644
--- a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
+++ b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
@@ -15,7 +15,7 @@ SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.ta
 SRC_URI[md5sum]    = "bd62a33e7554ee1030313dfcdefcda8b"
 SRC_URI[sha256sum] = "645166a5e05b2064ab630534a514697fc47b681951e7fe1d635c259cbdf7a5e6"
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 
 do_configure_prepend() {
     # fix DSO issue with binutils-2.22
-- 
1.7.9.5

[meta-oe][PATCH 11/20] fltk: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-support/fltk/fltk_1.1.10.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb
index 3229ed0..1404961 100644
--- a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb
+++ b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb
@@ -32,7 +32,7 @@ do_configure() {
 
 python populate_packages_prepend () {
     if (d.getVar('DEBIAN_NAMES', 1)):
-        d.setVar('PKG_${PN}', 'libfltk${PV}')
+        d.setVar('PKG_${BPN}', 'libfltk${PV}')
 }
 
 LEAD_SONAME = "libfltk.so"
-- 
1.7.9.5

[meta-oe][PATCH 12/20] mime-support: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../mime-support/mime-support_3.48.bb              |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb b/meta-oe/recipes-support/mime-support/mime-support_3.48.bb
index 7f8b40a..d617b66 100644
--- a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb
+++ b/meta-oe/recipes-support/mime-support/mime-support_3.48.bb
@@ -8,11 +8,11 @@ RDEPENDS_${PN} = "perl"
 RRECOMMENDS_${PN} = "file"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz"
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 
 FILES_${PN} += " ${libdir}/mime"
 
-docdir_append = "/${PN}"
+docdir_append = "/${BPN}"
 
 do_install () {
     install -d ${D}${sysconfdir}
-- 
1.7.9.5

[meta-oe][PATCH 13/20] openct: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-support/openct/openct_0.6.20.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb
index 70c73fd..3197845 100644
--- a/meta-oe/recipes-support/openct/openct_0.6.20.bb
+++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb
@@ -10,7 +10,7 @@ readers to remote machines via TCP/IP."
 DEPENDS += "libtool pcsc-lite libusb-compat"
 
 SRC_URI = " \
-    ${DEBIAN_MIRROR}/main/o/${PN}/${PN}_${PV}.orig.tar.gz \
+    ${DEBIAN_MIRROR}/main/o/${BPN}/${BPN}_${PV}.orig.tar.gz \
     file://etc-openct.udev.in-disablePROGRAM.patch \
     file://etc-openct_usb.in-modify-UDEVINFO.patch \
     file://openct.init \
-- 
1.7.9.5

[meta-oe][PATCH 14/20] picocom: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-support/picocom/picocom_1.7.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/picocom/picocom_1.7.bb b/meta-oe/recipes-support/picocom/picocom_1.7.bb
index 8141106..dbee656 100644
--- a/meta-oe/recipes-support/picocom/picocom_1.7.bb
+++ b/meta-oe/recipes-support/picocom/picocom_1.7.bb
@@ -13,6 +13,6 @@ CPPFLAGS_append = '-DVERSION_STR=\\"${PV}\\" -DUUCP_LOCK_DIR=\\"/var/lock\\" -DH
 
 do_install () {
     install -d ${D}${bindir}
-    install -m 0755 ${PN} pcasc pcxm pcym pczm ${D}${bindir}/
+    install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/
 }
 
-- 
1.7.9.5

[meta-oe][PATCH 15/20] soci: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-support/soci/soci_3.2.2.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/soci/soci_3.2.2.bb b/meta-oe/recipes-support/soci/soci_3.2.2.bb
index 887f5a2..d1964eb 100644
--- a/meta-oe/recipes-support/soci/soci_3.2.2.bb
+++ b/meta-oe/recipes-support/soci/soci_3.2.2.bb
@@ -9,7 +9,7 @@ SECTION = "libs"
 DEPENDS = "boost"
 
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${P}/${P}.tar.gz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.gz \
            file://soci_libdir.patch \
           "
 SRC_URI[md5sum] = "bc3c35f6cd3f80a1be19fe30b3c111bf"
-- 
1.7.9.5

[meta-oe][PATCH 16/20] mozjs: fix PN -> BPN for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb b/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb
index 263e940..09c3ea0 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb
+++ b/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb
@@ -16,7 +16,7 @@ SRC_URI = " \
 SRC_URI[md5sum] = "20b6f8f1140ef6e47daa3b16965c9202"
 SRC_URI[sha256sum] = "321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba"
 
-S = "${WORKDIR}/${PN}${PV}/js/src"
+S = "${WORKDIR}/${BPN}${PV}/js/src"
 
 inherit autotools pkgconfig perlnative
 
@@ -48,7 +48,7 @@ do_configure() {
 # patch.bbclass will try to apply the patches already present and fail, so clean them out
 do_sourceclean() {
     (
-    cd ${WORKDIR}/${PN}${PV}/patches
+    cd ${WORKDIR}/${BPN}${PV}/patches
     for i in $(cat series | awk '{print $1}') ; do
         rm -f $i
     done
-- 
1.7.9.5

[meta-oe][PATCH 17/20] iperf: fix ${PN}-${PV} -> ${BP} for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb b/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
index 20adc0d..4e66792 100644
--- a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
+++ b/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
@@ -12,7 +12,7 @@ SRC_URI = " ${SOURCEFORGE_MIRROR}/iperf/${BP}.tar.gz \
 SRC_URI[md5sum] = "44b5536b67719f4250faed632a3cd016"
 SRC_URI[sha256sum] = "636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b"
 
-S = "${WORKDIR}/${PN}-${PV}"
+S = "${WORKDIR}/${BP}"
 
 inherit autotools pkgconfig
 
-- 
1.7.9.5

[meta-oe][PATCH 18/20] mpich: fix ${PN}-${PV} -> ${BP} for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-devtools/mpich/mpich_3.1.1.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/mpich/mpich_3.1.1.bb b/meta-oe/recipes-devtools/mpich/mpich_3.1.1.bb
index 0225cee..19167b4 100644
--- a/meta-oe/recipes-devtools/mpich/mpich_3.1.1.bb
+++ b/meta-oe/recipes-devtools/mpich/mpich_3.1.1.bb
@@ -13,7 +13,7 @@ SRC_URI[md5sum] = "40dc408b1e03cc36d80209baaa2d32b7"
 SRC_URI[sha256sum] = "455ccfaf4ec724d2cf5d8bff1f3d26a958ad196121e7ea26504fd3018757652d"
 
 RDEPENDS_${PN} += "bash perl libxml2"
-S = "${WORKDIR}/${PN}-${PV}"
+S = "${WORKDIR}/${BP}"
 
 EXTRA_OECONF = "--enable-debuginfo \
                 --enable-fast \
-- 
1.7.9.5

[meta-oe][PATCH 19/20] synergy: fix ${PN}-${PV} -> ${BP} for multilib

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-support/synergy/synergy_1.3.8.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/synergy/synergy_1.3.8.bb b/meta-oe/recipes-support/synergy/synergy_1.3.8.bb
index 45c0bc2..545f9fa 100644
--- a/meta-oe/recipes-support/synergy/synergy_1.3.8.bb
+++ b/meta-oe/recipes-support/synergy/synergy_1.3.8.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://synergy.googlecode.com/files/synergy-${PV}-Source.tar.gz"
 SRC_URI[md5sum] = "3534c65ecfa6e47d7899c57975442f03"
 SRC_URI[sha256sum] = "0afc83e4ed0b46ed497d4229b2b2854e8d3c581a112f4da05110943edbfacc03"
 
-S = "${WORKDIR}/${PN}-${PV}-Source"
+S = "${WORKDIR}/${BP}-Source"
 
 inherit cmake distro_features_check
 # depends on virtual/libx11
-- 
1.7.9.5

[meta-oe][PATCH 20/20] sylpheed: remove do_install_append

[Yi Zhao]

The .desktop and .png files alreay install by make install.
So remove the do_install_append

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb b/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb
index 1b010a5..304b654 100644
--- a/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb
+++ b/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb
@@ -7,8 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4 \
 
 PR = "r2"
 
-PNBLACKLIST[sylpheed] ?= "BROKEN: Doesn't work with B!=S"
-
 SRC_URI = "http://sylpheed.sraoss.jp/sylpheed/v2.7/sylpheed-${PV}.tar.bz2 \
     file://glib-2.32.patch \
 "
@@ -18,7 +16,7 @@ SRC_URI[sha256sum] = "8bb6457db4e2eea1877b487d9ac8513546372db9a6a2e4271d11229f4a
 FILES_${PN} += "${datadir}/pixmaps ${datadir}/applications"
 FILES_${PN}-doc += "${datadir}"
 
-EXTRA_OECONF = "--disable-ssl --enable-gnutls"
+EXTRA_OECONF = "--disable-ssl"
 
 CFLAGS += "-D_GNU_SOURCE"
 
@@ -31,9 +29,3 @@ do_configure_prepend() {
 
 inherit autotools pkgconfig
 
-do_install_append() {
-    install -d ${D}${datadir}/applications
-    install -m 0644 sylpheed.desktop ${D}${datadir}/applications/
-    install -d ${D}${datadir}/pixmaps
-    install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/
-}
-- 
1.7.9.5

Re: [meta-oe][PATCH 01/20] smstools: fix PN -> BPN for multilib

[Martin Jansa]

On Fri, May 08, 2015 at 03:42:16PM +0800, Yi Zhao wrote:
> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>

Changes 03, 18, 20 didn't make it to patchwork, because they were marked
as Spam by gmail, please try to resend or send cover letter with repo
url where I can cherry-pick them.

> ---
>  .../smstools3/smstools3_3.1.15.bb                  |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
> index 7a72a1e..c4b6b60 100644
> --- a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
> +++ b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
> @@ -12,7 +12,7 @@ SRC_URI[md5sum] = "0241ef60e646fac1a06254a848e61ed7"
>  SRC_URI[sha256sum] = "ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59"
>  
>  
> -S = "${WORKDIR}/${PN}"
> +S = "${WORKDIR}/${BPN}"
>  
>  RDEPENDS_${PN} = "bash"
>  INITSCRIPT_NAME = "sms3"
> -- 
> 1.7.9.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

Re: [meta-oe][PATCH 01/20] smstools: fix PN -> BPN for multilib

[Yi Zhao]

Hi Martin,

I re-sent these 3 patches. If it still doesn't work. I will try a repo url.

Thanks,
Yi

在 2015年05月11日 17:27, Martin Jansa 写道:
> On Fri, May 08, 2015 at 03:42:16PM +0800, Yi Zhao wrote:
>> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> Changes 03, 18, 20 didn't make it to patchwork, because they were marked
> as Spam by gmail, please try to resend or send cover letter with repo
> url where I can cherry-pick them.
>
>> ---
>>   .../smstools3/smstools3_3.1.15.bb                  |    2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
>> index 7a72a1e..c4b6b60 100644
>> --- a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
>> +++ b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
>> @@ -12,7 +12,7 @@ SRC_URI[md5sum] = "0241ef60e646fac1a06254a848e61ed7"
>>   SRC_URI[sha256sum] = "ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59"
>>   
>>   
>> -S = "${WORKDIR}/${PN}"
>> +S = "${WORKDIR}/${BPN}"
>>   
>>   RDEPENDS_${PN} = "bash"
>>   INITSCRIPT_NAME = "sms3"
>> -- 
>> 1.7.9.5
>>
>> -- 
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-oe][PATCH 01/20] smstools: fix PN -> BPN for multilib

[Paul Eggleton]

On Monday 11 May 2015 11:27:04 Martin Jansa wrote:
> On Fri, May 08, 2015 at 03:42:16PM +0800, Yi Zhao wrote:
> > Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> 
> Changes 03, 18, 20 didn't make it to patchwork, because they were marked
> as Spam by gmail

Hang on, I'm confused. Why should the patches being marked as spam in gmail 
have any bearing on whether they should show up in patchwork? Surely gmail 
shouldn't be involved in the sending part, only subsequently when the mail is 
sent from the mailing list to you (since you use gmail)?

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [meta-oe][PATCH 01/20] smstools: fix PN -> BPN for multilib

[Martin Jansa]

On Tue, May 12, 2015 at 01:43:19PM +0100, Paul Eggleton wrote:
> On Monday 11 May 2015 11:27:04 Martin Jansa wrote:
> > On Fri, May 08, 2015 at 03:42:16PM +0800, Yi Zhao wrote:
> > > Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> > 
> > Changes 03, 18, 20 didn't make it to patchwork, because they were marked
> > as Spam by gmail
> 
> Hang on, I'm confused. Why should the patches being marked as spam in gmail 
> have any bearing on whether they should show up in patchwork? Surely gmail 
> shouldn't be involved in the sending part, only subsequently when the mail is 
> sent from the mailing list to you (since you use gmail)?

Isn't patchwork reading some gmail account over imap?

The list of patches not appearing in patchwork is exactly matching with
patches marked as spam in my inbox, so I believe that the same is
happening in patchwork's gmail account.

Regards,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

Re: [meta-oe][PATCH 01/20] smstools: fix PN -> BPN for multilib

[Paul Eggleton]

On Tuesday 12 May 2015 16:45:11 Martin Jansa wrote:
> On Tue, May 12, 2015 at 01:43:19PM +0100, Paul Eggleton wrote:
> > On Monday 11 May 2015 11:27:04 Martin Jansa wrote:
> > > On Fri, May 08, 2015 at 03:42:16PM +0800, Yi Zhao wrote:
> > > > Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> > > 
> > > Changes 03, 18, 20 didn't make it to patchwork, because they were marked
> > > as Spam by gmail
> > 
> > Hang on, I'm confused. Why should the patches being marked as spam in
> > gmail have any bearing on whether they should show up in patchwork? Surely
> > gmail shouldn't be involved in the sending part, only subsequently when
> > the mail is sent from the mailing list to you (since you use gmail)?
> 
> Isn't patchwork reading some gmail account over imap?
> 
> The list of patches not appearing in patchwork is exactly matching with
> patches marked as spam in my inbox, so I believe that the same is
> happening in patchwork's gmail account.

Ouch - if so that's news to me, and seems very much sub-optimal. It may 
explain why patches keep on going missing from time to time. Khem/Tom, can we 
switch to a local solution?

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [meta-oe][PATCH 01/20] smstools: fix PN -> BPN for multilib

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 403 bytes --]


> On May 12, 2015, at 7:50 AM, Paul Eggleton <paul.eggleton@linux.intel.com> wrote:
> 
> Ouch - if so that's news to me, and seems very much sub-optimal. It may
> explain why patches keep on going missing from time to time. Khem/Tom, can we
> switch to a local solution?

we rely on google spam filter. Local solution would require higher maintenance and spam
you can never defeat on your own

[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

Re: [meta-oe][PATCH 01/20] smstools: fix PN -> BPN for multilib

[Paul Eggleton]

On Tuesday 12 May 2015 09:09:13 Khem Raj wrote:
> > On May 12, 2015, at 7:50 AM, Paul Eggleton <paul.eggleton@linux.intel.com>
> > wrote:
> > 
> > Ouch - if so that's news to me, and seems very much sub-optimal. It may
> > explain why patches keep on going missing from time to time. Khem/Tom, can
> > we switch to a local solution?
> 
> we rely on google spam filter. Local solution would require higher
> maintenance and spam you can never defeat on your own

I'm not quite following - spam doesn't tend to be a problem on our mailing 
lists since you have to be subscribed to post. In any case patchwork only 
cares about messages that are patches or pull requests - anything else is 
ignored.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [meta-oe][PATCH 01/20] smstools: fix PN -> BPN for multilib

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1017 bytes --]


> On May 12, 2015, at 9:15 AM, Paul Eggleton <paul.eggleton@linux.intel.com> wrote:
> 
> On Tuesday 12 May 2015 09:09:13 Khem Raj wrote:
>>> On May 12, 2015, at 7:50 AM, Paul Eggleton <paul.eggleton@linux.intel.com>
>>> wrote:
>>> 
>>> Ouch - if so that's news to me, and seems very much sub-optimal. It may
>>> explain why patches keep on going missing from time to time. Khem/Tom, can
>>> we switch to a local solution?
>> 
>> we rely on google spam filter. Local solution would require higher
>> maintenance and spam you can never defeat on your own
> 
> I'm not quite following - spam doesn't tend to be a problem on our mailing
> lists since you have to be subscribed to post. In any case patchwork only
> cares about messages that are patches or pull requests - anything else is
> ignored.
> 

patchwork needs a mail agent delivering emails. its not listening on any mailing lists
automatically

> Cheers,
> Paul
> 
> --
> 
> Paul Eggleton
> Intel Open Source Technology Centre


[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

Re: [meta-oe][PATCH 01/20] smstools: fix PN -> BPN for multilib

[Trevor Woerner]

On 05/12/15 10:45, Martin Jansa wrote:
> On Tue, May 12, 2015 at 01:43:19PM +0100, Paul Eggleton wrote:
>> On Monday 11 May 2015 11:27:04 Martin Jansa wrote:
>>> On Fri, May 08, 2015 at 03:42:16PM +0800, Yi Zhao wrote:
>>>> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>>> Changes 03, 18, 20 didn't make it to patchwork, because they were marked
>>> as Spam by gmail
>> Hang on, I'm confused. Why should the patches being marked as spam in gmail 
>> have any bearing on whether they should show up in patchwork? Surely gmail 
>> shouldn't be involved in the sending part, only subsequently when the mail is 
>> sent from the mailing list to you (since you use gmail)?
> Isn't patchwork reading some gmail account over imap?
>
> The list of patches not appearing in patchwork is exactly matching with
> patches marked as spam in my inbox, so I believe that the same is
> happening in patchwork's gmail account.

Does anyone know if it helps when I notice them in "Spam" and mark them
as "Not Spam"?

Re: [meta-oe][PATCH 01/20] smstools: fix PN -> BPN for multilib

[Martin Jansa]

On Tue, May 12, 2015 at 06:19:06PM -0400, Trevor Woerner wrote:
> On 05/12/15 10:45, Martin Jansa wrote:
> > On Tue, May 12, 2015 at 01:43:19PM +0100, Paul Eggleton wrote:
> >> On Monday 11 May 2015 11:27:04 Martin Jansa wrote:
> >>> On Fri, May 08, 2015 at 03:42:16PM +0800, Yi Zhao wrote:
> >>>> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> >>> Changes 03, 18, 20 didn't make it to patchwork, because they were marked
> >>> as Spam by gmail
> >> Hang on, I'm confused. Why should the patches being marked as spam in gmail 
> >> have any bearing on whether they should show up in patchwork? Surely gmail 
> >> shouldn't be involved in the sending part, only subsequently when the mail is 
> >> sent from the mailing list to you (since you use gmail)?
> > Isn't patchwork reading some gmail account over imap?
> >
> > The list of patches not appearing in patchwork is exactly matching with
> > patches marked as spam in my inbox, so I believe that the same is
> > happening in patchwork's gmail account.
> 
> Does anyone know if it helps when I notice them in "Spam" and mark them
> as "Not Spam"?

It helps in my gmail account (some patches probably still marked as spam
in patchwork weren't marked as spam in my gmail folder), but maybe it
needs more time to propagate into other account or it needs more people
to mark it as such.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com