aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-01-21 12:15:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-21 12:44:07 +0000
commit8b7816804dcfdc380fbebe6dc8c81f431a7fc450 (patch)
treed14f59d57ba1bbf66450133c084e8b83245cb8b9 /meta/recipes-core/systemd
parent40353c9ef83f986a0d49cc6eb654b3ace6ef4dc4 (diff)
downloadopenembedded-core-contrib-8b7816804dcfdc380fbebe6dc8c81f431a7fc450.tar.gz
openembedded-core-contrib-8b7816804dcfdc380fbebe6dc8c81f431a7fc450.tar.bz2
openembedded-core-contrib-8b7816804dcfdc380fbebe6dc8c81f431a7fc450.zip
systemd: use new GTKDOC_DOCDIR and clean up
Now that gtk-doc.bbclass supports overriding the documentation directory, systemd can just inherit gtk-doc and all of the manual operations can be removed. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd_196.bb10
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-core/systemd/systemd_196.bb b/meta/recipes-core/systemd/systemd_196.bb
index ba42a40aa2b..5242b5a8781 100644
--- a/meta/recipes-core/systemd/systemd_196.bb
+++ b/meta/recipes-core/systemd/systemd_196.bb
@@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
PROVIDES = "udev"
-DEPENDS = "xz kmod gtk-doc-stub-native docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers usbutils glib-2.0 libgcrypt"
+DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers usbutils glib-2.0 libgcrypt"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
SECTION = "base/shell"
-inherit useradd pkgconfig autotools perlnative
+inherit gtk-doc useradd pkgconfig autotools perlnative
SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
file://0001-Revert-systemd-analyze-use-argparse-instead-of-getop.patch \
@@ -47,6 +47,8 @@ CACHED_CONFIGUREVARS = "ac_cv_file__usr_share_pci_ids=no \
ac_cv_file__usr_share_hwdata_pci_ids=no \
ac_cv_file__usr_share_misc_pci_ids=yes"
+GTKDOC_DOCDIR = "${S}/docs/"
+
# The gtk+ tools should get built as a separate recipe e.g. systemd-tools
EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
--with-rootprefix=${base_prefix} \
@@ -59,7 +61,6 @@ EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
--disable-coredump \
--disable-introspection \
--with-pci-ids-path=/usr/share/misc \
- --disable-gtk-doc-html \
--disable-tcpwrap \
--enable-split-usr \
--disable-microhttpd \
@@ -69,12 +70,9 @@ EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
# There's no docbook-xsl-native, so for the xsltproc check to false
do_configure_prepend() {
export CPP="${HOST_PREFIX}cpp ${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}"
- sed -i /xsltproc/d configure.ac
# we only have /home/root, not /root
sed -i -e 's:=/root:=/home/root:g' units/*.service*
-
- gtkdocize --docdir ${S}/docs/
}
do_install() {