From 1eca8ea3f78d72119e00ce9725e3ee5802d73eb8 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Wed, 25 May 2016 13:10:39 +0300 Subject: docbook-xsl-stylesheets: Upgrade 1.78.1 -> 1.79.1 * Use $PV at appropriate places in do_install * Install some new files, avoid installing 25M of java archives * License checksum change is just copyright years changing * Fix the URI delegation file (that prevents fetches from http://docbook.sourceforge.net/ during build) to refer to a non-versioned directory (From OE-Core rev: 1384ccd920f302d75bfb99fb5557203f8bc02af4) Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../docbook-xsl-stylesheets/docbook-xsl.xml | 4 +- .../docbook-xml/docbook-xsl-stylesheets_1.78.1.bb | 74 ---------------------- .../docbook-xml/docbook-xsl-stylesheets_1.79.1.bb | 74 ++++++++++++++++++++++ 3 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb (limited to 'meta') diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml index a1a576a2ec..c60555ae14 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml +++ b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml @@ -1,6 +1,6 @@ - - + + 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 deleted file mode 100644 index 52de3ab040..0000000000 --- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb +++ /dev/null @@ -1,74 +0,0 @@ -SUMMARY = "XSL stylesheets for processing DocBook XML to various output formats" -HOMEPAGE = "http://docbook.sourceforge.net" -LICENSE = "XSL" -LIC_FILES_CHKSUM = "file://COPYING;md5=a6eeeed43d498c22a835382533356462" - -SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-xsl-${PV}.tar.bz2 \ - file://docbook-xsl.xml \ - file://docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch \ -" - -SRC_URI[md5sum] = "6dd0f89131cc35bf4f2ed105a1c17771" -SRC_URI[sha256sum] = "c98f7296ab5c8ccd2e0bc07634976a37f50847df2d8a59bdb1e157664700b467" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/docbook/files/docbook-xsl/" -# Reject versions ending in .0 as those are release candidates -UPSTREAM_CHECK_REGEX = "/docbook-xsl/(?P(\d+[\.\-_]*)+(?!\.0)\.\d+)/" - -S = "${WORKDIR}/docbook-xsl-${PV}" - -inherit allarch -BBCLASSEXTEND = "native" - -SSTATEPOSTINSTFUNCS_append_class-native = " docbook_xsl_stylesheets_sstate_postinst" -SYSROOT_PREPROCESS_FUNCS_append_class-native = " docbook_xsl_stylesheets_sysroot_preprocess" - -do_configure (){ - : -} - -do_compile (){ - : -} - -do_install () { - # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-xsl.html - # for details. - install -v -m755 -d ${D}${datadir}/xml/docbook/xsl-stylesheets-${PV} - ln -s xsl-stylesheets-${PV} ${D}${datadir}/xml/docbook/xsl-stylesheets - - cp -v -R VERSION common eclipse epub extensions fo highlighting html \ - htmlhelp images javahelp lib manpages params profiling \ - roundtrip slides template tests tools webhelp website \ - xhtml xhtml-1_1 catalog.xml \ - ${D}${datadir}/xml/docbook/xsl-stylesheets-1.78.1 - - ln -s VERSION ${D}/${datadir}/xml/docbook/xsl-stylesheets-1.78.1/VERSION.xsl - - install -v -m644 -D README \ - ${D}${datadir}/doc/docbook-xsl-1.78.1/README.txt - install -v -m644 RELEASE-NOTES* NEWS* \ - ${D}${datadir}/doc/docbook-xsl-1.78.1 - - install -d ${D}${sysconfdir}/xml/ - install -m 755 ${WORKDIR}/docbook-xsl.xml ${D}${sysconfdir}/xml/docbook-xsl.xml - -} - -docbook_xsl_stylesheets_sstate_postinst () { - if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] - then - # Ensure that the catalog file sgml-docbook.cat is properly - # updated when the package is installed from sstate cache. - sed -i -e "s|file://.*/usr/share/xml|file://${datadir}/xml|g" ${SYSROOT_DESTDIR}${sysconfdir}/xml/docbook-xsl.xml - fi -} - -docbook_xsl_stylesheets_sysroot_preprocess () { - # Update the hardcode dir in docbook-xml.xml - sed -i -e "s|file:///usr/share/xml|file://${datadir}/xml|g" ${SYSROOT_DESTDIR}${sysconfdir}/xml/docbook-xsl.xml -} - -RDEPENDS_${PN} += "perl" -FILES_${PN} = "${datadir}/xml/* ${sysconfdir}/xml/docbook-xsl.xml" -FILES_${PN}-doc = "${datadir}/doc/*" diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb new file mode 100644 index 0000000000..aa03a82a2a --- /dev/null +++ b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb @@ -0,0 +1,74 @@ +SUMMARY = "XSL stylesheets for processing DocBook XML to various output formats" +HOMEPAGE = "http://docbook.sourceforge.net" +LICENSE = "XSL" +LIC_FILES_CHKSUM = "file://COPYING;md5=6beadd98f9c54ab0c387e14211ee4d0e" + +SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-xsl-${PV}.tar.bz2 \ + file://docbook-xsl.xml \ + file://docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch \ +" + +SRC_URI[md5sum] = "b48cbf929a2ad85e6672f710777ca7bc" +SRC_URI[sha256sum] = "725f452e12b296956e8bfb876ccece71eeecdd14b94f667f3ed9091761a4a968" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/docbook/files/docbook-xsl/" +# Reject versions ending in .0 as those are release candidates +UPSTREAM_CHECK_REGEX = "/docbook-xsl/(?P(\d+[\.\-_]*)+(?!\.0)\.\d+)/" + +S = "${WORKDIR}/docbook-xsl-${PV}" + +inherit allarch +BBCLASSEXTEND = "native" + +SSTATEPOSTINSTFUNCS_append_class-native = " docbook_xsl_stylesheets_sstate_postinst" +SYSROOT_PREPROCESS_FUNCS_append_class-native = " docbook_xsl_stylesheets_sysroot_preprocess" + +do_configure (){ + : +} + +do_compile (){ + : +} + +do_install () { + # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-xsl.html + # for details. + install -v -m755 -d ${D}${datadir}/xml/docbook/xsl-stylesheets-${PV} + ln -s xsl-stylesheets-${PV} ${D}${datadir}/xml/docbook/xsl-stylesheets + + cp -v -R VERSION assembly common eclipse epub epub3 fo \ + highlighting html htmlhelp images javahelp lib manpages \ + params profiling roundtrip slides template webhelp website \ + xhtml xhtml-1_1 xhtml5 catalog.xml \ + ${D}${datadir}/xml/docbook/xsl-stylesheets-${PV} + + ln -s VERSION ${D}/${datadir}/xml/docbook/xsl-stylesheets-${PV}/VERSION.xsl + + install -v -m644 -D README \ + ${D}${datadir}/doc/docbook-xsl-${PV}/README.txt + install -v -m644 RELEASE-NOTES* NEWS* \ + ${D}${datadir}/doc/docbook-xsl-${PV} + + install -d ${D}${sysconfdir}/xml/ + install -m 755 ${WORKDIR}/docbook-xsl.xml ${D}${sysconfdir}/xml/docbook-xsl.xml + +} + +docbook_xsl_stylesheets_sstate_postinst () { + if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] + then + # Ensure that the catalog file sgml-docbook.cat is properly + # updated when the package is installed from sstate cache. + sed -i -e "s|file://.*/usr/share/xml|file://${datadir}/xml|g" ${SYSROOT_DESTDIR}${sysconfdir}/xml/docbook-xsl.xml + fi +} + +docbook_xsl_stylesheets_sysroot_preprocess () { + # Update the hardcode dir in docbook-xml.xml + sed -i -e "s|file:///usr/share/xml|file://${datadir}/xml|g" ${SYSROOT_DESTDIR}${sysconfdir}/xml/docbook-xsl.xml +} + +RDEPENDS_${PN} += "perl" +FILES_${PN} = "${datadir}/xml/* ${sysconfdir}/xml/docbook-xsl.xml" +FILES_${PN}-doc = "${datadir}/doc/*" -- cgit v1.2.3-54-g00ecf