From d4ba58cc6608c1011bedd8b0e29ca8f34c1f30d2 Mon Sep 17 00:00:00 2001 From: chewitt Date: Tue, 29 Dec 2015 05:01:43 +0100 Subject: [PATCH] connman: update to 1.31 --- packages/network/connman/config/resolv.conf | 2 -- packages/network/connman/package.mk | 8 ++++++-- packages/network/connman/tmpfiles.d/z_03_connman.conf | 1 - packages/sysutils/busybox/package.mk | 3 --- 4 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 packages/network/connman/config/resolv.conf diff --git a/packages/network/connman/config/resolv.conf b/packages/network/connman/config/resolv.conf deleted file mode 100644 index a39fcf12c6..0000000000 --- a/packages/network/connman/config/resolv.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Generated by Connection Manager -nameserver 127.0.0.1 diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk index 2ef77c7229..4fd427e825 100644 --- a/packages/network/connman/package.mk +++ b/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 diff --git a/packages/network/connman/tmpfiles.d/z_03_connman.conf b/packages/network/connman/tmpfiles.d/z_03_connman.conf index c264c8ddcd..cdc18d8b8e 100644 --- a/packages/network/connman/tmpfiles.d/z_03_connman.conf +++ b/packages/network/connman/tmpfiles.d/z_03_connman.conf @@ -16,6 +16,5 @@ # along with OpenELEC. If not, see . ################################################################################ -d /var/cache 0755 root root - - d /run/connman 0755 root root - - d /storage/.cache/connman 0755 root root - - diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index 0afa6e5679..efa47e9bbe 100644 --- a/packages/sysutils/busybox/package.mk +++ b/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