[gnome-ostree] manifest: Enable dracut systemd integration

[Colin Walters <walters src gnome org>]

commit 336bac93fe178834586174f5ada080d5c094f7b0
Author: Colin Walters <walters verbum org>
Date:   Sat Jan 5 08:04:20 2013 -0500

    manifest: Enable dracut systemd integration
    
    Patch sent upstream.

 manifest.json                          |    6 ++-
 patches/dracut-systemd-configure.patch |   58 ++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 2 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 870e2bb..dbf9735 100644
--- a/manifest.json
+++ b/manifest.json
@@ -837,8 +837,10 @@
 		{"src": "git:git://git.kernel.org/pub/scm/utils/dash/dash.git"},
 
                 {"src": "git:git://git.kernel.org/pub/scm/boot/dracut/dracut.git",
-		 "config-opts": ["--disable-documentation"],
-		 "patches": ["dracut-Support-OSTree.patch"]},
+		 "config-opts": ["--disable-documentation",
+		                 "--enable-systemd"],
+		 "patches": ["dracut-Support-OSTree.patch",
+		             "dracut-systemd-configure.patch"]},
 
 		{"src": "git:git://git.cairographics.org/git/py2cairo",
 		 "patches": ["py2cairo-autogen.patch"]},
diff --git a/patches/dracut-systemd-configure.patch b/patches/dracut-systemd-configure.patch
new file mode 100644
index 0000000..7ed2034
--- /dev/null
+++ b/patches/dracut-systemd-configure.patch
@@ -0,0 +1,58 @@
+From 1a3d4dfdbeee7953bcf6e84b3e7d941e6fa7ca09 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sun, 30 Dec 2012 03:35:28 -0500
+Subject: [PATCH] build: Add --enable-systemd configure option
+
+For users of the configure interface, this is a nicer than
+systemdsystemunitdir acting as a magical flag.  When given, we use
+pkg-config internally to find the unit dir.
+---
+ Makefile  |    4 ++++
+ configure |    3 +++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2888434..40b9e25 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,6 +10,10 @@ pkglibdir ?= ${libdir}/dracut
+ sysconfdir ?= ${prefix}/etc
+ bindir ?= ${prefix}/bin
+ mandir ?= ${prefix}/share/man
++ifneq ($(enable_systemd),no)
++systemdsystemunitdir ?= $(shell pkg-config --variable systemdsystemunitdir systemd)
++endif
++
+ CFLAGS ?= -O2 -g -Wall
+ CFLAGS += -std=gnu99
+ 
+diff --git a/configure b/configure
+index 409256b..6c92f22 100755
+--- a/configure
++++ b/configure
+@@ -8,6 +8,7 @@ echo \#buildapi-variable-no-builddir >/dev/null
+ prefix=/usr
+ 
+ enable_documentation=yes
++enable_systemd=no
+ 
+ # Little helper function for reading args from the commandline.
+ # it automatically handles -a b and -a=b variants, and returns 1 if
+@@ -36,6 +37,7 @@ while (($# > 0)); do
+         --sbindir) read_arg sbindir "$@" || shift;;
+         --mandir) read_arg mandir "$@" || shift;;
+         --disable-documentation) enable_documentation=no;;
++        --enable-systemd) enable_systemd=yes;;
+         *) echo "Ignoring unknown option '$1'";;
+     esac
+     shift
+@@ -49,5 +51,6 @@ sysconfdir ?= ${sysconfdir:-${prefix}/etc}
+ sbindir ?= ${sbindir:-${prefix}/sbin}
+ mandir ?= ${mandir:-${prefix}/share/man}
+ enable_documentation ?= ${enable_documentation}
++enable_systemd ?= ${enable_systemd}
+ EOF
+ mv Makefile.inc.tmp Makefile.inc
+-- 
+1.7.1
+