Skip to contentSkip to conversation

Make systemd recipe able to build out manpages

PATCH New Chen Qi 1 participant 3 messages Nov 30, 2014

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

cover Make systemd recipe able to build out manpages

The following changes since commit 68ddb28a68ceb59cd1ed322c16143827ce1ac712:

distrodata_class: checkpkg make usage of latest_versionstring methods in bitbake fetcher (2014-11-28 13:59:52 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib ChenQi/systemd-manpages
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/systemd-manpages

Chen Qi (2):
libxslt: create wrapper to avoid host system referencing
systemd: add PACKAGECONFIG for 'manpages'

 meta/recipes-core/systemd/systemd_216.bb       | 2 +-
 meta/recipes-support/libxslt/libxslt_1.1.28.bb | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/2 libxslt: create wrapper to avoid host system referencing

By default, xsltproc from libxslt would use configuration files under /etc/xml. To avoid host system contamination, we create a wrapper for this command to make it use configuration files in the sysroot directory.

Signed-off-by Chen Qi <[email protected]>
---
 meta/recipes-support/libxslt/libxslt_1.1.28.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta/recipes-support/libxslt/libxslt_1.1.28.bb +5 -0
index 0b2526d..ded883e 100644
@@ -35,6 +35,11 @@ RPROVIDES_${PN}-bin += "${PN}-utils"
 RCONFLICTS_${PN}-bin += "${PN}-utils"
 RREPLACES_${PN}-bin += "${PN}-utils"
 
+
+do_install_append_class-native () {
+    create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog.xml
+}
+
 FILES_${PN} += "${libdir}/libxslt-plugins"
 FILES_${PN}-dev += "${libdir}/xsltConf.sh"
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 2/2 systemd: add PACKAGECONFIG for 'manpages'

In reply to Chen Qi

Instead of always disabling manpages for systemd, we use PACKAGECONFIG for 'manpages' so that the manpages for systemd could be built out correctly.

Signed-off-by Chen Qi <[email protected]>
---
 meta/recipes-core/systemd/systemd_216.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_216.bb +1 -1
index b33f95e..536b7be 100644
@@ -66,6 +66,7 @@ PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved"
 PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd"
 PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn"
 PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit"
+PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
 CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill"
 

@@ -80,7 +81,6 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
                  --with-rootlibdir=${rootlibdir} \
                  --with-roothomedir=${ROOT_HOME} \
                  ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \
-                 --disable-manpages \
                  --disable-coredump \
                  --disable-introspection \
                  --disable-kdbus \
Signature · 1 line
1.9.1