[gnome-ostree] 3.6: Add --enable-system-integration mode

[Colin Walters <walters src gnome org>]

commit 94cc016c2b81b7d2eadce64fa24f46c2ab359568
Author: Colin Walters <walters verbum org>
Date:   Mon Sep 10 16:44:23 2012 -0400

    3.6: Add --enable-system-integration mode
    
    This allows us to have gnome-ostree be the bag of random
    integration/branding bits, rather than the poky repository.
    
    Think of this as roughly equivalent to the fedora-release package.
    
    For now:
    
    * Symlink display-manager.service -> gdm.service
    * Install /etc/os-release

 Makefile-integration.am    |   25 +++++++++++++++++++++++++
 Makefile-ostbuild.am       |    6 ++++--
 Makefile.am                |    4 ++++
 configure.ac               |   10 ++++++++++
 gnomeos-3.6.json           |    4 ++++
 src/integration/os-release |    5 +++++
 6 files changed, 52 insertions(+), 2 deletions(-)
---
diff --git a/Makefile-integration.am b/Makefile-integration.am
new file mode 100644
index 0000000..1e37330
--- /dev/null
+++ b/Makefile-integration.am
@@ -0,0 +1,25 @@
+# Copyright (C) 2012 Colin Walters <walters verbum org>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+if SYSTEM_INTEGRATION
+INSTALL_DATA_HOOKS += integration-install-data-hook
+endif
+
+integration-install-data-hook:
+	mkdir -p $(DESTDIR)$(prefix)/lib/systemd/system
+	ln -sf gdm.service $(DESTDIR)$(prefix)/lib/systemd/system/display-manager.service
+	install -D $(srcdir)/src/integration/os-release $(DESTDIR)$(sysconfdir)/os-release
diff --git a/Makefile-ostbuild.am b/Makefile-ostbuild.am
index 4f966df..0199e5a 100644
--- a/Makefile-ostbuild.am
+++ b/Makefile-ostbuild.am
@@ -17,9 +17,11 @@
 
 ostbuild: src/ostbuild/ostbuild.in Makefile
 	sed -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON), $< > $  tmp && mv $  tmp $@
-bin_SCRIPTS += ostbuild 
 EXTRA_DIST += ostbuild/ostbuild.in
 
+if BUILDSYSTEM
+bin_SCRIPTS += ostbuild 
+
 pyostbuilddir=$(libdir)/ostbuild/pyostbuild
 pyostbuild_PYTHON =					\
 	src/ostbuild/pyostbuild/buildutil.py		\
@@ -55,4 +57,4 @@ pyostbuild_PYTHON =					\
 	src/ostbuild/pyostbuild/subprocess_helpers.py	\
 	src/ostbuild/pyostbuild/vcs.py			\
 	$(NULL)
-
+endif
diff --git a/Makefile.am b/Makefile.am
index e2d996e..65e4203 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,8 +32,12 @@ noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 privlibdir = $(pkglibdir)
 privlib_LTLIBRARIES =
+INSTALL_DATA_HOOKS =
 
 include Makefile-ostbuild.am
+include Makefile-integration.am
+
+install-data-hook: $(INSTALL_DATA_HOOKS)
 
 release-tag:
 	git tag -m "Release $(VERSION)" v$(VERSION)
diff --git a/configure.ac b/configure.ac
index 2a73f0b..b9d74aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,16 @@ AM_SILENT_RULES([yes])
 
 AM_PATH_PYTHON([2.6])
 
+AC_ARG_ENABLE(buildsystem,
+	    AS_HELP_STRING([--disable-buildsystem], [Don't install buildsystem]),,
+	    enable_buildsystem=yes)
+AM_CONDITIONAL(BUILDSYSTEM, test x$enable_buildsystem != xno)
+
+AC_ARG_ENABLE(system-integration,
+	    AS_HELP_STRING([--enable-system-integration], [Install integration for target system]),,
+	    enable_system_integration=no)
+AM_CONDITIONAL(SYSTEM_INTEGRATION, test x$enable_system_integration != xno)
+
 AC_CONFIG_FILES([
 Makefile
 ])
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index 2655107..e6279db 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -625,6 +625,10 @@
 		 "config-opts": ["--disable-documentation",
 		                 "--with-soup-gnome"]},
 
+		{"src": "gnome:gnome-ostree",
+		 "config-opts": ["--disable-buildsystem",
+		                 "--enable-system-integration"]},
+
 		{"src": "fd-gstreamer:gstreamer",
 		 "name": "gstreamer-0.10",
 		 "branch": "0.10",
diff --git a/src/integration/os-release b/src/integration/os-release
new file mode 100644
index 0000000..411e2a2
--- /dev/null
+++ b/src/integration/os-release
@@ -0,0 +1,5 @@
+NAME="GNOME-OSTree"
+ID=gnome-ostree
+PRETTY_NAME="GNOME-OSTree (3.6, OE-Core edison)"
+VERSION=3.6
+HOME_URL=https://live.gnome.org/OSTree/GnomeOSTree