* [PATCH 1/5] systemd: skip in non-systemd distros to fix world builds
2013-01-21 12:15 [PATCH 0/5] systemd fixes Ross Burton
@ 2013-01-21 12:15 ` Ross Burton
2013-01-21 12:15 ` [PATCH 2/5] udev: skip in systemd distros, " Ross Burton
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2013-01-21 12:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-core/systemd/systemd_196.bb | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/meta/recipes-core/systemd/systemd_196.bb b/meta/recipes-core/systemd/systemd_196.bb
index 1861437..85bb4f9 100644
--- a/meta/recipes-core/systemd/systemd_196.bb
+++ b/meta/recipes-core/systemd/systemd_196.bb
@@ -247,3 +247,11 @@ update-alternatives --remove reboot ${base_bindir}/systemctl
update-alternatives --remove shutdown ${base_bindir}/systemctl
update-alternatives --remove poweroff ${base_bindir}/systemctl
}
+
+
+# As this recipe builds udev, respect the systemd DISTRO_FEATURE so we don't try
+# building udev and systemd in world builds.
+python () {
+ if not oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
+ raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES")
+}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/5] udev: skip in systemd distros, to fix world builds
2013-01-21 12:15 [PATCH 0/5] systemd fixes Ross Burton
2013-01-21 12:15 ` [PATCH 1/5] systemd: skip in non-systemd distros to fix world builds Ross Burton
@ 2013-01-21 12:15 ` Ross Burton
2013-01-21 12:15 ` [PATCH 3/5] systemd: fix typo in FILES Ross Burton
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2013-01-21 12:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-core/udev/udev.inc | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 9f60b17..facad0c 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -99,3 +99,9 @@ do_install_append () {
echo 'udev_run="/var/run/udev"' >> ${D}${sysconfdir}/udev/udev.conf
}
+
+# As systemd also builds udev, skip this package if we're doing a systemd build.
+python () {
+ if oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
+ raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES")
+}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/5] systemd: fix typo in FILES
2013-01-21 12:15 [PATCH 0/5] systemd fixes Ross Burton
2013-01-21 12:15 ` [PATCH 1/5] systemd: skip in non-systemd distros to fix world builds Ross Burton
2013-01-21 12:15 ` [PATCH 2/5] udev: skip in systemd distros, " Ross Burton
@ 2013-01-21 12:15 ` Ross Burton
2013-01-21 12:15 ` [PATCH 4/5] gtk-doc: parameterise the documentation directory Ross Burton
2013-01-21 12:15 ` [PATCH 5/5] systemd: use new GTKDOC_DOCDIR and clean up Ross Burton
4 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2013-01-21 12:15 UTC (permalink / raw)
To: openembedded-core
Accidently managed to corrupt FILES_udev.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-core/systemd/systemd_196.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/systemd/systemd_196.bb b/meta/recipes-core/systemd/systemd_196.bb
index 85bb4f9..ba42a40 100644
--- a/meta/recipes-core/systemd/systemd_196.bb
+++ b/meta/recipes-core/systemd/systemd_196.bb
@@ -197,7 +197,7 @@ RDEPENDS_udev += "udev-utils"
RPROVIDES_udev = "hotplug"
FILES_udev += "${base_sbindir}/udevd \
- /libstemd-udevd \
+ ${base_libdir}/systemd/systemd-udevd \
/lib/udev/accelerometer \
/lib/udev/ata_id \
/lib/udev/cdrom_id \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/5] gtk-doc: parameterise the documentation directory
2013-01-21 12:15 [PATCH 0/5] systemd fixes Ross Burton
` (2 preceding siblings ...)
2013-01-21 12:15 ` [PATCH 3/5] systemd: fix typo in FILES Ross Burton
@ 2013-01-21 12:15 ` Ross Burton
2013-01-21 12:15 ` [PATCH 5/5] systemd: use new GTKDOC_DOCDIR and clean up Ross Burton
4 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2013-01-21 12:15 UTC (permalink / raw)
To: openembedded-core
Not every package puts the gtk-doc infrastructure into ${S}, so allow this to be
overridden.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/classes/gtk-doc.bbclass | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/classes/gtk-doc.bbclass b/meta/classes/gtk-doc.bbclass
index eaa1385..f7ba788 100644
--- a/meta/classes/gtk-doc.bbclass
+++ b/meta/classes/gtk-doc.bbclass
@@ -6,6 +6,9 @@
# re-generation of documentation. For now, we'll make do with this which
# packages up any existing documentation (so from tarball builds).
+# The documentation directory, where the infrastructure will be copied.
+GTKDOC_DOCDIR ?= "${S}"
+
DEPENDS_append = " gtk-doc-stub-native"
EXTRA_OECONF_append = "\
@@ -15,5 +18,5 @@ EXTRA_OECONF_append = "\
"
do_configure_prepend () {
- ( cd ${S} && gtkdocize )
+ gtkdocize --docdir ${GTKDOC_DOCDIR}
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 5/5] systemd: use new GTKDOC_DOCDIR and clean up
2013-01-21 12:15 [PATCH 0/5] systemd fixes Ross Burton
` (3 preceding siblings ...)
2013-01-21 12:15 ` [PATCH 4/5] gtk-doc: parameterise the documentation directory Ross Burton
@ 2013-01-21 12:15 ` Ross Burton
4 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2013-01-21 12:15 UTC (permalink / raw)
To: openembedded-core
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>
---
meta/recipes-core/systemd/systemd_196.bb | 10 ++++------
1 file 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 \
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() {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread