Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

This commit is contained in:
Stephan Raue
2013-01-20 02:04:29 +01:00
36 changed files with 102 additions and 411 deletions

View File

@@ -1,33 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2011-2011 Gregor Fuis (gujs@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
cp -Pa $PKG_BUILD/crond $ADDON_BUILD/$PKG_ADDON_ID/bin/
cp -Pa $PKG_BUILD/crontab $ADDON_BUILD/$PKG_ADDON_ID/bin/
cp -Pa $PKG_BUILD/extra/run-cron $ADDON_BUILD/$PKG_ADDON_ID/bin/
cp -Pa $BUILD/nano-*/src/nano $ADDON_BUILD/$PKG_ADDON_ID/bin/
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/
cp -Pa $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/

View File

@@ -1,35 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
cd $PKG_BUILD
ADDON_DIR="/storage/.xbmc/addons/service.system.dcron/"
ADDON_HOME="/storage/.xbmc/userdata/addon_data/service.system.dcron"
sed -i "s|/usr/bin/vi|$ADDON_DIR/bin/nano|g" defs.h
$MAKE \
CRONTABS=$ADDON_HOME/crontabs \
CRONSTAMPS=$ADDON_HOME/cronstamps \
SCRONTABS=$ADDON_HOME/cron.d

View File

@@ -1,11 +0,0 @@
3.0.1
- bump addon version
2.1.1
- update to addon version 2.1
2.0.2
- add possibilty to start / stop addon from addon manager with enable / disable
2.0
- initial version for dcron 4.5

View File

@@ -1,13 +0,0 @@
# /etc/cron.d/prune-cronstamps
# Prunes any files in /var/spool/cron/cronstamps that haven't been used in ninety
# days. We check that both mtime and atime are greater than this:
#
# atime because the cronstamp may be in use (crond is reading it) but the
# job keeps failing. So the cronstamp hasn't yet been updated.
#
# mtime because the volume the cronstamp is located on may be mounted noatime
# and so its atime won't be updated. At least its mtime will be updated when
# it's modified.
@weekly ID=prune-cronstamps find /storage/.xbmc/userdata/addon_data/service.system.dcron/cronstamps -type f -mtime +90 -atime +90 -delete

View File

@@ -1,12 +0,0 @@
# root crontab
# DO NOT EDIT THIS FILE MANUALLY! USE crontab -e INSTEAD
# man 1 crontab for acceptable formats:
# <minute> <hour> <day> <month> <dow> <tags and command>
# <@freq> <tags and command>
# SYSTEM DAILY/WEEKLY/... FOLDERS
@hourly ID=sys-hourly /storage/.xbmc/addons/service.system.dcron/bin/run-cron /storage/.xbmc/userdata/addon_data/service.system.dcron/cron.hourly
@daily ID=sys-daily /storage/.xbmc/addons/service.system.dcron/bin/run-cron /storage/.xbmc/userdata/addon_data/service.system.dcron/cron.daily
@weekly ID=sys-weekly /storage/.xbmc/addons/service.system.dcron/bin/run-cron /storage/.xbmc/userdata/addon_data/service.system.dcron/cron.weekly
@monthly ID=sys-monthly /storage/.xbmc/addons/service.system.dcron/bin/run-cron /storage/.xbmc/userdata/addon_data/service.system.dcron/cron.monthly

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

View File

@@ -1,37 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2011-2011 Gregor Fuis (gujs@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="dcron"
PKG_VERSION="4.5"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.jimpryor.net/linux/dcron.html"
PKG_URL="http://www.jimpryor.net/linux/releases/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain nano"
PKG_PRIORITY="optional"
PKG_SECTION="service/system"
PKG_SHORTDESC="This lightweight cron daemon aims to be simple and secure, with just enough features to stay useful."
PKG_LONGDESC="This lightweight cron daemon aims to be simple and secure, with just enough features to stay useful."
PKG_IS_ADDON="yes"
PKG_ADDON_TYPE="xbmc.service"
PKG_AUTORECONF="no"

View File

@@ -1,63 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. /etc/profile
LOCKDIR="/var/lock/"
LOCKFILE="dcron.disabled"
ADDON_NAME="service.system.dcron"
ADDON_DIR="$HOME/.xbmc/addons/$ADDON_NAME"
ADDON_HOME="$HOME/.xbmc/userdata/addon_data/$ADDON_NAME"
if [ ! "$(pidof crond)" ]; then
mkdir -p $ADDON_HOME
if [ ! -d $ADDON_HOME/crontabs ]; then
mkdir -p $ADDON_HOME/cron.hourly
mkdir -p $ADDON_HOME/cron.daily
mkdir -p $ADDON_HOME/cron.weekly
mkdir -p $ADDON_HOME/cron.monthly
mkdir -p $ADDON_HOME/crontabs
mkdir -p $ADDON_HOME/cronstamps
mkdir -p $ADDON_HOME/cron.d
cp $ADDON_DIR/config/root.crond $ADDON_HOME/cron.d/root
cp $ADDON_DIR/config/prune-cronstamps $ADDON_HOME/cron.d/
cp $ADDON_DIR/config/root.crontabs $ADDON_HOME/crontabs/root
fi
export PATH=$ADDON_DIR/bin:$PATH
# Restart process if it terminates.
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
rm -rf "$LOCKDIR/$LOCKFILE"
fi
while [ true ] ; do
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
break
fi
crond -f -l info
sleep 1
done &
fi

View File

@@ -1,33 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. /etc/profile
LOCKDIR="/var/lock/"
LOCKFILE="dcron.disabled"
mkdir -p "$LOCKDIR"
touch "$LOCKDIR/$LOCKFILE"
if [ "$(pidof crond)" ]; then
killall -9 crond
fi

View File

@@ -1,44 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2011-2011 Gregor Fuis (gujs@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
import os
import sys
import xbmcaddon
import time
import subprocess
__scriptname__ = "Lightweight cron daemon"
__author__ = "OpenELEC"
__url__ = "http://www.openelec.tv"
__settings__ = xbmcaddon.Addon(id='service.system.dcron')
__cwd__ = __settings__.getAddonInfo('path')
__start__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "dcron.start") )
__stop__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "dcron.stop") )
#make binary files executable in adson bin folder
subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True)
subprocess.Popen(__start__, shell=True, close_fds=True)
while (not xbmc.abortRequested):
time.sleep(0.250)
subprocess.Popen(__stop__, shell=True, close_fds=True)

View File

@@ -1,26 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
cp $PKG_BUILD/src/nano $ADDON_BUILD/$PKG_ADDON_ID/bin

View File

@@ -1,34 +0,0 @@
3.0.1
- bump addon version
2.1.2
- cleanup
2.1.1
- update to addon version 2.1
2.0.0
- prepare for OpenELEC-2.0 release
1.90.1
- depends on xbmc.python API 2.0
1.90.0
- prepare for OpenELEC-1.90 release
1.0.0
- update to nano-2.3.1
- prepare for OpenELEC-1.0 release
0.99.4
- change icon
0.99.3
- build as shared lib
- include ncurses libs
0.99.2
- prepare for release
0.99.1
- initial addon based on nano-2.3.0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

View File

@@ -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-" />

View File

@@ -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>

View File

@@ -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>

View File

@@ -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"

View File

@@ -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

View File

@@ -32,7 +32,5 @@ PKG_SECTION="shell/texteditor"
PKG_SHORTDESC="nano: Pico editor clone with enhancements"
PKG_LONGDESC="GNU nano (Nano's ANOther editor, or Not ANOther editor) is an enhanced clone of the Pico text editor."
PKG_IS_ADDON="yes"
PKG_ADDON_TYPE="xbmc.python.script"
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"

Some files were not shown because too many files have changed in this diff Show More