From 16442f04bbee7d8b737ba7f4c3c61f521e306581 Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Fri, 19 Apr 2013 09:42:55 +0200 Subject: [PATCH] Add proper less to image (disable busybox less) The version of less in busybox is quite annoying when working on OpenELEC. It doesn't properly support searching in files or tailing (and interrupting) logfiles. It also doesn't properly handle non-ascii characters. This patch disables busybox less and instead adds the latest stable less release. --- packages/sysutils/busybox/config/busybox.conf | 4 +-- packages/sysutils/busybox/meta | 2 +- packages/sysutils/less/build | 36 +++++++++++++++++++ packages/sysutils/less/install | 27 ++++++++++++++ packages/sysutils/less/meta | 35 ++++++++++++++++++ 5 files changed, 101 insertions(+), 3 deletions(-) create mode 100755 packages/sysutils/less/build create mode 100755 packages/sysutils/less/install create mode 100644 packages/sysutils/less/meta diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index ab0017cc50..55d7768365 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -635,8 +635,8 @@ CONFIG_FEATURE_VOLUMEID_LINUXRAID=y # Miscellaneous Utilities # # CONFIG_CONSPY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 +# CONFIG_LESS is not set +# CONFIG_FEATURE_LESS_MAXLINES is not set # CONFIG_FEATURE_LESS_BRACKETS is not set # CONFIG_FEATURE_LESS_FLAGS is not set # CONFIG_FEATURE_LESS_MARKS is not set diff --git a/packages/sysutils/busybox/meta b/packages/sysutils/busybox/meta index 51f0927db7..b283e5b209 100644 --- a/packages/sysutils/busybox/meta +++ b/packages/sysutils/busybox/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.busybox.net" PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="bash kexec-tools hdparm speedcontrol zip pciutils usbutils" +PKG_DEPENDS="bash kexec-tools hdparm speedcontrol zip pciutils usbutils less" PKG_BUILD_DEPENDS="toolchain busybox-hosttools" PKG_PRIORITY="required" PKG_SECTION="system" diff --git a/packages/sysutils/less/build b/packages/sysutils/less/build new file mode 100755 index 0000000000..46334a878b --- /dev/null +++ b/packages/sysutils/less/build @@ -0,0 +1,36 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2013 Dag Wieers (dag@wieers.com) +# +# 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 +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --bindir=/usr/bin \ + --enable-shared \ + --disable-static \ + --disable-nls \ + --disable-rpath + +make + diff --git a/packages/sysutils/less/install b/packages/sysutils/less/install new file mode 100755 index 0000000000..a4a8e48ae3 --- /dev/null +++ b/packages/sysutils/less/install @@ -0,0 +1,27 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2013 Dag Wieers (dag@wieers.com) +# +# 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 $INSTALL/usr/bin/ + cp $PKG_BUILD/less $INSTALL/usr/bin/ + diff --git a/packages/sysutils/less/meta b/packages/sysutils/less/meta new file mode 100644 index 0000000000..da1eb1e273 --- /dev/null +++ b/packages/sysutils/less/meta @@ -0,0 +1,35 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2013 (dag@wieers.com) +# +# 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="less" +PKG_VERSION="451" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_URL="http://www.greenwoodsoftware.com/less/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="toolchain" +PKG_PRIORITY="optional" +PKG_SECTION="system" +PKG_SHORTDESC="less: free, open-source file pager" +PKG_LONGDESC="Less is a free, open-source file pager. It can be found on most versions of Linux, Unix and Mac OS, as well as on many other operating systems." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no"