summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-01-21 12:15:34 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-21 12:44:54 (GMT)
commit064d30803bede8594602f8bd5ff24a9bead4b927 (patch)
tree0db84dc21308a74f69f6383d558f3fa58a102613
parent779d915c7de0fa53684ec0353f569f24ab67e749 (diff)
downloadpoky-064d30803bede8594602f8bd5ff24a9bead4b927.tar.gz
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. (From OE-Core rev: 8b7816804dcfdc380fbebe6dc8c81f431a7fc450) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 ba42a40..5242b5a 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 \
8 8
9PROVIDES = "udev" 9PROVIDES = "udev"
10 10
11DEPENDS = "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" 11DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers usbutils glib-2.0 libgcrypt"
12DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 12DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
13 13
14SERIAL_CONSOLE ?= "115200 /dev/ttyS0" 14SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
15 15
16SECTION = "base/shell" 16SECTION = "base/shell"
17 17
18inherit useradd pkgconfig autotools perlnative 18inherit gtk-doc useradd pkgconfig autotools perlnative
19 19
20SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ 20SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
21 file://0001-Revert-systemd-analyze-use-argparse-instead-of-getop.patch \ 21 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 \
47 ac_cv_file__usr_share_hwdata_pci_ids=no \ 47 ac_cv_file__usr_share_hwdata_pci_ids=no \
48 ac_cv_file__usr_share_misc_pci_ids=yes" 48 ac_cv_file__usr_share_misc_pci_ids=yes"
49 49
50GTKDOC_DOCDIR = "${S}/docs/"
51
50# The gtk+ tools should get built as a separate recipe e.g. systemd-tools 52# The gtk+ tools should get built as a separate recipe e.g. systemd-tools
51EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \ 53EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
52 --with-rootprefix=${base_prefix} \ 54 --with-rootprefix=${base_prefix} \
@@ -59,7 +61,6 @@ EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
59 --disable-coredump \ 61 --disable-coredump \
60 --disable-introspection \ 62 --disable-introspection \
61 --with-pci-ids-path=/usr/share/misc \ 63 --with-pci-ids-path=/usr/share/misc \
62 --disable-gtk-doc-html \
63 --disable-tcpwrap \ 64 --disable-tcpwrap \
64 --enable-split-usr \ 65 --enable-split-usr \
65 --disable-microhttpd \ 66 --disable-microhttpd \
@@ -69,12 +70,9 @@ EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
69# There's no docbook-xsl-native, so for the xsltproc check to false 70# There's no docbook-xsl-native, so for the xsltproc check to false
70do_configure_prepend() { 71do_configure_prepend() {
71 export CPP="${HOST_PREFIX}cpp ${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" 72 export CPP="${HOST_PREFIX}cpp ${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}"
72 sed -i /xsltproc/d configure.ac
73 73
74 # we only have /home/root, not /root 74 # we only have /home/root, not /root
75 sed -i -e 's:=/root:=/home/root:g' units/*.service* 75 sed -i -e 's:=/root:=/home/root:g' units/*.service*
76
77 gtkdocize --docdir ${S}/docs/
78} 76}
79 77
80do_install() { 78do_install() {