Merge remote-tracking branch 'upstream/master' into openelec-systemd

Conflicts:
	packages/sysutils/open-vm-tools/package.mk
This commit is contained in:
Stefan Saraev 2013-08-10 12:40:06 +03:00
commit 44504b8c63
3 changed files with 4 additions and 4 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="connman"
PKG_VERSION="d052eb3"
PKG_VERSION="38c1662"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -28,8 +28,9 @@
# ensure that environment is sane
. /etc/profile
if [ -e $CONFIG_CACHE/syslog/remote ] ; then
source $CONFIG_CACHE/syslog/remote
SYSLOG_REMOTE=false
if [ -e $CONFIG_CACHE/service_syslog.conf ] ; then
. $CONFIG_CACHE/service_syslog.conf
fi
SYSLOGD_OPTIONS="-L"

View File

@ -67,4 +67,3 @@ makeinstall_target() {
post_install() {
enable_service open-vm-tools.service
}