From 5e6698328cbba2dca5deedf314b1510d18f2ea9f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 3 Sep 2014 08:23:33 +0200 Subject: [PATCH] remove package 'lm_sensors', moved to unofficial addon repo Signed-off-by: Stephan Raue --- packages/sysutils/lm_sensors/package.mk | 48 ------------------- .../patches/lm_sensors-01_link-static.patch | 25 ---------- projects/Cuboxi/options | 3 -- projects/Generic/options | 3 -- projects/RPi/options | 3 -- scripts/image | 3 -- 6 files changed, 85 deletions(-) delete mode 100644 packages/sysutils/lm_sensors/package.mk delete mode 100644 packages/sysutils/lm_sensors/patches/lm_sensors-01_link-static.patch diff --git a/packages/sysutils/lm_sensors/package.mk b/packages/sysutils/lm_sensors/package.mk deleted file mode 100644 index 01d9918dea..0000000000 --- a/packages/sysutils/lm_sensors/package.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC 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 of the License, or -# (at your option) any later version. -# -# OpenELEC 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. If not, see . -################################################################################ - -PKG_NAME="lm_sensors" -PKG_VERSION="3.3.4" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://secure.netroedge.com/~lm78/" -PKG_URL="http://ftp.gwdg.de/pub/linux/misc/lm-sensors/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="lm_sensors: Hardware monitoring via the SMBus" -PKG_LONGDESC="lm_sensors is a package to get data from the SMB (System Management Bus - an i2c bus) on modern mainboards. It consists of kernel modules and users space tools to get stuff like cpu / mb temperature, voltages, fan speed..." - -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" - -PKG_MAKE_OPTS_TARGET="PREFIX=/usr CC=$TARGET_CC AR=$TARGET_AR" -PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr" - -pre_make_target() { - export CFLAGS="$TARGET_CFLAGS" - export CPPFLAGS="$TARGET_CPPFLAGS" -} - -post_makeinstall_target() { - rm -rf $INSTALL/usr/bin/sensors-conf-convert - rm -rf $INSTALL/usr/sbin/ - rm -rf $INSTALL/usr/lib - $STRIP $INSTALL/usr/bin/sensors -} diff --git a/packages/sysutils/lm_sensors/patches/lm_sensors-01_link-static.patch b/packages/sysutils/lm_sensors/patches/lm_sensors-01_link-static.patch deleted file mode 100644 index 8535cbb4fa..0000000000 --- a/packages/sysutils/lm_sensors/patches/lm_sensors-01_link-static.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0b2b2e26bbae3d06580080a66a85e5e0d90ea9f6 Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Sun, 10 Aug 2014 14:21:19 +0300 -Subject: [PATCH] link static - ---- - prog/sensors/Module.mk | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/prog/sensors/Module.mk b/prog/sensors/Module.mk -index b656441..ad59874 100644 ---- a/prog/sensors/Module.mk -+++ b/prog/sensors/Module.mk -@@ -40,7 +40,7 @@ REMOVESENSORSMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGSENSORSMAN1DIR)/% - LIBICONV := $(shell if /sbin/ldconfig -p | grep -q '/libiconv\.so$$' ; then echo \-liconv; else echo; fi) - - $(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBSHBASENAME) -- $(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -lsensors -+ $(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -Wl,-Bstatic -lsensors -Wl,-Bdynamic -lm - - all-prog-sensors: $(PROGSENSORSTARGETS) - user :: all-prog-sensors --- -1.7.2.5 - diff --git a/projects/Cuboxi/options b/projects/Cuboxi/options index 9c25455b0f..0cb06f9823 100644 --- a/projects/Cuboxi/options +++ b/projects/Cuboxi/options @@ -317,9 +317,6 @@ # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" FIRMWARE="misc-firmware wlan-firmware dvb-firmware" -# build with lm_sensors hardware monitoring support (yes / no) - SENSOR_SUPPORT="yes" - # build with swap support (yes / no) SWAP_SUPPORT="no" diff --git a/projects/Generic/options b/projects/Generic/options index 141cbaf9b3..e7cbccdbaa 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -321,9 +321,6 @@ # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" FIRMWARE="misc-firmware wlan-firmware dvb-firmware" -# build with lm_sensors hardware monitoring support (yes / no) - SENSOR_SUPPORT="yes" - # build with swap support (yes / no) SWAP_SUPPORT="no" diff --git a/projects/RPi/options b/projects/RPi/options index 5f98973d56..b6fb09246a 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -316,9 +316,6 @@ # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" FIRMWARE="misc-firmware wlan-firmware dvb-firmware" -# build with lm_sensors hardware monitoring support (yes / no) - SENSOR_SUPPORT="yes" - # build with swap support (yes / no) SWAP_SUPPORT="yes" diff --git a/scripts/image b/scripts/image index 997287c9e0..ea921a6c14 100755 --- a/scripts/image +++ b/scripts/image @@ -153,9 +153,6 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" # LCD support [ ! "$LCD_DRIVER" = "none" ] && $SCRIPTS/install lcdproc -# Sensors support - [ "$SENSOR_SUPPORT" = "yes" ] && $SCRIPTS/install lm_sensors - # Installer support [ "$INSTALLER_SUPPORT" = "yes" ] && $SCRIPTS/install installer