Skip to contentSkip to conversation

Enable manpages wherever possible; drop SGML stack

PATCH In review Alexander Kanavin 2 participants 29 messages Oct 28, 2016 – Oct 31, 2016

lore
Share & tools
lore
#0 lore raw

v2 cover Enable manpages wherever possible; drop SGML stack

This patchset eanbles (conditional) building of manpages in various recipes; there's plenty more recipes where manpages are supplied pre-built, for them nothing needs to be done. These changes enable better support for API documentation in Yocto SDKs (https://bugzilla.yoctoproject.org/show_bug.cgi?id=8584).

Bonus feature: the entire SGML stack is removed from OE-Core. It has become basically obsolete, and not needed by anything in either OE-Core or broader meta-oe collection of layers. If you need it in your 3rd party layer, please create meta-sgml.

V2 of the patch adds fixes for lttng-tools dependency issue (unrelated to manpages, but uncovered by enabling them). Also documentation packages are now added to SDK images.

The following changes since commit e5815d0b607ff262663864d51fe51fbb37172329:

build-appliance-image: Update to master head revision (2016-10-26 09:33:57 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib akanavin/enable-documentation
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/enable-documentation

Alexander Kanavin (26):
manpages.bbclass: add a class
gummiboot: enable optional building of manpages
pm-utils: enable optional building of manpages
systemd-boot: add a comment about manpages being disabled
avahi: enable manpages
glib: enable optional building of manpages
systemd: enable building of manpages if api-documentation feature is
in distro features
pixz: enable optional building of manpages
gtk+: enable optional building of manpages
json-glib: enable optional building of manpages
libsecret: enable optional building of manpages
libdrm: enable optional building of manpages
kmod: enable optional building of manpages
lttng: enable optional building of manpages
alsa-utils: enable optional building of manpages
pulseaudio: enable optional building of manpages
btrfs-tools: enable optional building of manpages
libuser: do not depend on SGML stack
systemd: do not depend on SGML stack
gtk+: remove dependency on SGML stack
gtk+3: remove SGML stack dependency
iputils: do not build or install manpages
Remove the SGML stack
lttng-tools: do not install manpages in ptest package
lttng-tools: do not install shared libraries in ptest package core-image-{lsb/rt/sato}: add documentation packages to the SDK images

 meta/classes/manpages.bbclass                      |   5 +
 meta/recipes-bsp/gummiboot/gummiboot_git.bb        |   6 +-
 meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb        |   4 +-
 meta/recipes-bsp/systemd-boot/systemd-boot.bb      |   1 +
 meta/recipes-connectivity/avahi/avahi.inc          |   2 +-
 meta/recipes-core/glib-2.0/glib.inc                |   5 +-
 meta/recipes-core/systemd/systemd_230.bb           |   4 +-
 .../btrfs-tools/btrfs-tools_4.7.1.bb               |   4 +-
 .../docbook-dsssl-stylesheets-native_1.79.bb       |  71 ------------
 .../docbook-sgml-dtd-3.1-native_3.1.bb             |  26 -----
 .../docbook-sgml-dtd-4.1-native_4.1.bb             |  26 -----
 .../docbook-sgml-dtd-4.5-native.bb                 |  18 ---
 .../docbook-sgml-dtd/docbook-sgml-dtd-native.inc   |  70 ------------
 .../docbook-sgml-dtd/files/LICENSE-OASIS           |  16 ---
 .../docbook-utils/docbook-utils-0.6.14/re.patch    |  29 -----
 .../docbook-utils/docbook-utils-native_0.6.14.bb   |  63 -----------
 .../linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb |  26 -----
 .../linuxdoc-tools/disable_dvips_doc.patch         |  33 ------
 .../linuxdoc-tools/disable_sgml2rtf.patch          |  64 -----------
 .../linuxdoc-tools/disable_tex_doc.patch           |  29 -----
 .../linuxdoc-tools/disable_txt_doc.patch           |  36 ------
 .../openjade/openjade-1.3.2/fix-regex.patch        |  32 ------
 .../openjade/openjade-1.3.2/makefile.patch         |  39 -------
 .../openjade/openjade-1.3.2/msggen.pl.patch        |  44 --------
 .../openjade/openjade-1.3.2/no-libtool.patch       |  20 ----
 .../openjade/openjade-1.3.2/reautoconf.patch       |  83 --------------
 .../user-declared-default-constructor.patch        |  92 ----------------
 .../openjade/openjade-native_1.3.2.bb              | 121 ---------------------
 .../opensp-1.5.2/obsolete_automake_macros.patch    |  15 ---
 meta/recipes-devtools/opensp/opensp_1.5.2.bb       |  59 ----------
 .../sgml-common/sgml-common-0.6.3/autohell.patch   |  61 -----------
 .../sgml-common/sgml-common-0.6.3/license.patch    |  29 -----
 .../sgml-common/sgml-common-native_0.6.3.bb        |  70 ------------
 .../sgml-common/sgml-common_0.6.3.bb               |  68 ------------
 .../recipes-devtools/sgmlspl/sgmlspl-native_git.bb |  21 ----
 meta/recipes-extended/images/core-image-lsb-sdk.bb |   2 +-
 meta/recipes-extended/iputils/iputils_s20151218.bb |  11 +-
 meta/recipes-extended/libuser/libuser_0.62.bb      |   2 +-
 meta/recipes-extended/pixz/pixz_1.0.6.bb           |   5 +-
 meta/recipes-gnome/gtk+/gtk+.inc                   |   5 +-
 meta/recipes-gnome/gtk+/gtk+3.inc                  |   2 +-
 meta/recipes-gnome/json-glib/json-glib_1.2.2.bb    |   4 +-
 meta/recipes-gnome/libsecret/libsecret_0.18.5.bb   |   4 +-
 meta/recipes-graphics/drm/libdrm_2.4.70.bb         |   4 +-
 meta/recipes-kernel/kmod/kmod.inc                  |   5 +-
 meta/recipes-kernel/lttng/lttng-tools_git.bb       |  10 +-
 meta/recipes-kernel/lttng/lttng-ust_git.bb         |   4 +-
 meta/recipes-multimedia/alsa/alsa-utils_1.1.2.bb   |   4 +-
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |   3 +-
 meta/recipes-rt/images/core-image-rt-sdk.bb        |   2 +-
 meta/recipes-sato/images/core-image-sato-sdk.bb    |   2 +-
 51 files changed, 59 insertions(+), 1302 deletions(-)
 create mode 100644 meta/classes/manpages.bbclass
 delete mode 100644 meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
 delete mode 100644 meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native_3.1.bb
 delete mode 100644 meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native_4.1.bb
 delete mode 100644 meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb
 delete mode 100644 meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
 delete mode 100644 meta/recipes-devtools/docbook-sgml-dtd/files/LICENSE-OASIS
 delete mode 100644 meta/recipes-devtools/docbook-utils/docbook-utils-0.6.14/re.patch
 delete mode 100644 meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
 delete mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
 delete mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch
 delete mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch
 delete mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch
 delete mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch
 delete mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch
 delete mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch
 delete mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
 delete mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch
 delete mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch
 delete mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch
 delete mode 100644 meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
 delete mode 100644 meta/recipes-devtools/opensp/opensp-1.5.2/obsolete_automake_macros.patch
 delete mode 100644 meta/recipes-devtools/opensp/opensp_1.5.2.bb
 delete mode 100644 meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch
 delete mode 100644 meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch
 delete mode 100644 meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb
 delete mode 100644 meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb
 delete mode 100644 meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb
Signature · 1 line
2.9.3
#1 lore raw

PATCH v2 1/26 manpages.bbclass: add a class

This class enables 'manpages' feature in packages if 'api-documentation' is in distro features. This ensures that manpages are always built and installed when API documentation feature is enabled.

---
 meta/classes/manpages.bbclass | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 meta/classes/manpages.bbclass
meta/classes/manpages.bbclass new file +5 -0
new file mode 100644
index 0000000..d16237b
@@ -0,0 +1,5 @@
+# Inherit this class to enable or disable building and installation of manpages
+# depending on whether 'api-documentation' is in DISTRO_FEATURES. Such building
+# tends to pull in the entire XML stack and other tools, so it's not enabled
+# by default.
+PACKAGECONFIG_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'manpages', '', d)}"
Signature · 1 line
2.9.3
#2 lore raw

PATCH v2 2/26 gummiboot: enable optional building of manpages

In reply to Alexander Kanavin
---
 meta/recipes-bsp/gummiboot/gummiboot_git.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-bsp/gummiboot/gummiboot_git.bb +4 -2
index 376ab54..c684b83 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"
 
 DEPENDS = "gnu-efi util-linux"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig manpages
 inherit deploy
 
 PV = "48+git${SRCPV}"
@@ -16,6 +16,8 @@ SRC_URI = "git://anongit.freedesktop.org/gummiboot \
            file://0001-console-Fix-C-syntax-errors-for-function-declaration.patch \
           "
 
+PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
+
 # Note: Add COMPATIBLE_HOST here is only because it depends on gnu-efi
 # which has set the COMPATIBLE_HOST, the gummiboot itself may work on
 # more hosts.
@@ -23,7 +25,7 @@ COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OECONF = "--disable-manpages --with-efi-includedir=${STAGING_INCDIR} \
+EXTRA_OECONF = "--with-efi-includedir=${STAGING_INCDIR} \
                 --with-efi-ldsdir=${STAGING_LIBDIR} \
                 --with-efi-libdir=${STAGING_LIBDIR}"
 
Signature · 1 line
2.9.3
#3 lore raw

PATCH v2 3/26 pm-utils: enable optional building of manpages

In reply to Alexander Kanavin
---
 meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb +3 -1
index 27cb3db..cac0910 100644
@@ -13,7 +13,9 @@ SRC_URI = "http://pm-utils.freedesktop.org/releases/pm-utils-${PV}.tar.gz"
 SRC_URI[md5sum] = "1742a556089c36c3a89eb1b957da5a60"
 SRC_URI[sha256sum] = "8ed899032866d88b2933a1d34cc75e8ae42dcde20e1cc21836baaae3d4370c0b"
 
-inherit pkgconfig autotools
+inherit pkgconfig autotools manpages
+
+PACKAGECONFIG[manpages] = "--enable-doc, --disable-doc, libxslt-native xmlto-native"
 
 RDEPENDS_${PN} = "grep bash"
 
Signature · 1 line
2.9.3
#4 lore raw

PATCH v2 4/26 systemd-boot: add a comment about manpages being disabled

In reply to Alexander Kanavin
---
 meta/recipes-bsp/systemd-boot/systemd-boot.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-bsp/systemd-boot/systemd-boot.bb +1 -0
index 5b1164e..7036664 100644
@@ -7,6 +7,7 @@ SRC_URI += "file://0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.pat
 inherit autotools pkgconfig gettext
 inherit deploy
 
+# Man pages are packaged through the main systemd recipe
 EXTRA_OECONF = " --enable-gnuefi \
                  --with-efi-includedir=${STAGING_INCDIR} \
                  --with-efi-ldsdir=${STAGING_LIBDIR} \
Signature · 1 line
2.9.3
#5 lore raw

PATCH v2 5/26 avahi: enable manpages

In reply to Alexander Kanavin

They come prebuilt and don't require any dependencies, so there is no penalty in enabling them.

---
 meta/recipes-connectivity/avahi/avahi.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/avahi/avahi.inc +1 -1
index 234646d..cb36802 100644
@@ -54,7 +54,7 @@ EXTRA_OECONF = "--with-avahi-priv-access-group=adm \
              --disable-qt4 \
              --disable-python \
              --disable-doxygen-doc \
-             --disable-manpages \
+             --enable-manpages \
              ${EXTRA_OECONF_SYSVINIT} \
              ${EXTRA_OECONF_SYSTEMD} \
            "
Signature · 1 line
2.9.3
#6 lore raw

PATCH v2 6/26 glib: enable optional building of manpages

In reply to Alexander Kanavin
---
 meta/recipes-core/glib-2.0/glib.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/glib-2.0/glib.inc +3 -2
index 906e0d4..07d8734 100644
@@ -26,15 +26,16 @@ PACKAGES += "${PN}-codegen ${PN}-utils"
 
 LEAD_SONAME = "libglib-2.0.*"
 
-inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache python3native
+inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache python3native manpages
 
 S = "${WORKDIR}/glib-${PV}"
 
 PACKAGECONFIG ??= "system-pcre"
 # To use the system pcre it must be configured with --enable-unicode-properties
 PACKAGECONFIG[system-pcre] = "--with-pcre=system,--with-pcre=internal,libpcre"
+PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog.xml, --disable-man, libxslt-native xmlto-native"
 
-CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man"
+CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap"
 
 PRINTF = "--enable-included-printf=no"
 PRINTF_darwin = "--enable-included-printf=yes"
Signature · 1 line
2.9.3
#7 lore raw

PATCH v2 7/26 systemd: enable building of manpages if api-documentation feature is in distro features

In reply to Alexander Kanavin
---
 meta/recipes-core/systemd/systemd_230.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_230.bb +1 -1
index a949fe8..f675036 100644
@@ -8,7 +8,7 @@ DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl rea
 
 SECTION = "base/shell"
 
-inherit useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext bash-completion
+inherit useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext bash-completion manpages
 
 SRC_URI += " \
            file://touchscreen.rules \
Signature · 1 line
2.9.3
#8 lore raw

PATCH v2 8/26 pixz: enable optional building of manpages

In reply to Alexander Kanavin
---
 meta/recipes-extended/pixz/pixz_1.0.6.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-extended/pixz/pixz_1.0.6.bb +3 -2
index 0e51472..3032586 100644
@@ -15,10 +15,11 @@ SRC_URI += "file://936d8068ae19d95260d3058f41dd6cf718101cd6.patch \
 "
 UPSTREAM_CHECK_URI = "https://github.com/vasi/pixz/releases"
 
-EXTRA_OECONF += "--without-manpage"
+PACKAGECONFIG[manpages] = "--with-manpage, --without-manpage, asciidoc-native"
+
 CFLAGS_append_libc-musl = " -D_GNU_SOURCE"
 CACHED_CONFIGUREVARS += "ac_cv_file_src_pixz_1=no"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig manpages
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.9.3
#9 lore raw

PATCH v2 9/26 gtk+: enable optional building of manpages

In reply to Alexander Kanavin
---
 meta/recipes-gnome/gtk+/gtk+.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-gnome/gtk+/gtk+.inc +2 -1
index c240baa..751bc49 100644
@@ -28,8 +28,9 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}
 PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
 # without --with-gdktarget=directfb it will check for cairo-xlib which isn't available without X11 DISTRO_FEATURE
 PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb"
+PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog.xml, --disable-man, libxslt-native xmlto-native"
 
-inherit autotools gtk-doc pkgconfig update-alternatives gtk-immodules-cache gobject-introspection
+inherit autotools gtk-doc pkgconfig update-alternatives gtk-immodules-cache gobject-introspection manpages
 
 PACKAGES += "libgail gtk-demo"
 
Signature · 1 line
2.9.3
#10 lore raw

PATCH v2 10/26 json-glib: enable optional building of manpages

In reply to Alexander Kanavin
---
 meta/recipes-gnome/json-glib/json-glib_1.2.2.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-gnome/json-glib/json-glib_1.2.2.bb +3 -1
index 8df2a42..4e272be 100644
@@ -13,6 +13,8 @@ DEPENDS = "glib-2.0"
 SRC_URI[archive.md5sum] = "c1daefb8d0fb59612af0c072c8aabb58"
 SRC_URI[archive.sha256sum] = "ea128ab52a824fcd06e5448fbb2bd8d9a13740d51c66d445828edba71321a621"
 
-inherit gnomebase gettext lib_package gobject-introspection gtk-doc
+inherit gnomebase gettext lib_package gobject-introspection gtk-doc manpages
+
+PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog.xml, --disable-man, libxslt-native xmlto-native"
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.9.3
#11 lore raw

PATCH v2 11/26 libsecret: enable optional building of manpages

In reply to Alexander Kanavin
---
 meta/recipes-gnome/libsecret/libsecret_0.18.5.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-gnome/libsecret/libsecret_0.18.5.bb +2 -2
index bcb3046..77b9fd5 100644
@@ -2,11 +2,11 @@ SUMMARY = "libsecret is a library for storing and retrieving passwords and other
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6"
 
-inherit gnomebase gtk-doc vala gobject-introspection
+inherit gnomebase gtk-doc vala gobject-introspection manpages
 
 DEPENDS += "glib-2.0 libgcrypt gettext-native intltool-native"
 
-EXTRA_OECONF += "--disable-manpages"
+PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
 
 SRC_URI[archive.md5sum] = "2d688825921313da8731313b0a7f394c"
 SRC_URI[archive.sha256sum] = "9ce7bd8dd5831f2786c935d82638ac428fa085057cc6780aba0e39375887ccb3"
Signature · 1 line
2.9.3
#12 lore raw

PATCH v2 12/26 libdrm: enable optional building of manpages

In reply to Alexander Kanavin
---
 meta/recipes-graphics/drm/libdrm_2.4.70.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/drm/libdrm_2.4.70.bb +2 -2
index a2b5282..1811927 100644
@@ -19,15 +19,15 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
 SRC_URI[md5sum] = "920957cfe25a80efb02be9bd90bf3c1e"
 SRC_URI[sha256sum] = "b17d4b39ed97ca0e4cffa0db06ff609e617bac94646ec38e8e0579d530540e7b"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig manpages
 
 EXTRA_OECONF += "--disable-cairo-tests \
                  --without-cunit \
                  --enable-omap-experimental-api \
                  --enable-install-test-programs \
-                 --disable-manpages \
                  --disable-valgrind \
                 "
+PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
 
 ALLOW_EMPTY_${PN}-drivers = "1"
 PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \
Signature · 1 line
2.9.3
#13 lore raw

PATCH v2 13/26 kmod: enable optional building of manpages

In reply to Alexander Kanavin
---
 meta/recipes-kernel/kmod/kmod.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-kernel/kmod/kmod.inc +3 -2
index 166b3f0..a59c305 100644
@@ -12,7 +12,7 @@ SECTION = "base"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                    "
-inherit autotools gtk-doc pkgconfig
+inherit autotools gtk-doc pkgconfig manpages
 
 SRCREV = "65a885df5f6f15222b44fd695c5eaca17e837a14"
 # Lookout for PV bump too when SRCREV is changed
@@ -27,10 +27,11 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
 S = "${WORKDIR}/git"
 
 EXTRA_AUTORECONF += "--install --symlink"
-EXTRA_OECONF +=" --enable-tools --disable-manpages --with-zlib"
+EXTRA_OECONF +=" --enable-tools --with-zlib"
 
 PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
 PACKAGECONFIG[logging] = " --enable-logging,--disable-logging"
+PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
 
 do_configure_prepend () {
         gtkdocize --docdir ${S}/libkmod/docs --srcdir ${S}
Signature · 1 line
2.9.3
#14 lore raw

PATCH v2 14/26 lttng: enable optional building of manpages

In reply to Alexander Kanavin
---
 meta/recipes-kernel/lttng/lttng-tools_git.bb | 4 ++--
 meta/recipes-kernel/lttng/lttng-ust_git.bb   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
meta/recipes-kernel/lttng/lttng-tools_git.bb +2 -2
index bfc657b..016346f 100644
@@ -26,7 +26,7 @@ PACKAGECONFIG ??= "lttng-ust"
 PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native"
 PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust"
 PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod"
-PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native"
+PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"
 PACKAGECONFIG_remove_libc-musl = "lttng-ust"
 
 SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \
@@ -35,7 +35,7 @@ SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \
 
 S = "${WORKDIR}/git"
 
-inherit autotools-brokensep ptest pkgconfig useradd python3-dir
+inherit autotools-brokensep ptest pkgconfig useradd python3-dir manpages
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "tracing"
meta/recipes-kernel/lttng/lttng-ust_git.bb +2 -2
index baff71f..07ce2f4 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \
                     file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \
                     file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"
 
-inherit autotools lib_package
+inherit autotools lib_package manpages
 
 DEPENDS = "liburcu util-linux"
 RDEPENDS_${PN}-bin = "python3-core"
@@ -26,7 +26,7 @@ SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.8 \
            file://lttng-ust-doc-examples-disable.patch \
           "
 
-EXTRA_OECONF += "--disable-man-pages"
+PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"
 
 do_install_append() {
         # Patch python tools to use Python 3; they should be source compatible, but
Signature · 1 line
2.9.3
#15 lore raw

PATCH v2 15/26 alsa-utils: enable optional building of manpages

In reply to Alexander Kanavin

'xmlto' package feature is renamed to 'manpages' for consistency with other manpage-enabled recipes.

---
 meta/recipes-multimedia/alsa/alsa-utils_1.1.2.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-multimedia/alsa/alsa-utils_1.1.2.bb +2 -2
index a22d999..e1651ae 100644
@@ -17,7 +17,7 @@ PACKAGECONFIG ??= "udev"
 PACKAGECONFIG[bat] = "--enable-bat,--disable-bat,fftwf"
 
 PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,,udev"
-PACKAGECONFIG[xmlto] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
+PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
@@ -32,7 +32,7 @@ SRC_URI[sha256sum] = "7af603c0877d1251599d65b4fbc372e63a54371b888f5c26c6a86ac1d0
 #
 EXTRA_OECONF_append_libc-uclibc = " --disable-nls"
 
-inherit autotools gettext pkgconfig
+inherit autotools gettext pkgconfig manpages
 
 # This are all packages that we need to make. Also, the now empty alsa-utils
 # ipk depends on them.
Signature · 1 line
2.9.3
#16 lore raw

PATCH v2 16/26 pulseaudio: enable optional building of manpages

In reply to Alexander Kanavin
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-multimedia/pulseaudio/pulseaudio.inc +2 -1
index 7e54ad4..f5c5ed2 100644
@@ -13,7 +13,7 @@ DEPENDS = "libatomic-ops libsndfile1 libtool intltool-native"
 DEPENDS += "udev alsa-lib glib-2.0 gconf"
 DEPENDS += "json-c gdbm speexdsp libxml-parser-perl-native libcap"
 
-inherit autotools bash-completion pkgconfig useradd gettext perlnative bluetooth systemd
+inherit autotools bash-completion pkgconfig useradd gettext perlnative bluetooth systemd manpages
 
 # *.desktop rules wont be generated during configure and build will fail
 # if using --disable-nls
@@ -62,6 +62,7 @@ PACKAGECONFIG[autospawn-for-root] = ",,,"
 PACKAGECONFIG[lirc] = "--enable-lirc,--disable-lirc,lirc"
 PACKAGECONFIG[webrtc] = "--enable-webrtc-aec,--disable-webrtc-aec,webrtc-audio-processing"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
+PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, "
 
 EXTRA_OECONF_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}"
 EXTRA_OECONF_append_armeb = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}"
Signature · 1 line
2.9.3
#17 lore raw

PATCH v2 17/26 btrfs-tools: enable optional building of manpages

In reply to Alexander Kanavin
---
 meta/recipes-devtools/btrfs-tools/btrfs-tools_4.7.1.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools_4.7.1.bb +2 -2
index becf093..36695c9 100644
@@ -18,9 +18,9 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://fix-parallel.patch \
 "
 
-inherit autotools-brokensep pkgconfig
+inherit autotools-brokensep pkgconfig manpages
 
-EXTRA_OECONF += "--disable-documentation"
+PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native"
 EXTRA_OECONF_append_libc-musl = " --disable-backtrace "
 
 
Signature · 1 line
2.9.3
#18 lore raw

PATCH v2 18/26 libuser: do not depend on SGML stack

In reply to Alexander Kanavin

libuser tarballs already supply pre-generated html/txt outputs.

---
 meta/recipes-extended/libuser/libuser_0.62.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/libuser/libuser_0.62.bb +1 -1
index 3d0b516..6960d71 100644
@@ -20,7 +20,7 @@ SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz \
 SRC_URI[md5sum] = "63e5e5c551e99dc5302b40b80bd6d4f2"
 SRC_URI[sha256sum] = "a58ff4fabb01a25043b142185a33eeea961109dd60d4b40b6a9df4fa3cace20b"
 
-DEPENDS = "popt libpam glib-2.0 docbook-utils-native linuxdoc-tools-native python3"
+DEPENDS = "popt libpam glib-2.0 python3"
 
 inherit autotools gettext python3native python3-dir pkgconfig gtk-doc
 
Signature · 1 line
2.9.3
#19 lore raw

PATCH v2 19/26 systemd: do not depend on SGML stack

In reply to Alexander Kanavin

I couldn't find any reference whatsoever to it in the source tree.

---
 meta/recipes-core/systemd/systemd_230.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_230.bb +1 -1
index f675036..542f99d 100644
@@ -4,7 +4,7 @@ PROVIDES = "udev"
 
 PE = "1"
 
-DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline libcap libcgroup qemu-native util-linux"
+DEPENDS = "kmod intltool-native gperf-native acl readline libcap libcgroup qemu-native util-linux"
 
 SECTION = "base/shell"
 
Signature · 1 line
2.9.3
#20 lore raw

PATCH v2 20/26 gtk+: remove dependency on SGML stack

In reply to Alexander Kanavin

This means that FAQ and tutorial will not be built, but even when they were, they were not installed anywhere.

---
 meta/recipes-gnome/gtk+/gtk+.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-gnome/gtk+/gtk+.inc +1 -1
index 751bc49..b9b4721 100644
@@ -18,7 +18,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
 UPSTREAM_CHECK_REGEX = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)"
 
 X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite"
-DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \
+DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native \
  cairo gdk-pixbuf"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
Signature · 1 line
2.9.3
#21 lore raw

PATCH v2 21/26 gtk+3: remove SGML stack dependency

In reply to Alexander Kanavin

Gtk3 hasn't had it for a long time.

---
 meta/recipes-gnome/gtk+/gtk+3.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-gnome/gtk+/gtk+3.inc +1 -1
index 83e9b92..c3a96fa 100644
@@ -6,7 +6,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
 SECTION = "libs"
 
 DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \
-           docbook-utils-native gdk-pixbuf-native"
+           gdk-pixbuf-native"
 
 LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
 
Signature · 1 line
2.9.3
#22 lore raw

PATCH v2 22/26 iputils: do not build or install manpages

In reply to Alexander Kanavin

This allows dropping the SGML stack dependency, and iputils is the only package in oe-core that still needs it (for manpages only).

---
 meta/recipes-extended/iputils/iputils_s20151218.bb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
meta/recipes-extended/iputils/iputils_s20151218.bb +3 -8
index 7150454..0d4dd1b 100644
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f
                     file://arping.c;beginline=1;endline=11;md5=fe84301b5c2655c950f8b92a057fafa6 \
                     file://tftpd.c;beginline=1;endline=32;md5=28834bf8a91a5b8a92755dbee709ef96 "
 
-DEPENDS = "gnutls docbook-utils-native sgmlspl-native libcap libgcrypt"
+DEPENDS = "gnutls libcap libgcrypt"
 
 
 SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \
@@ -30,11 +30,11 @@ UPSTREAM_CHECK_REGEX = "iputils-(?P<pver>s\d+).tar"
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
 do_compile () {
-	oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}" all man
+	oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}" all
 }
 
 do_install () {
-	install -m 0755 -d ${D}${base_bindir} ${D}${mandir}/man8
+	install -m 0755 -d ${D}${base_bindir}
 	# SUID root programs
 	install -m 4555 ping ${D}${base_bindir}/ping
 	install -m 4555 ping6 ${D}${base_bindir}/ping6
@@ -44,10 +44,6 @@ do_install () {
 	for i in arping tracepath tracepath6; do
 	  install -m 0755 $i ${D}${base_bindir}/
 	done
-	# Manual pages for things we build packages for
-	for i in tracepath.8 traceroute6.8 ping.8 arping.8; do
-	  install -m 0644 doc/$i ${D}${mandir}/man8/ || true
-	done
 }
 
 inherit update-alternatives
@@ -73,4 +69,3 @@ FILES_${PN}-tracepath = "${base_bindir}/tracepath"
 FILES_${PN}-tracepath6 = "${base_bindir}/tracepath6"
 FILES_${PN}-traceroute6	= "${base_bindir}/traceroute6"
 FILES_${PN}-clockdiff = "${base_bindir}/clockdiff"
-FILES_${PN}-doc	= "${mandir}/man8"
Signature · 1 line
2.9.3
#23 lore raw

PATCH v2 23/26 Remove the SGML stack

In reply to Alexander Kanavin

It is not used for anything, and is something of a pain to maintain.

---
 .../docbook-dsssl-stylesheets-native_1.79.bb       |  71 ------------
 .../docbook-sgml-dtd-3.1-native_3.1.bb             |  26 -----
 .../docbook-sgml-dtd-4.1-native_4.1.bb             |  26 -----
 .../docbook-sgml-dtd-4.5-native.bb                 |  18 ---
 .../docbook-sgml-dtd/docbook-sgml-dtd-native.inc   |  70 ------------
 .../docbook-sgml-dtd/files/LICENSE-OASIS           |  16 ---
 .../docbook-utils/docbook-utils-0.6.14/re.patch    |  29 -----
 .../docbook-utils/docbook-utils-native_0.6.14.bb   |  63 -----------
 .../linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb |  26 -----
 .../linuxdoc-tools/disable_dvips_doc.patch         |  33 ------
 .../linuxdoc-tools/disable_sgml2rtf.patch          |  64 -----------
 .../linuxdoc-tools/disable_tex_doc.patch           |  29 -----
 .../linuxdoc-tools/disable_txt_doc.patch           |  36 ------
 .../openjade/openjade-1.3.2/fix-regex.patch        |  32 ------
 .../openjade/openjade-1.3.2/makefile.patch         |  39 -------
 .../openjade/openjade-1.3.2/msggen.pl.patch        |  44 --------
 .../openjade/openjade-1.3.2/no-libtool.patch       |  20 ----
 .../openjade/openjade-1.3.2/reautoconf.patch       |  83 --------------
 .../user-declared-default-constructor.patch        |  92 ----------------
 .../openjade/openjade-native_1.3.2.bb              | 121 ---------------------
 .../opensp-1.5.2/obsolete_automake_macros.patch    |  15 ---
 meta/recipes-devtools/opensp/opensp_1.5.2.bb       |  59 ----------
 .../sgml-common/sgml-common-0.6.3/autohell.patch   |  61 -----------
 .../sgml-common/sgml-common-0.6.3/license.patch    |  29 -----
 .../sgml-common/sgml-common-native_0.6.3.bb        |  70 ------------
 .../sgml-common/sgml-common_0.6.3.bb               |  68 ------------
 .../recipes-devtools/sgmlspl/sgmlspl-native_git.bb |  21 ----
 27 files changed, 1261 deletions(-)
 delete mode 100644 meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
 delete mode 100644 meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native_3.1.bb
 delete mode 100644 meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native_4.1.bb
 delete mode 100644 meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb
 delete mode 100644 meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
 delete mode 100644 meta/recipes-devtools/docbook-sgml-dtd/files/LICENSE-OASIS
 delete mode 100644 meta/recipes-devtools/docbook-utils/docbook-utils-0.6.14/re.patch
 delete mode 100644 meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
 delete mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
 delete mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch
 delete mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch
 delete mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch
 delete mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch
 delete mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch
 delete mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch
 delete mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
 delete mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch
 delete mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch
 delete mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch
 delete mode 100644 meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
 delete mode 100644 meta/recipes-devtools/opensp/opensp-1.5.2/obsolete_automake_macros.patch
 delete mode 100644 meta/recipes-devtools/opensp/opensp_1.5.2.bb
 delete mode 100644 meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch
 delete mode 100644 meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch
 delete mode 100644 meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb
 delete mode 100644 meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb
 delete mode 100644 meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb
meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb deleted +0 -71
deleted file mode 100644
index b7791f3..0000000
@@ -1,71 +0,0 @@
-SUMMARY = "DSSSL stylesheets used to transform SGML and XML DocBook files"
-HOMEPAGE = "http://docbook.sourceforge.net"
-# Simple persmissive
-LICENSE = "DSSSL"
-LIC_FILES_CHKSUM = "file://README;beginline=41;endline=74;md5=875385159b2ee76ecf56136ae7f542d6"
-
-DEPENDS = "sgml-common-native"
-
-PR = "r4"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-dsssl-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "bc192d23266b9a664ca0aba4a7794c7c"
-SRC_URI[sha256sum] = "2f329e120bee9ef42fbdd74ddd60e05e49786c5a7953a0ff4c680ae6bdf0e2bc"
-
-UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/docbook/files/docbook-dsssl/"
-UPSTREAM_CHECK_REGEX = "/docbook-dsssl/(?P<pver>(\d+[\.\-_]*)+)/"
-
-S = "${WORKDIR}/docbook-dsssl-${PV}"
-
-inherit native
-
-SSTATEPOSTINSTFUNCS += "docbook_dsssl_stylesheets_sstate_postinst"
-SYSROOT_PREPROCESS_FUNCS += "docbook_dsssl_sysroot_preprocess"
-CLEANFUNCS += "docbook_dsssl_stylesheets_sstate_clean"
-
-
-do_install () {
-	# Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-dsssl.html
-	# for details.
-	install -d ${D}${bindir}
-	install -m 0755 bin/collateindex.pl ${D}${bindir}
-
-	install -d ${D}${datadir}/sgml/docbook/dsssl-stylesheets-${PV}
-	install -m 0644 catalog ${D}${datadir}/sgml/docbook/dsssl-stylesheets-${PV}
-	cp -v -R * ${D}${datadir}/sgml/docbook/dsssl-stylesheets-${PV}
-
-	install -d ${D}${sysconfdir}/sgml
-	echo "CATALOG ${datadir}/sgml/docbook/dsssl-stylesheets-${PV}/catalog" > \
-		 ${D}${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
-	echo "CATALOG ${datadir}/sgml/docbook/dsssl-stylesheets-${PV}/common/catalog" >> \
-		${D}${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
-}
-
-docbook_dsssl_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.
-		${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl \
-			--add ${sysconfdir}/sgml/sgml-docbook.bak \
-			${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
-		${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl \
-			--add ${sysconfdir}/sgml/sgml-docbook.cat \
-			${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
-	fi
-}
-
-docbook_dsssl_sysroot_preprocess () {
-    install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
-    install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl
-}
-
-docbook_dsssl_stylesheets_sstate_clean () {
-	# Ensure that the catalog file sgml-docbook.cat is properly
-	# updated when the package is removed from sstate cache.
-	files="${sysconfdir}/sgml/sgml-docbook.bak ${sysconfdir}/sgml/sgml-docbook.cat"
-	for f in $files; do
-		[ ! -f $f ] || sed -i '/\/sgml\/dsssl-docbook-stylesheets.cat/d' $f
-	done
-}
meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native_3.1.bb deleted +0 -26
deleted file mode 100644
index a3ee5d8..0000000
@@ -1,26 +0,0 @@
-require docbook-sgml-dtd-native.inc
-
-LICENSE = "OASIS"
-LIC_FILES_CHKSUM = "file://LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e"
-
-DTD_VERSION = "3.1"
-
-PR = "${INC_PR}.0"
-
-# Note: the upstream sources are not distributed with a license file.
-# LICENSE-OASIS is included as a "patch" to workaround this. When
-# upgrading this recipe, please verify whether this is still needed.
-SRC_URI = "http://www.docbook.org/sgml/3.1/docbk31.zip \
-           file://LICENSE-OASIS"
-
-SRC_URI[md5sum] = "432749c0c806dbae81c8bcb70da3b5d3"
-SRC_URI[sha256sum] = "20261d2771b9a052abfa3d8fab1aa62be05791a010281c566f9073bf0e644538"
-
-UPSTREAM_CHECK_URI = "http://www.docbook.org/sgml/"
-UPSTREAM_CHECK_REGEX = "(?P<pver>3\..+)/"
-
-do_compile() {
-	# Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd-3.html
-	# for details.
-	sed -i -e '/ISO 8879/d' -e 's|DTDDECL "-//OASIS//DTD DocBook V3.1//EN"|SGMLDECL|g' docbook.cat
-}
meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native_4.1.bb deleted +0 -26
deleted file mode 100644
index be59680..0000000
@@ -1,26 +0,0 @@
-require docbook-sgml-dtd-native.inc
-
-LICENSE = "OASIS"
-LIC_FILES_CHKSUM = "file://LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e"
-
-DTD_VERSION = "4.1"
-
-PR = "${INC_PR}.0"
-
-# Note: the upstream sources are not distributed with a license file.
-# LICENSE-OASIS is included as a "patch" to workaround this. When
-# upgrading this recipe, please verify whether this is still needed.
-SRC_URI = "http://docbook.org/sgml/4.1/docbk41.zip \
-           file://LICENSE-OASIS"
-
-SRC_URI[md5sum] = "489f6ff2a2173eb1e14216c10533ede2"
-SRC_URI[sha256sum] = "deaafcf0a3677692e7ad4412c0e41c1db3e9da6cdcdb3dd32b2cc1f9c97d6311"
-
-UPSTREAM_CHECK_URI = "http://www.docbook.org/sgml/"
-UPSTREAM_CHECK_REGEX = "(?P<pver>4\.1(\.\d+)*)/"
-
-do_compile() {
-	# Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd.html
-	# for details.
-	sed -i -e '/ISO 8879/d' -e '/gml/d' docbook.cat
-}
meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb deleted +0 -18
deleted file mode 100644
index ae723c7..0000000
@@ -1,18 +0,0 @@
-require docbook-sgml-dtd-native.inc
-
-LICENSE = "OASIS"
-LIC_FILES_CHKSUM = "file://LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e"
-
-DTD_VERSION = "4.5"
-
-PR = "${INC_PR}.0"
-PV = "4.5"
-
-SRC_URI[md5sum] = "07c581f4bbcba6d3aac85360a19f95f7"
-SRC_URI[sha256sum] = "8043e514e80c6c19cb146b5d37937d1305bf3abf9b0097c36df7f70f611cdf43"
-
-do_compile() {
-	# Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd.html
-	# for details.
-	sed -i -e '/ISO 8879/d' -e'/gml/d' docbook.cat
-}
meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc deleted +0 -70

70 lines not on this page · raw message

meta/recipes-devtools/docbook-sgml-dtd/files/LICENSE-OASIS deleted +0 -16
deleted file mode 100644
index 6da7f5b..0000000
@@ -1,16 +0,0 @@
-Permission to use, copy, modify and distribute the DocBook XML DTD
-and its accompanying documentation for any purpose and without fee
-is hereby granted in perpetuity, provided that the above copyright
-notice and this paragraph appear in all copies.  The copyright
-holders make no representation about the suitability of the DTD for
-any purpose.  It is provided "as is" without expressed or implied
-warranty.
-
-If you modify the DocBook DTD in any way, except for declaring and
-referencing additional sets of general entities and declaring
-additional notations, label your DTD as a variant of DocBook.  See
-the maintenance documentation for more information.
-
-Please direct all questions, bug reports, or suggestions for 
-changes to the [email protected] mailing list. For more
-information, see http://www.oasis-open.org/docbook/.
meta/recipes-devtools/docbook-utils/docbook-utils-0.6.14/re.patch deleted +0 -29
deleted file mode 100644
index db079d6..0000000
@@ -1,29 +0,0 @@
-Upstream-Status: Pending
-
-Fix runtime error occurred e.g. with docbook-to-man calls:
-
-  grep: character class syntax is [[:space:]], not [:space:]
-  grep: character class syntax is [[:space:]], not [:space:]
-  jw: There is no frontend called "/docbook/utils-0.6.14/frontends/docbook".
-
-See also:
-
-   <https://qa.mandriva.com/show_bug.cgi?id=61127>
-
-Signed-off-by: Steffen Sledz <[email protected]>
-
-diff -Nurd docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
---- docbook-utils-0.6.14-orig/bin/jw.in	2012-03-29 07:50:00.789564826 +0200
-+++ docbook-utils-0.6.14/bin/jw.in	2012-03-29 07:52:10.371302967 +0200
-@@ -80,9 +80,9 @@
- SGML_CATALOGS_DIR="/etc/sgml"
- if [ -f "$SGML_CONF" ]
- then
--  RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*'
-+  RE='^[[:space:]]*SGML_BASE_DIR[[:space:]]*=[[:space:]]*'
-   SGML_BASE_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
--  RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*'
-+  RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*'
-   SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
- fi
- 
meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb deleted +0 -63

63 lines not on this page · raw message

meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb deleted +0 -26
deleted file mode 100644
index a5deb2e..0000000
@@ -1,26 +0,0 @@
-SUMMARY = "Convert LinuxDoc SGML source into other formats"
-HOMEPAGE = "http://packages.debian.org/linuxdoc-tools"
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=077ef64ec3ac257fb0d786531cf26931"
-
-DEPENDS = "groff-native openjade-native"
-
-SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/l/${BPN}/${BPN}_${PV}.orig.tar.gz \
-           file://disable_sgml2rtf.patch \
-           file://disable_txt_doc.patch \
-           file://disable_tex_doc.patch \
-           file://disable_dvips_doc.patch"
-
-SRC_URI[md5sum] = "1d13d500918a7a145b0edc2f16f61dd1"
-SRC_URI[sha256sum] = "7103facee18a2ea97186ca459d743d22f7f89ad4b5cd1dfd1c34f83d6bfd4101"
-
-UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/"
-inherit autotools-brokensep native
-
-do_configure () {
-	oe_runconf
-}
-
-do_install() {
-	oe_runmake 'DESTDIR=${D}' 'TMPDIR=${T}' install
-}
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch deleted +0 -33
deleted file mode 100644
index 490b367..0000000
@@ -1,33 +0,0 @@
-Disable building documentation which requires the dvips utility.
-This patch should be dropped once we include a native version of
-dvips.
-
-Upstream-Status: Inappropriate [Other]
-Temporary workaround which disables documentation.
-
-Signed-off-by: Scott Garman <[email protected]>
-
-diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh
---- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh	2011-02-25 15:26:41.142917782 -0800
-+++ linuxdoc-tools-0.9.66/doc/Makedoc.sh	2011-02-25 15:27:25.141917472 -0800
-@@ -52,13 +52,13 @@
- #	$TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide
- #fi
- 
--if [ -n "`which dvips`" ]; then
--	echo "   + dvips" >&2
--	dvips -t letter -o ./guide.ps ./guide.dvi
--	if [ -n "`which gzip`" -a -f ./guide.ps ]; then
--		gzip -fN ./guide.ps
--	fi
--fi
-+#if [ -n "`which dvips`" ]; then
-+#	echo "   + dvips" >&2
-+#	dvips -t letter -o ./guide.ps ./guide.dvi
-+#	if [ -n "`which gzip`" -a -f ./guide.ps ]; then
-+#		gzip -fN ./guide.ps
-+#	fi
-+#fi
- 
- 
- echo "- Building info docs" >&2
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch deleted +0 -64

64 lines not on this page · raw message

meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch deleted +0 -29
deleted file mode 100644
index b62895c..0000000
@@ -1,29 +0,0 @@
-Disable building documentation which requires the latex utility.
-This patch should be dropped once we include a native version of
-latex.
-
-Upstream-Status: Inappropriate [Other]
-Temporary workaround which disables documentation.
-
-Signed-off-by: Scott Garman <[email protected]>
-
-diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh
---- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh	2009-11-09 11:58:25.000000000 -0800
-+++ linuxdoc-tools-0.9.66/doc/Makedoc.sh	2011-02-25 15:23:58.610016114 -0800
-@@ -46,11 +46,11 @@
- 	$TMPDIR/sgml2txt -b 1 ./guide
- fi
- 
--if [ -n "`which latex`" ]; then
--	ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex
--	echo "- Building latex docs" >&2
--	$TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide
--fi
-+#if [ -n "`which latex`" ]; then
-+#	ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex
-+#	echo "- Building latex docs" >&2
-+#	$TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide
-+#fi
- 
- if [ -n "`which dvips`" ]; then
- 	echo "   + dvips" >&2
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch deleted +0 -36
deleted file mode 100644
index 8d78411..0000000
@@ -1,36 +0,0 @@
-Disable building txt documentation. This is a temporary workaround,
-as I have found an Ubuntu 10.10 system which throws errors during
-building this that I'd like to ultimately fix. The error manifests
-itself from the end of LinuxDocTools.pm with the following messages
-during do_install:
-
-| - Building txt docs
-| Processing file ./guide
-| troff: fatal error: can't find macro file s
-|  fmt_txt::postASP: Empty output file, error when calling groff. Aborting...
-
-Upstream-Status: Inappropriate [Other]
-Temporary workaround which disables documentation.
-
-Signed-off-by: Scott Garman <[email protected]>
-
-diff -urN linuxdoc-tools-0.9.66.orig//doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh
---- linuxdoc-tools-0.9.66.orig//doc/Makedoc.sh	2009-11-09 11:58:25.000000000 -0800
-+++ linuxdoc-tools-0.9.66/doc/Makedoc.sh	2011-03-04 17:37:24.788923998 -0800
-@@ -40,11 +40,11 @@
- 
- chmod u+x $TMPDIR/linuxdoc
- 
--if [ -n "`which groff`" ]; then
--	ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2txt
--	echo "- Building txt docs" >&2
--	$TMPDIR/sgml2txt -b 1 ./guide
--fi
-+#if [ -n "`which groff`" ]; then
-+#	ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2txt
-+#	echo "- Building txt docs" >&2
-+#	$TMPDIR/sgml2txt -b 1 ./guide
-+#fi
- 
- if [ -n "`which latex`" ]; then
- 	ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex
meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch deleted +0 -32
deleted file mode 100644
index 6b40afd..0000000
@@ -1,32 +0,0 @@
-From 55f6fd8f1958aa36584eefeecce782a505963c88 Mon Sep 17 00:00:00 2001
-From: benvm <[email protected]>
-Date: Wed, 9 Jan 2013 12:14:06 -0500
-Subject: [PATCH] Fix Makefile regular expression
-
-This patch modifies a regular expression within a Makefile to stop builds
-from failing in the case where the path contains the characters ".a".
-
-Upstream-Status: Submitted
-
-Signed-off-by: Kai Kang <[email protected]>
-
----
- Makefile.prog.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.prog.in b/Makefile.prog.in
-index 76310c9..44c3534 100644
---- a/Makefile.prog.in
-+++ b/Makefile.prog.in
-@@ -12,7 +12,7 @@ LINKFLAGS = @LINKFLAGS@
- 
- ALL_LIBS = $(XLIBS) $(LIBS)
- Makefile.lt:
--	echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
-+	echo 'LT_LIBS='`echo $(ALL_LIBS) | sed 's/\.a\s/\.la /g' | sed s/\.a$$/\.la/` > Makefile.lt
- 
- PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
- 
--- 
-1.7.0.4
-
meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch deleted +0 -39
deleted file mode 100644
index 968b9b4..0000000
@@ -1,39 +0,0 @@
-This patch fixes libtool QA issues with WORKDIR creeping in to
-libospgrove.la and libostyle.la. Patch obtained from OpenEmbedded.
-
-Upstream-Status: Inappropriate [Other]
-Workaround is specific to our build system.
-
-Signed-off-by: Scott Garman <[email protected]>
-
-Index: openjade-1.3.2/spgrove/Makefile.sub
-===================================================================
---- openjade-1.3.2.orig/spgrove/Makefile.sub
-+++ openjade-1.3.2/spgrove/Makefile.sub
-@@ -1,8 +1,8 @@
- LTVERSION=0:1:0
- LIB=ospgrove
- INCLUDE=-I$(srcdir)/../grove
--DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
--	-L$(TOP)/lib -L$(TOP)/lib/.libs \
-+DEPLIBS=-lm $(TOP)/grove \
-+	$(TOP)/lib \
- 	$(LIB_THREADS)
- OBJS=GroveApp.o GroveBuilder.o SdNode.o
- GENSRCS=grove_inst.cxx
-Index: openjade-1.3.2/style/Makefile.sub
-===================================================================
---- openjade-1.3.2.orig/style/Makefile.sub
-+++ openjade-1.3.2/style/Makefile.sub
-@@ -1,8 +1,8 @@
- LTVERSION=0:1:0
- LIB=ostyle
--DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
--  -L$(TOP)/lib -L$(TOP)/lib/.libs \
--  -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs 
-+DEPLIBS=-lm $(TOP)/grove \
-+  $(TOP)/lib  \
-+  $(TOP)/spgrove
- OBJS=LangObj.o \
-   Collector.o \
-   DssslApp.o \
meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch deleted +0 -44

44 lines not on this page · raw message

meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch deleted +0 -20
deleted file mode 100644
index 2f57c00..0000000
@@ -1,20 +0,0 @@
-The openjade build is fairly unique in auto-generating explicit dependencies to
-installed .la files.  As some distributions may delete these files unless
-clearly required, change the Makefile fragment to depend on the .so instead.
-
-Patch originally by Phil Blundell <[email protected]>.
-
-Signed-off-by: Ross Burton <[email protected]>
-Upstream-Status: Inappropriate
-
---- openjade-1.3.2/Makefile.prog.in~	2013-05-14 11:42:02.646782318 +0100
-+++ openjade-1.3.2/Makefile.prog.in	2013-05-14 11:54:55.051728343 +0100
-@@ -12,7 +12,7 @@
- 
- ALL_LIBS = $(XLIBS) $(LIBS)
- Makefile.lt:
--	echo 'LT_LIBS='`echo $(ALL_LIBS) | sed 's/\.a\s/\.la /g' | sed s/\.a$$/\.la/` > Makefile.lt
-+	echo 'LT_LIBS='`for d in $(ALL_LIBS); do case $$d in ../*) echo $$d | sed s/\.a$$/.la/g ;; *) echo $$d | sed s/\.a$$/.so/g ;; esac ; done` >Makefile.lt
- 
- PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
- 
meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch deleted +0 -83

83 lines not on this page · raw message

meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch deleted +0 -92

92 lines not on this page · raw message

meta/recipes-devtools/openjade/openjade-native_1.3.2.bb deleted +0 -121

121 lines not on this page · raw message

meta/recipes-devtools/opensp/opensp-1.5.2/obsolete_automake_macros.patch deleted +0 -15
deleted file mode 100644
index 42218a6..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Submitted [https://sourceforge.net/tracker/?func=detail&aid=3599291&group_id=2115&atid=102115]
-
-Signed-off-by: Marko Lindqvist <[email protected]>
-diff -Nurd OpenSP-1.5.2/configure.in OpenSP-1.5.2/configure.in
---- OpenSP-1.5.2/configure.in	2005-12-23 16:15:21.000000000 +0200
-+++ OpenSP-1.5.2/configure.in	2013-01-03 09:04:51.922645689 +0200
-@@ -16,7 +16,7 @@
- AM_INIT_AUTOMAKE(OpenSP, 1.5.2, no-define)
- AM_MAINTAINER_MODE
- AC_PREREQ(2.53)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_SANITY_CHECK
-
- dnl Autoheader definitions
meta/recipes-devtools/opensp/opensp_1.5.2.bb deleted +0 -59

59 lines not on this page · raw message

meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch deleted +0 -61

61 lines not on this page · raw message

meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch deleted +0 -29
deleted file mode 100644
index 54b3f54..0000000
@@ -1,29 +0,0 @@
-The COPYING file sgml-common ships with is just a symlink to
-/usr/share/automake/COPYING, which means we can't verify it
-using our normal means. We workaround this by using this patch
-to create our own license file. 
-
-Upstream was notified about this on 2011-01-24. When upgrading
-this recipe, this should be fixed and you should remove this
-patch.
-
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <[email protected]>
-
-diff -urN sgml-common-0.6.3.orig/LICENSE-GPLv2 sgml-common-0.6.3/LICENSE-GPLv2
---- sgml-common-0.6.3.orig/LICENSE-GPLv2	1969-12-31 16:00:00.000000000 -0800
-+++ sgml-common-0.6.3/LICENSE-GPLv2	2011-01-28 17:05:17.299528001 -0800
-@@ -0,0 +1,12 @@
-+Copyright (C) 1997 Christian Schwarz <[email protected]>.
-+Copyright (C) 2001-2004 Ardo van Rangelrooij <[email protected]>
-+
-+This is free software; you may redistribute it and/or modify it under
-+the terms of the GNU General Public License as published by the Free
-+Software Foundation; either version 2, or (at your option) any later
-+version.
-+
-+This is distributed in the hope that it will be useful, but without
-+any warranty; without even the implied warranty of merchantability or
-+fitness for a particular purpose.  See the GNU General Public License
-+for more details.
meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb deleted +0 -70

70 lines not on this page · raw message

meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb deleted +0 -68

68 lines not on this page · raw message

meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb deleted +0 -21
deleted file mode 100644
index 01581c1..0000000
@@ -1,21 +0,0 @@
-SUMMARY = "A simple post-processor for SGMLS and NSGMLS"
-HOMEPAGE = "https://github.com/gitpan/SGMLSpm"
-SECTION = "libs"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
-
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
-SRC_URI = "git://github.com/gitpan/SGMLSpm \
-          "
-
-SRCREV = "71595b9b5e36bfc00046995e058926bd27793fef"
-
-PV = "1.1+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-inherit native cpan
-
-do_install_append() {
-    ln -s sgmlspl.pl ${D}${bindir}/sgmlspl
-}
Signature · 1 line
2.9.3
#24 lore raw

PATCH v2 24/26 lttng-tools: do not install manpages in ptest package

In reply to Alexander Kanavin
---
 meta/recipes-kernel/lttng/lttng-tools_git.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-kernel/lttng/lttng-tools_git.bb +3 -0
index 016346f..18259e4 100644
@@ -113,4 +113,7 @@ do_install_ptest () {
 	# checkpatch.pl is unneeded on target and causes file-rdeps QA
 	# warnings.
 	rm -f ${D}${PTEST_PATH}/extras/checkpatch.pl
+
+        # Remove manpages if they are built
+        rm -f ${D}${PTEST_PATH}/doc/man/*.[0-9]
 }
Signature · 1 line
2.9.3
#27 lore raw

PATCH v2 25/26 lttng-tools: do not install shared libraries in ptest package

In reply to Alexander Kanavin

This was creating a race in runtime library dependency resolution where sometimes the library was assumed to be provided by the ptest package.

---
 meta/recipes-kernel/lttng/lttng-tools_git.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-kernel/lttng/lttng-tools_git.bb +3 -0
index 18259e4..e695224 100644
@@ -116,4 +116,7 @@ do_install_ptest () {
 
         # Remove manpages if they are built
         rm -f ${D}${PTEST_PATH}/doc/man/*.[0-9]
+
+        # Remove built libraries as they confuse the packages' runtime dependency resolution
+        rm -rf ${D}${PTEST_PATH}/src/lib/lttng-ctl/.libs/  
 }
Signature · 1 line
2.9.3
#28 lore raw

PATCH v2 26/26 core-image-{lsb/rt/sato}: add documentation packages to the SDK images

In reply to Alexander Kanavin
---
 meta/recipes-extended/images/core-image-lsb-sdk.bb | 2 +-
 meta/recipes-rt/images/core-image-rt-sdk.bb        | 2 +-
 meta/recipes-sato/images/core-image-sato-sdk.bb    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-extended/images/core-image-lsb-sdk.bb +1 -1
index c3b6e7c..96d02bb 100644
@@ -4,6 +4,6 @@ DESCRIPTION = "Basic image without X support suitable for Linux Standard Base \
 (LSB) implementations. It includes the full meta-toolchain, plus development \
 headers and libraries to form a standalone SDK."
 
-IMAGE_FEATURES += "tools-sdk dev-pkgs tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks"
+IMAGE_FEATURES += "doc-pkgs tools-sdk dev-pkgs tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks"
 
 IMAGE_INSTALL += "kernel-devsrc"
meta/recipes-rt/images/core-image-rt-sdk.bb +1 -1
index 7ddf671..4b94163 100644
@@ -13,7 +13,7 @@ tools for real-time use. It includes the full meta-toolchain, development \
 headers and libraries to form a standalone SDK."
 DEPENDS = "linux-yocto-rt"
 
-IMAGE_FEATURES += "dev-pkgs tools-sdk tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks"
+IMAGE_FEATURES += "doc-pkgs dev-pkgs tools-sdk tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks"
 
 IMAGE_INSTALL += "rt-tests hwlatdetect kernel-dev"
 
meta/recipes-sato/images/core-image-sato-sdk.bb +1 -1
index d7cc52b..fecc8c3 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "Image with Sato support that includes everything within \
 core-image-sato plus meta-toolchain, development headers and libraries to \
 form a standalone SDK."
 
-IMAGE_FEATURES += "dev-pkgs tools-sdk \
+IMAGE_FEATURES += "doc-pkgs dev-pkgs tools-sdk \
 	tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
 
 IMAGE_INSTALL += "kernel-devsrc"
Signature · 1 line
2.9.3
#25 lore raw

Re: [PATCHv2 24/26] lttng-tools: do not install manpages in ptest package

In reply to Alexander Kanavin
Quoted 10 lines · Alexander Kanavin
---
 meta/recipes-kernel/lttng/lttng-tools_git.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-kernel/lttng/lttng-tools_git.bb +0 -0
index 016346f..18259e4 100644

meta/recipes-kernel/lttng/lttng-tools_git.bb do_install_ptest () { · line 119

Quoted 7 lines
meta/recipes-kernel/lttng/lttng-tools_git.bb +3 -0
@@ -113,4 +113,7 @@ do_install_ptest () {
 	# checkpatch.pl is unneeded on target and causes file-rdeps QA
 	# warnings.
 	rm -f ${D}${PTEST_PATH}/extras/checkpatch.pl
+
+        # Remove manpages if they are built
+        rm -f ${D}${PTEST_PATH}/doc/man/*.[0-9]
 }

This actually breaks running the lttng-tools test suite on the target:

root@qemux86-64:/usr/lib/lttng-tools/ptest# cat run-ptest
#!/bin/sh
# Without --ignore-exit, the tap harness causes any FAILs within a
# test plan to raise ERRORs; this is just noise.
makeargs="LOG_DRIVER_FLAGS=--ignore-exit"
make -t all >/dev/null 2>&1 && exec make -s $makeargs check 2>/dev/null
root@qemux86-64:/usr/lib/lttng-tools/ptest# sh -x run-ptest
+ makeargs=LOG_DRIVER_FLAGS=--ignore-exit
+ make -t all
root@qemux86-64:/usr/lib/lttng-tools/ptest# echo $?
2
root@qemux86-64:/usr/lib/lttng-tools/ptest# make -s -t all
make[2]: *** No rule to make target 'lttng-health-check.3', needed by
'all-am'.  Stop.
make[1]: *** [Makefile:537: all-recursive] Error 1
make: *** [Makefile:570: all-recursive] Error 1

I'd rather see "do not install shared libraries in ptest package" go in first as it fixes an existing problem without regressing lttng-tools-ptest.

I'm looking at reworking do_install_ptest to do a selective copy, as you suggested earlier, so maybe just drop this patch?

#26 lore raw

Re: [PATCHv2 24/26] lttng-tools: do not install manpages in ptest package

Quoted 23 lines · Nathan Lynch

This actually breaks running the lttng-tools test suite on the target:

root@qemux86-64:/usr/lib/lttng-tools/ptest# cat run-ptest
#!/bin/sh
# Without --ignore-exit, the tap harness causes any FAILs within a
# test plan to raise ERRORs; this is just noise.
makeargs="LOG_DRIVER_FLAGS=--ignore-exit"
make -t all >/dev/null 2>&1 && exec make -s $makeargs check 2>/dev/null
root@qemux86-64:/usr/lib/lttng-tools/ptest# sh -x run-ptest
+ makeargs=LOG_DRIVER_FLAGS=--ignore-exit
+ make -t all
root@qemux86-64:/usr/lib/lttng-tools/ptest# echo $?
2
root@qemux86-64:/usr/lib/lttng-tools/ptest# make -s -t all
make[2]: *** No rule to make target 'lttng-health-check.3', needed by
'all-am'.  Stop.
make[1]: *** [Makefile:537: all-recursive] Error 1
make: *** [Makefile:570: all-recursive] Error 1
Quoted 5 lines

I'd rather see "do not install shared libraries in ptest package" go in first as it fixes an existing problem without regressing lttng-tools-ptest.

I'm looking at reworking do_install_ptest to do a selective copy, as you suggested earlier, so maybe just drop this patch?

Thanks for checking. This hasn't yet made it to master, so it could simply be dropped from master-next. If this doesn't happen, I'll submit a revertion patch.

Alex