Make lm_sensors before collectd

fix sensors lfs merge part 2 (grrr ...)

diff --git a/lfs/collectd b/lfs/collectd
index eaab873c868e94518812fdcdd0f5e63c34f638e4..7114a70fac8ce5f993ad5f2867b1bec5a1d072c3 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -80,10 +80,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
                --disable-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \
                --disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,wireless,xmms} \
-               --disable-{perl,serial,sensors,snmp,tape,vserver,wireless,xmms} \
+               --disable-{perl,serial,snmp,tape,vserver,wireless,xmms} \
                --enable-{apcups,battery,cpu{,freq},df,disk,dns,email,entropy,exec,hddtemp} \
                --enable-{interface,iptables,irq,load,logfile,memory,multimeter} \
-               --enable-{network,nfs,ntpd,ping,processes,rrdtool,swap,sensors,syslog} \
+               --enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \
                --enable-{tcpconns,unixsock,users} \
                --with-rrdtool=/usr/share/rrdtool-1.2.15 --enable-debug
        cd $(DIR_APP) && make install

diff --git a/make.sh b/make.sh
index b0f40bd4f174c8f7b2020f7c11c3e9ddde10c0f5..420ddab664997eadc64930de0177f6937eea1868 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -546,6 +546,7 @@ buildipfire() {
   ipfiremake centerim
   ipfiremake br2684ctl
   ipfiremake pcmciautils
+  ipfiremake lm_sensors
   ipfiremake collectd
   ipfiremake lcd4linux
   ipfiremake neon
@@ -575,7 +576,6 @@ buildipfire() {
   ipfiremake esniper
   ipfiremake vnstat
   ipfiremake vnstati
-  ipfiremake lm_sensors
   ipfiremake mod_perl
 }