From 03cae6ae638e7fe824898b930ac4b7ddc15109ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Wed, 23 Oct 2019 09:42:11 +0200 Subject: [PATCH] Revert "component/slapos: Use own lmsensors" This reverts commit 97884c30fea189c55f465a0329d23b2972d97091. Package like lm-sensors, which depends on the kernel, shall be provided by the OS. /reviewed-on https://lab.nexedi.com/nexedi/slapos/merge_requests/642 --- component/slapos/buildout.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/component/slapos/buildout.cfg b/component/slapos/buildout.cfg index 13618bec6..45c0e7058 100644 --- a/component/slapos/buildout.cfg +++ b/component/slapos/buildout.cfg @@ -11,7 +11,6 @@ extends = ../sqlite3/buildout.cfg ../swig/buildout.cfg ../socat/buildout.cfg - ../lmsensors/buildout.cfg parts = slapos @@ -23,7 +22,7 @@ parts = [environment] # Note: For now original PATH is appended to the end, as not all tools are # provided by SlapOS -PATH=${bison:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${m4:location}/bin:${ncurses:location}/bin:${openssl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:${readline:location}/bin:${sqlite3:location}/bin:${swig:location}/bin:${buildout:bin-directory}:${patch:location}/bin:${socat:location}/bin:${lmsensors:location}/bin:$PATH +PATH=${bison:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${m4:location}/bin:${ncurses:location}/bin:${openssl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:${readline:location}/bin:${sqlite3:location}/bin:${swig:location}/bin:${buildout:bin-directory}:${patch:location}/bin:${socat:location}/bin:$PATH CFLAGS=-I${bzip2:location}/include -I${gdbm:location}/include -I${gettext:location}/include -I${glib:location}/include -I${libxml2:location}/include -I${libxslt:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline:location}/include -I${sqlite3:location}/include -I${zlib:location}/include CPPFLAGS=${:CFLAGS} LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${libxslt:location}/lib -Wl,-rpath=${libxslt:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -- 2.30.9