diff options
| author | Chong Lu <Chong.Lu@windriver.com> | 2014-10-31 16:59:54 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:18:36 +0000 |
| commit | 2f2b0815898bc23d965c776adc9f4baec34e7157 (patch) | |
| tree | a953f7b44b1f40ccf42f6ad099458acf628f63ba | |
| parent | 9d4df89e5b7ffb21d655483fbb0f8657a4395a5c (diff) | |
| download | poky-2f2b0815898bc23d965c776adc9f4baec34e7157.tar.gz | |
docbook-xsl-stylesheets: add perl to RDEPENDS
This solves the following warning:
docbook-xsl-stylesheets-1.78.1: docbook-xsl-stylesheets requires /usr/bin/perl,
/bin/bash, but no providers in its RDEPENDS [file-rdeps]
(From OE-Core rev: d7a277b35bcc67050046c76fb70412101679a545)
(From OE-Core rev: 5ab3d737a9961725b97204a99167f4e0df2fa005)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch new file mode 100644 index 0000000000..3cdc4c869b --- /dev/null +++ b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | docbook-xsl-stylesheets: no bashism in docbook-xsl-update | ||
| 2 | |||
| 3 | The checkbashisms shows there is no bashism, so use /bin/sh. | ||
| 4 | |||
| 5 | Upstream-Status: Pending | ||
| 6 | |||
| 7 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
| 8 | --- | ||
| 9 | tools/bin/docbook-xsl-update | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/tools/bin/docbook-xsl-update b/tools/bin/docbook-xsl-update | ||
| 13 | index aba0016..cc73aa2 100755 | ||
| 14 | --- a/tools/bin/docbook-xsl-update | ||
| 15 | +++ b/tools/bin/docbook-xsl-update | ||
| 16 | @@ -1,4 +1,4 @@ | ||
| 17 | -#!/bin/bash | ||
| 18 | +#!/bin/sh | ||
| 19 | # vim: number | ||
| 20 | |||
| 21 | # docbook-xsl-update - Update environment to latest docbook-xsl snapshot | ||
| 22 | -- | ||
| 23 | 1.9.1 | ||
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb index 39528c89c4..95498da35e 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb +++ b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb | |||
| @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6eeeed43d498c22a835382533356462" | |||
| 5 | 5 | ||
| 6 | SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-xsl-${PV}.tar.bz2 \ | 6 | SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-xsl-${PV}.tar.bz2 \ |
| 7 | file://docbook-xsl.xml \ | 7 | file://docbook-xsl.xml \ |
| 8 | file://docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch \ | ||
| 8 | " | 9 | " |
| 9 | 10 | ||
| 10 | SRC_URI[md5sum] = "6dd0f89131cc35bf4f2ed105a1c17771" | 11 | SRC_URI[md5sum] = "6dd0f89131cc35bf4f2ed105a1c17771" |
| @@ -63,5 +64,6 @@ docbook_xsl_stylesheets_sysroot_preprocess () { | |||
| 63 | sed -i -e "s|file:///usr/share/xml|file://${datadir}/xml|g" ${SYSROOT_DESTDIR}${sysconfdir}/xml/docbook-xsl.xml | 64 | sed -i -e "s|file:///usr/share/xml|file://${datadir}/xml|g" ${SYSROOT_DESTDIR}${sysconfdir}/xml/docbook-xsl.xml |
| 64 | } | 65 | } |
| 65 | 66 | ||
| 67 | RDEPENDS_${PN} += "perl" | ||
| 66 | FILES_${PN} = "${datadir}/xml/* ${sysconfdir}/xml/docbook-xsl.xml" | 68 | FILES_${PN} = "${datadir}/xml/* ${sysconfdir}/xml/docbook-xsl.xml" |
| 67 | FILES_${PN}-doc = "${datadir}/doc/*" | 69 | FILES_${PN}-doc = "${datadir}/doc/*" |
