Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openele…

…c-next
OpenELEC · Jan 20, 2013 · 0230d62 · 0230d62
2 parents d2f8bc0 + adf4ab8
commit 0230d62
Show file tree

Hide file tree

Showing 36 changed files with 102 additions and 411 deletions.
diff --git a/packages/addons/service/system/dcron/addon b/packages/addons/service/system/dcron/addon
diff --git a/packages/addons/service/system/dcron/build b/packages/addons/service/system/dcron/build
diff --git a/packages/addons/service/system/dcron/changelog.txt b/packages/addons/service/system/dcron/changelog.txt
diff --git a/packages/addons/service/system/dcron/config/prune-cronstamps b/packages/addons/service/system/dcron/config/prune-cronstamps
diff --git a/packages/addons/service/system/dcron/config/root.crond b/packages/addons/service/system/dcron/config/root.crond
diff --git a/packages/addons/service/system/dcron/icon/icon.png b/packages/addons/service/system/dcron/icon/icon.png
diff --git a/packages/addons/service/system/dcron/meta b/packages/addons/service/system/dcron/meta
diff --git a/packages/addons/service/system/dcron/source/bin/dcron.start b/packages/addons/service/system/dcron/source/bin/dcron.start
diff --git a/packages/addons/service/system/dcron/source/bin/dcron.stop b/packages/addons/service/system/dcron/source/bin/dcron.stop
diff --git a/packages/addons/service/system/dcron/source/default.py b/packages/addons/service/system/dcron/source/default.py
diff --git a/packages/addons/shell/texteditor/nano/addon b/packages/addons/shell/texteditor/nano/addon
diff --git a/packages/addons/shell/texteditor/nano/changelog.txt b/packages/addons/shell/texteditor/nano/changelog.txt
diff --git a/packages/addons/shell/texteditor/nano/icon/icon.png b/packages/addons/shell/texteditor/nano/icon/icon.png
diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
@@ -31,6 +31,7 @@
     <setting id="SAMBA_SECURITY" value="false" />
     <setting id="SAMBA_USERNAME" value="openelec" />
     <setting id="SAMBA_PASSWORD" value="openelec" />
+    <setting id="CROND_START" value="false" />
     <setting id="UPDATE_AUTO" value="manual" />
     <setting id="X11_KEYMAP" value="us" />
     <setting id="X11_KEYMAP2" value="-none-" />

diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
@@ -46,4 +46,8 @@
 	<string id="5020">SSH</string>
 	<string id="5021">Start ssh server at boot</string>
 	<string id="5022">Disable password authentication</string>
+
+	<string id="5030">crond</string>
+	<string id="5031">Start cron daemon at boot</string>
+
 </strings>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
@@ -78,5 +78,8 @@
 		<setting type="sep" />
 		<setting id="SSHD_START" type="bool" label="5021" default="false" />
 		<setting id="SSHD_DISABLE_PW_AUTH" type="bool" label="5022" default="false" visible="eq(-1,true)"/>
+		<setting label="5030" type="lsep"/>
+		<setting type="sep" />
+		<setting id="CROND_START" type="bool" label="5031" default="false" />
     </category>
 </settings>
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg libass curl libssh rtmpdump fontconfig tinyxml freetype libmad libogg libmodplug faad2 flac libmpeg2 taglib yajl sqlite bc xbmc-addon-settings"
+PKG_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg libass curl libssh rtmpdump fontconfig tinyxml freetype libmad libogg libmodplug faad2 flac libmpeg2 taglib yajl sqlite xbmc-addon-settings"
 PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre swig ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 taglib yajl sqlite"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"

diff --git a/packages/addons/shell/texteditor/nano/build → packages/shell/texteditor/nano/build b/packages/addons/shell/texteditor/nano/build → packages/shell/texteditor/nano/build
diff --git a/packages/tools/bc/install → packages/shell/texteditor/nano/install b/packages/tools/bc/install → packages/shell/texteditor/nano/install
@@ -22,5 +22,6 @@
 
 . config/options $1
 
+
 mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/bc/bc $INSTALL/usr/bin
+  cp $PKG_BUILD/src/nano $INSTALL/usr/bin