jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-02 15:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/network/connman/package.mk
View File

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

5
packages/sysutils/busybox/init.d/05_syslogd
View File

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

1
packages/sysutils/open-vm-tools/package.mk
View File

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