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

login
register
mail settings
Submitter jackie huang
Date March 15, 2013, 8:04 a.m.
Message ID <b058232219a5a046452fdaa4de0a97ea9e8ae962.1363333753.git.jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/46257/
State Accepted
Commit 23acf50dff3f806c18e576da043dbceb4ac310b3
Headers show

Comments

jackie huang - March 15, 2013, 8:04 a.m.
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(-)

Patch

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"