Merge pull request #4594 from chewitt/connman-1.31

connman: update to 1.31

packages/network/connman/config/resolv.conf

@@ -1,2 +0,0 @@
-# Generated by Connection Manager
-nameserver 127.0.0.1

packages/network/connman/package.mk

@@ -18,7 +18,7 @@
 
 PKG_NAME="connman"
 # DO NOT UPGRADE!!
-PKG_VERSION="1.30"
+PKG_VERSION="1.31"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -72,6 +72,7 @@ PKG_MAKE_OPTS_TARGET="storagedir=/storage/.cache/connman \
 
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/lib/systemd
+  rm -rf $INSTALL/usr/lib/tmpfiles.d/connman_resolvconf.conf
 
   mkdir -p $INSTALL/usr/bin
     cp -P client/connmanctl $INSTALL/usr/bin
@@ -81,7 +82,10 @@ post_makeinstall_target() {
     cp -P $PKG_DIR/scripts/connman-setup $INSTALL/usr/lib/connman
 
   mkdir -p $INSTALL/etc
-    ln -sf /var/cache/resolv.conf $INSTALL/etc/resolv.conf
+    ln -sf /run/connman/resolv.conf $INSTALL/etc/resolv.conf
+
+    # /etc/hosts must be writeable
+    ln -sf /run/connman/hosts $INSTALL/etc/hosts
 
   mkdir -p $INSTALL/etc/connman
     cp ../src/main.conf $INSTALL/etc/connman

packages/network/connman/tmpfiles.d/z_03_connman.conf

@@ -16,6 +16,5 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-d    /var/cache                  0755 root root - -
 d    /run/connman                0755 root root - -
 d    /storage/.cache/connman     0755 root root - -

packages/sysutils/busybox/package.mk

@@ -183,9 +183,6 @@ makeinstall_target() {
   # /etc/machine-id, needed by systemd and dbus
     ln -sf /run/machine-id $INSTALL/etc/machine-id
 
-  # /etc/hosts must be writeable
-    ln -sf /var/cache/hosts $INSTALL/etc/hosts
-
   # /etc/mtab is needed by udisks etc...
     ln -sf /proc/self/mounts $INSTALL/etc/mtab