diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/systemd/systemd_196.bb | 10 |
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 ba42a40aa2..5242b5a878 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 | ||
9 | PROVIDES = "udev" | 9 | PROVIDES = "udev" |
10 | 10 | ||
11 | 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" | 11 | 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" |
12 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 12 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
13 | 13 | ||
14 | SERIAL_CONSOLE ?= "115200 /dev/ttyS0" | 14 | SERIAL_CONSOLE ?= "115200 /dev/ttyS0" |
15 | 15 | ||
16 | SECTION = "base/shell" | 16 | SECTION = "base/shell" |
17 | 17 | ||
18 | inherit useradd pkgconfig autotools perlnative | 18 | inherit gtk-doc useradd pkgconfig autotools perlnative |
19 | 19 | ||
20 | SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ | 20 | SRC_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 | ||
50 | GTKDOC_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 |
51 | EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \ | 53 | EXTRA_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 |
70 | do_configure_prepend() { | 71 | do_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 | ||
80 | do_install() { | 78 | do_install() { |