[PATCH 0/4] Multilib: fix PN -> BPN in do_install for some recipes

[PATCH 0/4] Multilib: fix PN -> BPN in do_install for some recipes

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

tested with:
MULTILIBS ?= "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 ?= "x86"

$ bitbake python-imaging lib32-python-imaging \
liberation-fonts lib32-liberation-fonts \
ttf-bitstream-vera lib32-ttf-bitstream-vera \
gnupg lib32-gnupg libatomics-ops lib32-libatomics-ops


The following changes since commit f46cf86d0ec3b80ce526b4dad1b1eac5995969ec:

  icecc: improve interaction with sstate (2013-03-15 01:52:54 +0000)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib jhuang0/d_bpn_0315_1
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_bpn_0315_1

Jackie Huang (4):
  python-imaging: fix PN -> BPN in do_install for multilibs
  gnupg: fix PN -> BPN in do_install for multilibs
  ttf-fonts: fix PN -> BPN in do_install for multilibs
  libatomics-ops: fix PN -> BPN in do_install for multilibs

 .../python/python-imaging_1.1.7.bb                 |    8 ++++----
 .../ttf-fonts/liberation-fonts_1.04.bb             |    6 +++---
 .../ttf-fonts/liberation-fonts_1.06.bb             |    6 +++---
 .../ttf-fonts/ttf-bitstream-vera_1.10.bb           |    6 +++---
 .../pulseaudio/libatomics-ops_7.2.bb               |    4 ++--
 meta/recipes-support/gnupg/gnupg_1.4.7.bb          |   12 ++++++------
 6 files changed, 21 insertions(+), 21 deletions(-)

-- 
1.7.4.1

[PATCH 1/4] python-imaging: fix PN -> BPN in do_install for multilibs

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../python/python-imaging_1.1.7.bb                 |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-devtools/python/python-imaging_1.1.7.bb b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
index a36c344..de0e975 100644
--- a/meta/recipes-devtools/python/python-imaging_1.1.7.bb
+++ b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://README;beginline=92;endline=120;md5=c4371af4579f1e489cf881c1443dd4ec"
 DEPENDS = "freetype jpeg tiff"
 SRCNAME = "Imaging"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
            file://0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch"
@@ -25,9 +25,9 @@ do_install() {
     export STAGING_LIBDIR=${STAGING_LIBDIR}
     export STAGING_INCDIR=${STAGING_INCDIR}
     distutils_do_install
-    install -d ${D}${datadir}/doc/${PN}/html/
-    install -m 0644 ${S}/README ${D}${datadir}/doc/${PN}/
-    install -m 0644 ${S}/Docs/* ${D}${datadir}/doc/${PN}/html/
+    install -d ${D}${datadir}/doc/${BPN}/html/
+    install -m 0644 ${S}/README ${D}${datadir}/doc/${BPN}/
+    install -m 0644 ${S}/Docs/* ${D}${datadir}/doc/${BPN}/html/
 
     # get rid of #!/usr/local/bin/python
     sed -i -e 's:/usr/local/bin/:${bindir}/env :g' ${D}${bindir}/*
-- 
1.7.4.1

[PATCH 2/4] gnupg: fix PN -> BPN in do_install for multilibs

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta/recipes-support/gnupg/gnupg_1.4.7.bb |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-support/gnupg/gnupg_1.4.7.bb b/meta/recipes-support/gnupg/gnupg_1.4.7.bb
index 8c2f7f6..7fbc3d3 100644
--- a/meta/recipes-support/gnupg/gnupg_1.4.7.bb
+++ b/meta/recipes-support/gnupg/gnupg_1.4.7.bb
@@ -7,7 +7,7 @@ LICENSE = "GPLv2"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \
            file://long-long-thumb.patch \
@@ -79,9 +79,9 @@ EXTRA_OECONF = "--disable-ldap \
 
 do_install () {
 	autotools_do_install
-	install -d ${D}${docdir}/${PN}
-	mv ${D}${datadir}/${PN}/* ${D}/${docdir}/${PN}/ || :
-	mv ${D}${prefix}/doc/* ${D}/${docdir}/${PN}/ || :
+	install -d ${D}${docdir}/${BPN}
+	mv ${D}${datadir}/${BPN}/* ${D}/${docdir}/${BPN}/ || :
+	mv ${D}${prefix}/doc/* ${D}/${docdir}/${BPN}/ || :
 }
 
 # split out gpgv from main package
@@ -90,5 +90,5 @@ PACKAGES =+ "gpgv"
 FILES_gpgv = "${bindir}/gpgv"
 
 # Exclude debug files from the main packages
-FILES_${PN} = "${bindir}/* ${datadir}/${PN} ${libexecdir}/${PN}/*"
-FILES_${PN}-dbg += "${libexecdir}/${PN}/.debug"
+FILES_${PN} = "${bindir}/* ${datadir}/${BPN} ${libexecdir}/${BPN}/*"
+FILES_${PN}-dbg += "${libexecdir}/${BPN}/.debug"
-- 
1.7.4.1

[PATCH 3/4] ttf-fonts: fix PN -> BPN in do_install for multilibs

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../ttf-fonts/liberation-fonts_1.04.bb             |    6 +++---
 .../ttf-fonts/liberation-fonts_1.06.bb             |    6 +++---
 .../ttf-fonts/ttf-bitstream-vera_1.10.bb           |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
index 67e36e2..a34825a 100644
--- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
+++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
@@ -9,7 +9,7 @@ SECTION = "x11/fonts"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 RDEPENDS_${PN} = "fontconfig-utils"
-PR = "r3"
+PR = "r4"
 PE = "1"
 
 inherit allarch fontcache
@@ -31,8 +31,8 @@ do_install () {
 	install -d ${D}${sysconfdir}/fonts/conf.d/
 	install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
 
-	install -d ${D}${prefix}/share/doc/${PN}/
-	install -m 0644 License.txt ${D}${datadir}/doc/${PN}/
+	install -d ${D}${prefix}/share/doc/${BPN}/
+	install -m 0644 License.txt ${D}${datadir}/doc/${BPN}/
 }
 
 PACKAGES = "${PN}"
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb
index 0ac4deb..6391f51 100644
--- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb
+++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb
@@ -10,7 +10,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 RDEPENDS_${PN} = "fontconfig-utils"
 PE = "1"
-PR = "r2"
+PR = "r3"
 
 FONTREV = "0.20100721"
 SRC_URI = "https://fedorahosted.org/releases/l/i/${BPN}/${BPN}-${PV}.${FONTREV}.tar.gz \
@@ -29,8 +29,8 @@ do_install () {
 	install -d ${D}${sysconfdir}/fonts/conf.d/
 	install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
 
-	install -d ${D}${prefix}/share/doc/${PN}/
-	install -m 0644 License.txt ${D}${datadir}/doc/${PN}/
+	install -d ${D}${prefix}/share/doc/${BPN}/
+	install -m 0644 License.txt ${D}${datadir}/doc/${BPN}/
 }
 
 pkg_postinst_${PN} () {
diff --git a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
index 6214c16..71e85e4 100644
--- a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
+++ b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
@@ -7,7 +7,7 @@ but is visibly different than normal and bold, and reasonably pleasing."
 SECTION = "x11/fonts"
 LICENSE = "BitstreamVera"
 LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be"
-PR = "r6"
+PR = "r7"
 RDEPENDS_${PN} = "fontconfig-utils"
 
 inherit allarch
@@ -25,9 +25,9 @@ do_install () {
         #install -m 644 local.conf ${D}${sysconfdir}/fonts/local.conf 
 
 
-        install -d ${D}${prefix}/share/doc/${PN}/ 
+        install -d ${D}${prefix}/share/doc/${BPN}/
         for i in *.TXT; do 
-                install -m 644 $i ${D}${prefix}/share/doc/${PN}/$i 
+                install -m 644 $i ${D}${prefix}/share/doc/${BPN}/$i
         done 
 } 
 
-- 
1.7.4.1

[PATCH 4/4] libatomics-ops: fix PN -> BPN in do_install for multilibs

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../pulseaudio/libatomics-ops_7.2.bb               |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops_7.2.bb b/meta/recipes-multimedia/pulseaudio/libatomics-ops_7.2.bb
index 3706656..f31f983 100644
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops_7.2.bb
+++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops_7.2.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & MIT"
 LIC_FILES_CHKSUM = "file://doc/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://doc/LICENSING.txt;md5=607073e04548eac7d1f763e480477bab \
 		   "
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-${PV}.tar.gz \
           "
@@ -25,5 +25,5 @@ inherit autotools pkgconfig
 do_install_append() {
 	# those contain only docs, not necessary for now.
 	install -m 0755 -d ${D}${docdir}
-	mv ${D}${datadir}/libatomic_ops ${D}${docdir}/${PN}
+	mv ${D}${datadir}/libatomic_ops ${D}${docdir}/${BPN}
 }
-- 
1.7.4.1