Merge lp:~morphis/network-manager/correct-build-deps into lp:~phablet-team/network-manager/snappy

[Simon Fels]

Correct build dependencies to work in stateless environments

The build configuration was incorrect and didn't worked on a system being setup by them. We also mixed up stage-packages and build-packages.

This also drops polkit and vala support as we're not using those at all on snappy.

See https://launchpad.net/~phablet-team/+snap/network-manager for builds running successful with this.

[lp:~morphis/network-manager/correct-build-deps]

979. By Simon Fels on 2016-04-13

Remove commented configure switches

Unmerged revisions

979. By Simon Fels on 2016-04-13

Remove commented configure switches

978. By Simon Fels on 2016-04-13

Reduce set of stage-packages

977. By Simon Fels on 2016-04-13

Don't mention gtk-doc-tools twice

976. By Simon Fels on 2016-04-13

Add some more build-deps

975. By Simon Fels on 2016-04-13

Add gtk-doc-tools as dependency too

974. By Simon Fels on 2016-04-13

Adjust build configuration

973. By Simon Fels on 2016-04-13

Add quilt as necessary build dependency

=== modified file 'parts/plugins/x-autotools.py'
--- parts/plugins/x-autotools.py	2016-03-18 11:20:18 +0000
+++ parts/plugins/x-autotools.py	2016-04-13 12:51:51 +0000
@@ -80,6 +80,7 @@
             'autopoint',
             'libtool',
             'make',
+            'quilt',
         ])
 
         if options.install_via == 'destdir':
 
=== modified file 'snapcraft.yaml'
--- snapcraft.yaml	2016-03-30 06:27:38 +0000
+++ snapcraft.yaml	2016-04-13 12:51:51 +0000
@@ -51,6 +51,38 @@
     # which we don't profile anymore and will cause the build to fail.
     force-autogen: true
 
+    build-packages:
+      - intltool
+      - gtk-doc-tools
+      - libdbus-glib-1-dev
+      - libdbus-1-dev
+      - libiw-dev
+      - libglib2.0-dev
+      - libnl-3-dev
+      - libnl-route-3-dev
+      - libnl-genl-3-dev
+      - ppp-dev
+      - libpolkit-gobject-1-dev
+      - libgnutls28-dev
+      - libgcrypt11-dev
+      - uuid-dev
+      - systemd
+      - libsystemd-dev
+      - libudev-dev
+      - libgudev-1.0-dev
+      - libgirepository1.0-dev
+      - gobject-introspection
+      - libsoup2.4-dev
+      - libglib2.0-doc
+      - libmm-glib-dev
+      - libndp-dev
+      - libreadline-dev
+      - libnewt-dev
+      - dbus-test-runner
+      - isc-dhcp-client
+      - python-dbus
+      - python-gi
+
     # NOTE: Keep this in sync with what the debian package configures
     # NetworkManager. For everything we do differently please add a 
     # comment why we do so.
@@ -71,14 +103,12 @@
       - --with-nmtui
       - --disable-more-warnings
       - --disable-modify-system
-      - --enable-polkit
       - --enable-ppp
       - --enable-ifupdown
       - --enable-introspection
       - --enable-gtk-doc
       - --enable-concheck
       - --enable-teamdctl=no
-      - --enable-vala
       - --enable-bluez4
       - --with-tests
       # NOTE: After this all options are specific to snappy and are not
@@ -87,16 +117,14 @@
       - --sysconfdir=/etc
       - --disable-qt
       - --enable-snappy
+      - --disable-polkit
+      - --disable-vala
 
     # We stage everything here we need for build and runtime
     stage-packages:
-      - adduser
-      - dbus-test-runner
       - dnsmasq-base
       - gobject-introspection
-      - gtk-doc-tools
       - init-system-helpers
-      - intltool
       - iputils-arping
       - isc-dhcp-client
       - iw
@@ -104,52 +132,31 @@
       - libdbus-1-3
       - libdbus-1-dev
       - libdbus-glib-1-2
-      - libdbus-glib-1-dev
-      - libgcrypt11-dev
       - libgcrypt20
-      - libgirepository1.0-dev
       - libglib2.0-0
-      - libglib2.0-dev
-      - libglib2.0-doc
       - libgudev-1.0-0
-      - libgudev-1.0-dev
       - libiw-dev
       - libmbim-glib4
-      - libmm-glib-dev
-      - libndp-dev
       - libndp0
-      - libnewt-dev
       - libnewt0.52
       - libnl-3-200
       - libnl-3-dev
       - libnl-genl-3-200
-      - libnl-genl-3-dev
       - libnl-route-3-200
-      - libnl-route-3-dev
-      - libnss3-dev
-      - libnspr4-dev
       - libpam-systemd
       - libpolkit-agent-1-0
       - libpolkit-gobject-1-0
-      - libpolkit-gobject-1-dev
       - libqmi-glib1
-      - libreadline-dev
       - libreadline6
       - libsoup2.4-1
-      - libsoup2.4-dev
-      - libsystemd-dev
       - libsystemd0
-      - libudev-dev
       - libuuid1
       - lsb-base
-      - pkg-config
-      - policykit-1
       - ppp-dev
       - python-dbus
       - python-gi
       - udev
       - uuid-dev
-      - valac
       - wireless-tools
 
     # We don't want that anything from our staged packages ends