diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2013-03-15 16:04:01 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-16 17:53:58 +0000 |
commit | 23acf50dff3f806c18e576da043dbceb4ac310b3 (patch) | |
tree | 2a081ca976cfc44f013a88882aff4d76f0876b7a | |
parent | 72e77b82f71a7993e44c7f461423bbc3a93a13f6 (diff) | |
download | poky-23acf50dff3f806c18e576da043dbceb4ac310b3.tar.gz |
gnupg: fix PN -> BPN in do_install for multilibs
(From OE-Core rev: d2e7d98ce859a3af037135d1ac7bdb7a34f4d319)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | 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 8c2f7f625f..7fbc3d39ff 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" | |||
7 | 7 | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" |
9 | 9 | ||
10 | PR = "r8" | 10 | PR = "r9" |
11 | 11 | ||
12 | SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \ | 12 | SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \ |
13 | file://long-long-thumb.patch \ | 13 | file://long-long-thumb.patch \ |
@@ -79,9 +79,9 @@ EXTRA_OECONF = "--disable-ldap \ | |||
79 | 79 | ||
80 | do_install () { | 80 | do_install () { |
81 | autotools_do_install | 81 | autotools_do_install |
82 | install -d ${D}${docdir}/${PN} | 82 | install -d ${D}${docdir}/${BPN} |
83 | mv ${D}${datadir}/${PN}/* ${D}/${docdir}/${PN}/ || : | 83 | mv ${D}${datadir}/${BPN}/* ${D}/${docdir}/${BPN}/ || : |
84 | mv ${D}${prefix}/doc/* ${D}/${docdir}/${PN}/ || : | 84 | mv ${D}${prefix}/doc/* ${D}/${docdir}/${BPN}/ || : |
85 | } | 85 | } |
86 | 86 | ||
87 | # split out gpgv from main package | 87 | # split out gpgv from main package |
@@ -90,5 +90,5 @@ PACKAGES =+ "gpgv" | |||
90 | FILES_gpgv = "${bindir}/gpgv" | 90 | FILES_gpgv = "${bindir}/gpgv" |
91 | 91 | ||
92 | # Exclude debug files from the main packages | 92 | # Exclude debug files from the main packages |
93 | FILES_${PN} = "${bindir}/* ${datadir}/${PN} ${libexecdir}/${PN}/*" | 93 | FILES_${PN} = "${bindir}/* ${datadir}/${BPN} ${libexecdir}/${BPN}/*" |
94 | FILES_${PN}-dbg += "${libexecdir}/${PN}/.debug" | 94 | FILES_${PN}-dbg += "${libexecdir}/${BPN}/.debug" |