summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@krebs>2011-08-21 01:24:22 +0200
committerroot <root@krebs>2011-08-21 01:24:22 +0200
commit290661314c70e43a8bbf3fbe2057e8ab2a860144 (patch)
treeefdeb4da7e6618da575ece6915c00a0eb31b5575
parent942ca8ed0b8f698769ead7928cbef87c074c0328 (diff)
oncology: fix Makefile/build/config
lcd4linux.conf - removed fucking white space, minor fuckups Makefile - correct dependency handling, patch /etc/init.d/lcd4linux
-rw-r--r--oncology/Makefile20
-rw-r--r--oncology/lcd4linux.conf20
2 files changed, 27 insertions, 13 deletions
diff --git a/oncology/Makefile b/oncology/Makefile
index e90d3bc8..258ee130 100644
--- a/oncology/Makefile
+++ b/oncology/Makefile
@@ -1,8 +1,22 @@
-install: /etc/lcd4linux.conf
- #punani -Ei libtool automake autoconf zlib1g-dev libssl-dev python-dev libc6 libusb-dev libibus-dev subversion libgd2-noxpm-dev libgd2-noxpm
+build-deps:
+ #punani -Ei libtool automake autoconf zlib1g-dev libssl-dev python-dev libc6 libusb-dev libibus-dev subversion libgd2-noxpm-dev libgd2-noxpm lcd4linux
+
+/usr/bin/lcd4linux: build-deps
+ #punani -Ei lcd4linux
+ sed -i 's/usr\/sbin\/lcd4linux/usr\/bin\/lcd4linux/g' /etc/init.d/lcd4linux
dpfhack_display/build-dpf-lcd4linux.sh
make -C dpfhack_display/lcd4linux/ install
+lcd4linux_autostart:
+ # service lcd4linux start
+ # update-rc.d lcd4linux
+
+install: /usr/bin/lcd4linux /etc/lcd4linux.conf lcd4linux_autostart
+ # TODO this is debian only
+
+update: /etc/lcd4linux.conf
+
/etc/lcd4linux.conf: lcd4linux.conf
- chown 0:0 lcd4linux.conf
+ chown krebs:krebs lcd4linux.conf
+ chmod 600 lcd4linux.conf
cp -a lcd4linux.conf /etc/lcd4linux.conf
diff --git a/oncology/lcd4linux.conf b/oncology/lcd4linux.conf
index c8cbe75e..e6ad1f90 100644
--- a/oncology/lcd4linux.conf
+++ b/oncology/lcd4linux.conf
@@ -435,7 +435,7 @@ Widget FileTitle {
Widget SetFileMsg {
class 'Timer'
- expression FileMsg = exec('tail -n 1 /root/dskeylistener/listener.log', 2 * second)
+ expression FileMsg = exec('tail -n 1 /var/log/syslog', 2 * second)
active 1
update 2 * second
}
@@ -470,7 +470,7 @@ Widget File3 {
Widget Weather1 {
class 'Text'
expression exec('/krebs/kachelmann/wetter', 10 * second)
- prefix 'Wetter'
+ prefix 'Wetter:'
width width100
align 'L'
Background darkgray
@@ -479,7 +479,7 @@ Widget Weather1 {
Widget Debug {
class 'Text'
- expression 'Serverdisplay - pkern.at'
+ expression 'Serverdisplay - Krebs'
width linesize
align 'C'
Foreground lightgray
@@ -494,7 +494,7 @@ Widget na {
Widget Bgnd {
class 'Image'
- file '/krebs/cholerab/bling/krebs-v2_320x240.png '
+ file '/krebs/cholerab/bling/krebs-v2_320x240.png'
reload 0
update 0
inverted 0
@@ -525,13 +525,13 @@ Layout Krebs {
Row14.Col29 'FSSpace1'
Row17.Col02 'ServicesTitle'
- Row18.Col02 'BindDNSStatus'
- Row19.Col02 'MuninStatus'
+ #Row18.Col02 'BindDNSStatus'
+ #Row19.Col02 'MuninStatus'
Row20.Col02 'ApacheStatus'
- Row21.Col02 'MiniDLNAStatus'
- Row18.Col29 'PostfixStatus'
- Row19.Col29 'ProFTPStatus'
- Row20.Col29 'SambaStatusDS'
+ #Row21.Col02 'MiniDLNAStatus'
+ #Row18.Col29 'PostfixStatus'
+ #Row19.Col29 'ProFTPStatus'
+ #Row20.Col29 'SambaStatusDS'
Row21.Col29 'SSHStatusDS'
Row23.Col02 'Weather1'