gnomeos: Pull in ISC DHCP from Debian git, make NetworkManager start

gnomeos/3.4/NetworkManager-config.patch

@@ -0,0 +1,45 @@
+From 7a8b9a75a0bd75d7548b428ee46ee16f296e45f7 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 12 Jan 2012 09:50:57 -0500
+Subject: [PATCH] keyfile: Install default config file if we're TARGET_GENERIC
+
+NetworkManager just segfaults on startup if there's no
+/etc/NetworkManager/NetworkManager.conf, if we're TARGET_GENERIC, then
+we are only using keyfiles, so install a basic config file.
+---
+ src/settings/plugins/keyfile/Makefile.am           |   10 +++++++++-
+ .../plugins/keyfile/NetworkManager-keyfile.conf    |    2 ++
+ 2 files changed, 11 insertions(+), 1 deletions(-)
+ create mode 100644 src/settings/plugins/keyfile/NetworkManager-keyfile.conf
+
+diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
+index e941e9b..e074873 100644
+--- a/src/settings/plugins/keyfile/Makefile.am
++++ b/src/settings/plugins/keyfile/Makefile.am
+@@ -57,6 +57,14 @@ libnm_settings_plugin_keyfile_la_LDFLAGS = -rdynamic
+ 
+ keyfiledir=$(sysconfdir)/NetworkManager/system-connections
+ 
++if TARGET_GENERIC
++install_keyfile_conf=true
++else
++install_keyfile_conf=false
++endif
++
+ install-data-hook:
+ 	$(mkinstalldirs) -m 0755 $(DESTDIR)$(keyfiledir)
+-
++	if $(install_keyfile_conf); then \
++		install -m 0600 $(srcdir)/NetworkManager-keyfile.conf $(DESTDIR)/$(sysconfdir)/NetworkManager/NetworkManager.conf; \
++	fi
+diff --git a/src/settings/plugins/keyfile/NetworkManager-keyfile.conf b/src/settings/plugins/keyfile/NetworkManager-keyfile.conf
+new file mode 100644
+index 0000000..c37b596
+--- /dev/null
++++ b/src/settings/plugins/keyfile/NetworkManager-keyfile.conf
+@@ -0,0 +1,2 @@
++[main]
++plugins=keyfile
+-- 
+1.7.6.4
+

gnomeos/3.4/isc-dhcp-autogen.patch

@@ -0,0 +1,22 @@
+From e2289b453abfe6c4878fceb1a187f12d86fd79b7 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Wed, 11 Jan 2012 16:51:37 -0500
+Subject: [PATCH] autogen.sh: New developer/git bootstrap script
+
+See http://people.gnome.org/~walters/docs/build-api.txt
+---
+ autogen.sh |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+ create mode 100755 autogen.sh
+
+diff --git a/autogen.sh b/autogen.sh
+new file mode 100755
+index 0000000..c187584
+--- /dev/null
++++ b/autogen.sh
+@@ -0,0 +1,2 @@
++#!/bin/sh
++exec autoreconf -vfi
+-- 
+1.7.6.4
+

gnomeos/3.4/isc-dhcp-no-builddir.patch

@@ -0,0 +1,24 @@
+From f957e3282cc88fb10fdd3ce556aa68c797a9021a Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Wed, 11 Jan 2012 16:48:36 -0500
+Subject: [PATCH] build: We don't support srcdir != builddir
+
+---
+ configure.ac |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index df4bae3..8df75d9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,7 @@
+ AC_INIT([DHCP], [4.2.2], [dhcp-users@isc.org])
+ 
++echo \#buildapi-variable-no-builddir >/dev/null
++
+ # we specify "foreign" to avoid having to have the GNU mandated files,
+ # like AUTHORS, COPYING, and such
+ AM_INIT_AUTOMAKE([foreign])
+-- 
+1.7.6.4
+

gnomeos/3.4/isc-dhcp-no-werror.patch

@@ -0,0 +1,26 @@
+From 9d72f599de73d47196106737ad73527b911840fb Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Wed, 11 Jan 2012 16:58:04 -0500
+Subject: [PATCH] configure: Don't make warnings into errors by default
+
+That only works if you also check the gcc version.
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8df75d9..cf30197 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,7 +21,7 @@ AC_DEFUN([AC_DATAROOTDIR_CHECKED])
+ # user did not specify any flags. Add warnings in this case.
+ if test "$GCC" = "yes"; then
+ 	if test "$CFLAGS" != "$SAVE_CFLAGS"; then
+-		STD_CWARNINGS="$STD_CWARNINGS -Wall -Werror -fno-strict-aliasing"
++		STD_CWARNINGS="$STD_CWARNINGS -Wall -fno-strict-aliasing"
+ 	fi
+ fi
+ 
+-- 
+1.7.6.4
+

gnomeos/3.4/manifest.json

@@ -11,6 +11,7 @@
                 "fd-NM": "git:git://anongit.freedesktop.org/git/NetworkManager/",
                 "fedora": "git:git://git.fedorahosted.org/",
                 "savannah": "git:git://git.savannah.gnu.org/",
+                "debian": "git:git://anonscm.debian.org/",
 		"netfilter": "git:git://git.netfilter.org/",
 		"cgwalters": "git:git://github.com/cgwalters/"},
 
@@ -26,6 +27,8 @@
 
 		{"src": "gnome:glib"},
 
+   		{"src": "gnome:linux-user-chroot"},
+
    		{"src": "fd:pixman"},
 
    		{"src": "git:git://git.sv.nongnu.org/freetype/freetype2.git",
@@ -288,7 +291,8 @@
 		 "patches": ["expat-autogen.patch"]},
 
 		{"src": "fd-dbus:dbus",
-		 "config-opts": ["--enable-inotify",
+		 "config-opts": ["--with-dbus-user=dbus",
+		                 "--enable-inotify",
 				 "--disable-xml-docs",
 				 "--disable-doxygen-docs",
 				 "--disable-tests"],
@@ -311,8 +315,19 @@
 
 		{"src": "netfilter:iptables.git"},
 
+		{"src": "debian:pkg-dhcp/isc-dhcp.git",
+		 "name": "isc-dhcp",
+		 "branch": "upstream/4.2.2",
+		 "patches": ["isc-dhcp-autogen.patch",
+		             "isc-dhcp-delete-configure.patch",
+			     "isc-dhcp-no-builddir.patch",
+		             "isc-dhcp-no-werror.patch"]},
+
 		{"src": "fd-NM:NetworkManager",
-		 "config-opts": ["--with-distro=generic"],
-		 "patches": ["NetworkManager-builddir.patch", "NetworkManager-distro.patch"]}
+		 "config-opts": ["--with-distro=generic",
+		                 "--with-dhclient=yes",
+				 "--with-crypto=nss",
+				 "--with-docs=no"],
+		 "patches": ["NetworkManager-config.patch"]}
 	]
 }

gnomeos/yocto/commit-yocto-build.sh

@@ -43,4 +43,4 @@ BUILD_TIME=$(date -r $BUILD_TAR)
 
 ostree --repo=${OSTREE_REPO} commit --skip-if-unchanged -s "Build from OSTree ${OSTREE_VER}" -b "${BASE}" --tree=tar=${BUILD_TAR}
 ostree --repo=${OSTREE_REPO} diff "${BASE}"^ "${BASE}" || true
-ostree --repo=${OSTREE_REPO} compose -s "Initial compose" -b ${BUILDROOT} ${BASE} 
+ostree --repo=${OSTREE_REPO} compose -s "Initial compose" -b ${BUILDROOT} ${BASE}:/