diff --git a/packages/addons/service/system/dcron/addon b/packages/addons/service/system/dcron/addon deleted file mode 100755 index 773bd0da0e..0000000000 --- a/packages/addons/service/system/dcron/addon +++ /dev/null @@ -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/ diff --git a/packages/addons/service/system/dcron/build b/packages/addons/service/system/dcron/build deleted file mode 100755 index d661c64673..0000000000 --- a/packages/addons/service/system/dcron/build +++ /dev/null @@ -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 diff --git a/packages/addons/service/system/dcron/changelog.txt b/packages/addons/service/system/dcron/changelog.txt deleted file mode 100644 index a3dd47b752..0000000000 --- a/packages/addons/service/system/dcron/changelog.txt +++ /dev/null @@ -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 diff --git a/packages/addons/service/system/dcron/config/prune-cronstamps b/packages/addons/service/system/dcron/config/prune-cronstamps deleted file mode 100644 index e256580360..0000000000 --- a/packages/addons/service/system/dcron/config/prune-cronstamps +++ /dev/null @@ -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 diff --git a/packages/addons/service/system/dcron/config/root.crond b/packages/addons/service/system/dcron/config/root.crond deleted file mode 100644 index 56c0808348..0000000000 --- a/packages/addons/service/system/dcron/config/root.crond +++ /dev/null @@ -1,12 +0,0 @@ -# root crontab -# DO NOT EDIT THIS FILE MANUALLY! USE crontab -e INSTEAD - -# man 1 crontab for acceptable formats: -# -# <@freq> - -# 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 diff --git a/packages/addons/service/system/dcron/icon/icon.png b/packages/addons/service/system/dcron/icon/icon.png deleted file mode 100644 index 5d2f49cd81..0000000000 Binary files a/packages/addons/service/system/dcron/icon/icon.png and /dev/null differ diff --git a/packages/addons/service/system/dcron/meta b/packages/addons/service/system/dcron/meta deleted file mode 100755 index 6d6c13304f..0000000000 --- a/packages/addons/service/system/dcron/meta +++ /dev/null @@ -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" diff --git a/packages/addons/service/system/dcron/source/bin/dcron.start b/packages/addons/service/system/dcron/source/bin/dcron.start deleted file mode 100755 index ba22a14825..0000000000 --- a/packages/addons/service/system/dcron/source/bin/dcron.start +++ /dev/null @@ -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 diff --git a/packages/addons/service/system/dcron/source/bin/dcron.stop b/packages/addons/service/system/dcron/source/bin/dcron.stop deleted file mode 100755 index f93d82434a..0000000000 --- a/packages/addons/service/system/dcron/source/bin/dcron.stop +++ /dev/null @@ -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 diff --git a/packages/addons/service/system/dcron/source/default.py b/packages/addons/service/system/dcron/source/default.py deleted file mode 100755 index 55136ed296..0000000000 --- a/packages/addons/service/system/dcron/source/default.py +++ /dev/null @@ -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) diff --git a/packages/addons/shell/texteditor/nano/addon b/packages/addons/shell/texteditor/nano/addon deleted file mode 100755 index 0a5f1fc693..0000000000 --- a/packages/addons/shell/texteditor/nano/addon +++ /dev/null @@ -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 diff --git a/packages/addons/shell/texteditor/nano/changelog.txt b/packages/addons/shell/texteditor/nano/changelog.txt deleted file mode 100644 index 1834b2696c..0000000000 --- a/packages/addons/shell/texteditor/nano/changelog.txt +++ /dev/null @@ -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 diff --git a/packages/addons/shell/texteditor/nano/icon/icon.png b/packages/addons/shell/texteditor/nano/icon/icon.png deleted file mode 100644 index 84cfefded5..0000000000 Binary files a/packages/addons/shell/texteditor/nano/icon/icon.png and /dev/null differ diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml index 67d8b9c81a..7694941487 100644 --- a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml @@ -31,6 +31,7 @@ + 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 index 2b5b78f4b8..b083744f13 100644 --- 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 @@ SSH Start ssh server at boot Disable password authentication + + crond + Start cron daemon at boot + diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml index dff77a8eee..ec117f030e 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml @@ -78,5 +78,8 @@ + + + diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index b4baa6a820..cf6be861fe 100644 --- 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 b/packages/shell/texteditor/nano/build similarity index 100% rename from packages/addons/shell/texteditor/nano/build rename to packages/shell/texteditor/nano/build diff --git a/packages/tools/bc/install b/packages/shell/texteditor/nano/install similarity index 96% rename from packages/tools/bc/install rename to packages/shell/texteditor/nano/install index 072f41d6a0..d35348a0dd 100755 --- a/packages/tools/bc/install +++ b/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 diff --git a/packages/addons/shell/texteditor/nano/meta b/packages/shell/texteditor/nano/meta similarity index 96% rename from packages/addons/shell/texteditor/nano/meta rename to packages/shell/texteditor/nano/meta index 31f406ae76..bce92a348e 100644 --- a/packages/addons/shell/texteditor/nano/meta +++ b/packages/shell/texteditor/nano/meta @@ -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" diff --git a/packages/addons/shell/texteditor/nano/source/default.py b/packages/shell/texteditor/nano/profile.d/nano.conf similarity index 79% rename from packages/addons/shell/texteditor/nano/source/default.py rename to packages/shell/texteditor/nano/profile.d/nano.conf index 8d4c5e9e96..8d9262bce3 100644 --- a/packages/addons/shell/texteditor/nano/source/default.py +++ b/packages/shell/texteditor/nano/profile.d/nano.conf @@ -17,7 +17,10 @@ # the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. # http://www.gnu.org/copyleft/gpl.html ################################################################################ +# Core (EDITOR) environment variable. +# +# This file contains non-OpenELEC evironment variables as well as OpenELEC +# evironment variables that are not user defined. +################################################################################ -import os -import sys -import xbmcaddon +export EDITOR="nano" diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index 03019de61d..d945b26cde 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -664,11 +664,11 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set # CONFIG_FEATURE_CHAT_CLR_ABORT is not set # CONFIG_CHRT is not set -# CONFIG_CROND is not set -# CONFIG_FEATURE_CROND_D is not set +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="" -# CONFIG_CRONTAB is not set +CONFIG_FEATURE_CROND_DIR="/storage/.cache/cron" +CONFIG_CRONTAB=y # CONFIG_DC is not set # CONFIG_FEATURE_DC_LIBM is not set # CONFIG_DEVFSD is not set diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index 135928b0b7..64b61ca2e2 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -68,3 +68,12 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`" mkdir -p $INSTALL/usr/www/error echo "404" > $INSTALL/usr/www/error/404.html + + # cron support + if [ "$CRON_SUPPORT" = "yes" ] ; then + mkdir -p $INSTALL/etc/init.d + cp $PKG_DIR/scripts/09_crond $INSTALL/etc/init.d/ + else + rm -f $INSTALL/sbin/crond + rm -f $INSTALL/bin/crontab + fi diff --git a/packages/tools/bc/build b/packages/sysutils/busybox/scripts/09_crond old mode 100755 new mode 100644 similarity index 78% rename from packages/tools/bc/build rename to packages/sysutils/busybox/scripts/09_crond index 0eb068f21b..cae21e563b --- a/packages/tools/bc/build +++ b/packages/sysutils/busybox/scripts/09_crond @@ -1,5 +1,3 @@ -#!/bin/sh - ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) @@ -20,13 +18,19 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. config/options $1 +# +# start cron daemon +# +# runlevels: openelec, textmode -cd $PKG_BUILD +( + if [ -f /var/config/settings.conf ]; then + . /var/config/settings.conf + fi -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --disable-nls \ - -make + if [ "$CROND_START" == "true" ]; then + progress "Starting cron daemon" + mkdir -p /storage/.cache/cron/crontabs + crond -b + fi +)& diff --git a/packages/tools/bc/meta b/packages/tools/bc/meta deleted file mode 100644 index e69763a798..0000000000 --- a/packages/tools/bc/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="bc" -PKG_VERSION="1.06" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.gnu.org/software/bc/bc.html" -PKG_URL="ftp://ftp.gnu.org/gnu/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="tools" -PKG_SHORTDESC="bc: GNU's numeric processing language and a calculator" -PKG_LONGDESC="Bc is an arbitrary precision numeric processing language. Syntax is similar to C, but differs in many substantial areas. It supports interactive execution of statements. Bc is a utility included in the POSIX P1003.2/D11 draft standard. Since the POSIX document does not specify how bc must be implemented, this version does not use the historical method of having bc be a compiler for the dc calculator. This version has a single executable that both compiles the language and runs the resulting 'byte code'. The byte code is not the dc language." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/packages/tools/bc/patches/bc-1.06-automake-1.13.patch b/packages/tools/bc/patches/bc-1.06-automake-1.13.patch deleted file mode 100644 index a6eeba8d09..0000000000 --- a/packages/tools/bc/patches/bc-1.06-automake-1.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur bc-1.06/configure.in bc-1.06.patch/configure.in ---- bc-1.06/configure.in 2000-07-08 01:34:09.000000000 +0200 -+++ bc-1.06.patch/configure.in 2013-01-12 09:17:40.085444318 +0100 -@@ -1,7 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. - AC_INIT(doc/bc.1) - AM_INIT_AUTOMAKE("bc", "1.06") --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - AC_DEFINE(DC_VERSION,"1.3") - AC_DEFINE_UNQUOTED(BC_COPYRIGHT, dnl diff --git a/projects/ATV/options b/projects/ATV/options index b544ea619d..2207844b46 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -327,6 +327,12 @@ # OEM packages for OEM's (yes / no) OEM_SUPPORT="no" +# build and install nano text editor (yes / no) + NANO_EDITOR="yes" + +# cron support (yes / no) + CRON_SUPPORT="yes" + # Coreboot support (yes / no) COREBOOT="no" diff --git a/projects/Fusion/options b/projects/Fusion/options index 00a188d25b..c1f4fc7609 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -326,6 +326,12 @@ # OEM packages for OEM's (yes / no) OEM_SUPPORT="no" +# build and install nano text editor (yes / no) + NANO_EDITOR="yes" + +# cron support (yes / no) + CRON_SUPPORT="yes" + # Coreboot support (yes / no) COREBOOT="no" diff --git a/projects/Generic/options b/projects/Generic/options index 71a0d6e8a9..8ae8c8e38c 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -326,6 +326,12 @@ # OEM packages for OEM's (yes / no) OEM_SUPPORT="no" +# build and install nano text editor (yes / no) + NANO_EDITOR="yes" + +# cron support (yes / no) + CRON_SUPPORT="yes" + # Coreboot support (yes / no) COREBOOT="no" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index d6fb78b838..558fba5607 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -326,6 +326,12 @@ # OEM packages for OEM's (yes / no) OEM_SUPPORT="no" +# build and install nano text editor (yes / no) + NANO_EDITOR="yes" + +# cron support (yes / no) + CRON_SUPPORT="yes" + # Coreboot support (yes / no) COREBOOT="no" diff --git a/projects/ION/options b/projects/ION/options index ec08935ee8..bc4f0d5a73 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -326,6 +326,12 @@ # OEM packages for OEM's (yes / no) OEM_SUPPORT="no" +# build and install nano text editor (yes / no) + NANO_EDITOR="yes" + +# cron support (yes / no) + CRON_SUPPORT="yes" + # Coreboot support (yes / no) COREBOOT="no" diff --git a/projects/Intel/options b/projects/Intel/options index c7bbb49e8c..725f470d8f 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -326,6 +326,12 @@ # OEM packages for OEM's (yes / no) OEM_SUPPORT="no" +# build and install nano text editor (yes / no) + NANO_EDITOR="yes" + +# cron support (yes / no) + CRON_SUPPORT="yes" + # Coreboot support (yes / no) COREBOOT="no" diff --git a/projects/RPi/options b/projects/RPi/options index 442d4f6af6..b5ab03144b 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -326,6 +326,12 @@ # OEM packages for OEM's (yes / no) OEM_SUPPORT="no" +# build and install nano text editor (yes / no) + NANO_EDITOR="yes" + +# cron support (yes / no) + CRON_SUPPORT="yes" + # Coreboot support (yes / no) COREBOOT="no" diff --git a/projects/Ultra/options b/projects/Ultra/options index 1b3d95f45c..fccf6f61ec 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -326,6 +326,12 @@ # OEM packages for OEM's (yes / no) OEM_SUPPORT="no" +# build and install nano text editor (yes / no) + NANO_EDITOR="yes" + +# cron support (yes / no) + CRON_SUPPORT="yes" + # Coreboot support (yes / no) COREBOOT="no" diff --git a/projects/Virtual/options b/projects/Virtual/options index 0e1bbe6937..e3c6238c9b 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -321,6 +321,12 @@ # OEM packages for OEM's (yes / no) OEM_SUPPORT="no" +# build and install nano text editor (yes / no) + NANO_EDITOR="yes" + +# cron support (yes / no) + CRON_SUPPORT="yes" + # Coreboot support (yes / no) COREBOOT="no" diff --git a/scripts/image b/scripts/image index dd46401e7a..96266e3d02 100755 --- a/scripts/image +++ b/scripts/image @@ -148,6 +148,9 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" # OEM packages [ "$OEM_SUPPORT" = "yes" ] && $SCRIPTS/install oem +# nano text editor + [ "$NANO_EDITOR" = "yes" ] && $SCRIPTS/install nano + # copy project related files to filesystem if [ -d "$PROJECT_DIR/$PROJECT/filesystem" ]; then cp -PR $PROJECT_DIR/$PROJECT/filesystem/* $INSTALL