Update of /cvsroot/leaf/src/bering-uclibc/apps/lcd4linux
In directory sc8-pr-cvs1:/tmp/cvs-serv17768
Modified Files:
buildtool.cfg buildtool.mk lcd4linux.conf
Added Files:
lcd4linux-0.9.11-pre1.tar.gz
Removed Files:
lcd4linux-0.9.11.tar.gz
Log Message:
Back in sync with the latest (unpatched) sources from lcd4linux.sf.net which include
icons (for diaplying a heartbeat).
--- NEW FILE: lcd4linux-0.9.11-pre1.tar.gz ---
(This appears to be a binary file; contents omitted.)
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/lcd4linux/buildtool.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.cfg 18 Aug 2003 15:52:53 -0000 1.3
--- buildtool.cfg 14 Sep 2003 10:21:55 -0000 1.4
***************
*** 11,15 ****
</File>
! <File lcd4linux-0.9.11.tar.gz>
Server = cvs-sourceforge
Revision = HEAD
--- 11,15 ----
</File>
! <File lcd4linux-0.9.11-pre1.tar.gz>
Server = cvs-sourceforge
Revision = HEAD
***************
*** 31,39 ****
</File>
<Package>
<lcd4linx>
! Version = 0.9.11
! Revision = 3
--- 31,46 ----
</File>
+ <File lcd4linux.patch>
+ Server = cvs-sourceforge
+ Directory = lcd4linux
+ Revision = HEAD
+ envname=LCD4LINUX_PATCH1
+ </File>
+
<Package>
<lcd4linx>
! Version = 0.9.11-pre1
! Revision = 1
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/lcd4linux/buildtool.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.mk 15 Aug 2003 15:39:07 -0000 1.3
--- buildtool.mk 14 Sep 2003 10:21:56 -0000 1.4
***************
*** 6,10 ****
include $(MASTERMAKEFILE)
! LCD4LINUX_DIR:=lcd4linux-0.9.11
LCD4LINUX_TARGET_DIR:=$(BT_BUILD_DIR)/lcd4linux
export CC=$(TARGET_CC)
--- 6,10 ----
include $(MASTERMAKEFILE)
! LCD4LINUX_DIR:=lcd4linux-0.9.11-pre1
LCD4LINUX_TARGET_DIR:=$(BT_BUILD_DIR)/lcd4linux
export CC=$(TARGET_CC)
***************
*** 15,22 ****
source:
zcat $(LCD4LINUX_SOURCE) | tar -xvf -
! patch -d $(LCD4LINUX_DIR) -p1 < $(LCD4LINUX_PATCH1)
-mkdir $(LCD4LINUX_TARGET_DIR)
! #perl -i -p -e 's,sinclude\(curses.m4\),#sinclude\(curses.m4\),'
$(LCD4LINUX_DIR)/configure.in
! #perl -i -p -e 's,AC_CHECK_CURSES,#AC_CHECK_CURSES,'
$(LCD4LINUX_DIR)/configure.in
(cd $(LCD4LINUX_DIR); aclocal-1.4);
(cd $(LCD4LINUX_DIR); autoconf);
--- 15,28 ----
source:
zcat $(LCD4LINUX_SOURCE) | tar -xvf -
! #cat $(LCD4LINUX_PATCH1) | patch -d $(LCD4LINUX_DIR) -p1
! #cp config.sub $(LCD4LINUX_DIR)/
!
!
! build:
-mkdir $(LCD4LINUX_TARGET_DIR)
! -mkdir -p $(LCD4LINUX_TARGET_DIR)/etc/init.d
! -mkdir -p $(BT_STAGING_DIR)/etc/init.d
! -mkdir -p $(BT_STAGING_DIR)/usr/sbin
! (cd $(LCD4LINUX_DIR); $(MAKE) clean);
(cd $(LCD4LINUX_DIR); aclocal-1.4);
(cd $(LCD4LINUX_DIR); autoconf);
***************
*** 29,51 ****
--without-vcurses \
--without-ncurses \
! --without-x \
!
--with-drivers=BeckmannEgle,CrystalFontz,Cwlinux,HD44780,M50530,T6963,USBLCD,MatrixOrbital
);
! #perl -i -p -e 's,#define realloc rpl_realloc.*,/* #define realloc rpl_realloc
*/,' $(LCD4LINUX_DIR)/config.h
! #perl -i -p -e 's,#define malloc rpl_malloc.*,/* #define malloc rpl_malloc
*/,' $(LCD4LINUX_DIR)/config.h
perl -i -p -e 's,DESTDIR =.*,DESTDIR =$(LCD4LINUX_TARGET_DIR),'
$(LCD4LINUX_DIR)/Makefile
-
-
- build:
- $(MAKE) CC=$(TARGET_CC) -C $(LCD4LINUX_DIR)
$(MAKE) CC=$(TARGET_CC) -C $(LCD4LINUX_DIR) install
$(BT_STRIP) $(STRIP_OPTIONS) $(LCD4LINUX_TARGET_DIR)/usr/bin/lcd4linux
- -mkdir -p $(LCD4LINUX_TARGET_DIR)/etc/init.d
- -mkdir -p $(BT_STAGING_DIR)/etc/init.d
-cp lcd4linux.conf $(LCD4LINUX_TARGET_DIR)/etc/
-cp $(LCD4LINUX_TARGET_DIR)/etc/lcd4linux.conf $(BT_STAGING_DIR)/etc/
! -cp $(LCD4LINUX_TARGET_DIR)/usr/bin/lcd4linux $(BT_STAGING_DIR)/usr/sbin/
-cp lcd4linux $(LCD4LINUX_TARGET_DIR)/etc/init.d
-cp lcd4linux $(BT_STAGING_DIR)/etc/init.d
!
clean:
--- 35,50 ----
--without-vcurses \
--without-ncurses \
! --with-x=no \
!
--with-drivers=BeckmannEgle,CrystalFontz,Cwlinux,HD44780,M50530,T6963,USBLCD,MatrixOrbital);
! $(MAKE) CC=$(TARGET_CC) -C $(LCD4LINUX_DIR) lcd4linux
perl -i -p -e 's,DESTDIR =.*,DESTDIR =$(LCD4LINUX_TARGET_DIR),'
$(LCD4LINUX_DIR)/Makefile
$(MAKE) CC=$(TARGET_CC) -C $(LCD4LINUX_DIR) install
$(BT_STRIP) $(STRIP_OPTIONS) $(LCD4LINUX_TARGET_DIR)/usr/bin/lcd4linux
-cp lcd4linux.conf $(LCD4LINUX_TARGET_DIR)/etc/
-cp $(LCD4LINUX_TARGET_DIR)/etc/lcd4linux.conf $(BT_STAGING_DIR)/etc/
! -cp $(LCD4LINUX_TARGET_DIR)/usr/bin/lcd4linux* $(BT_STAGING_DIR)/usr/sbin/
-cp lcd4linux $(LCD4LINUX_TARGET_DIR)/etc/init.d
-cp lcd4linux $(BT_STAGING_DIR)/etc/init.d
!
clean:
***************
*** 54,58 ****
$(MAKE) -C $(LCD4LINUX_DIR) clean
rm -f $(BT_STAGING_DIR)/etc/lcd4linux.conf
! rm -f $(BT_STAGING_DIR)/usr/sbin/lcd4linux
rm -f $(BT_STAGING_DIR)/etc/init.d/lcd4linux
--- 53,57 ----
$(MAKE) -C $(LCD4LINUX_DIR) clean
rm -f $(BT_STAGING_DIR)/etc/lcd4linux.conf
! rm -f $(BT_STAGING_DIR)/usr/sbin/lcd4linux*
rm -f $(BT_STAGING_DIR)/etc/init.d/lcd4linux
Index: lcd4linux.conf
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/lcd4linux/lcd4linux.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lcd4linux.conf 18 Aug 2003 15:52:53 -0000 1.2
--- lcd4linux.conf 14 Sep 2003 10:21:56 -0000 1.3
***************
*** 1,26 ****
! Display HD44780
#Port 0x378
! Port /dev/parports/1
! #Port /dev/gpio1
! Size 20x4
! Row1 "Load %l1 $r10cs+cb"
! Row2 "Net %nm $R10nr+nw"
! Row3 "PPP %tm $R10ti+to"
! Row4
! Tick 100
! Tack 400
! Tau 500
Overload 2.0
! Delay_e1 5
! Delay_e2 20
! Delay_e3 20
! Delay_e4 120
! Rows 4
! Scroll 0
! Turn 4000
\ No newline at end of file
--- 1,108 ----
! #---------------------------------------
! # driver selection
!
! ###Crystalfontz
! #Display 626
! #Display 632
! #Display 634
! #Display 636
! #Port /dev/ttyS0
! #Speed 9600
! #Backlight 100
! #Contrast 50
!
! ###cwlinux
! #Display CW1602
! #Display CW12232
! #Port /dev/ttyS1
! #Port /dev/usb/tts/1
! #Speed 19200
! #Brightness 6
!
! ###M50530
! #Display "M50530"
#Port 0x378
! #Port /dev/parports/0
! #Size "24x8"
! #Wire.EX "STROBE"
! #Wire.IOC1 "SELECT"
! #Wire.IOC2 "AUTOFD"
! #Wire.GPO "INIT"
! #GPOs 0
! ###MatrixOrbital
! #Display LCD2041
! #Port /dev/ttyS2
! #Speed 19200
! #Contrast 160
! ###Beckmann+Egle
! #Display BLC100x
! #Port /dev/ttyS2
! #Type 20x4
!
! ###USBLCD
! #Display USBLCD
! #Port /dev/usb/usblcd
! #Size 20x4
!
! ###Thoshiba T6963
! #Display TLC1091
! #Display DMF5002N
! #Port 0x378
! #Port /dev/parports/0
! #Size 24x8
! #Wire.CE "STROBE"
! #Wire.CD "SELECT"
! #Wire.RD "AUTOFD"
! #Wire.WR "INIT"
!
! ###HD44780 based
! #Display HD44780
! #Port 0x378
! #Port /dev/parports/1
! #Port /dev/gpio0
! #Size 20x4
! #GPOs 0
!
! # 4 Bit protocol/wiring
! #Bits 4
! #Wire.RS "DB4"
! #Wire.RW "DB5"
! #Wire.ENABLE "DB6"
! #Wire.GPO "GND"
!
! #---------------------------------------
! # display config
!
! Row1 \040\040\040 %o %v \040\040&1
! Row2 CPU %cb%%$r10cb
! Row3 Net %nm $R10nr+nw
! Row4 Load%l1 $r10cs+cb
! Row5 \040\040\040 %o %v \040\040&1
! Row6 CPU %cb%% $r10cb
! Row7 Net %nm $R10nr+nw
! Row8 PPP %ti $R8ti+to %to
!
! Rows 8
! Scroll 4
! Turn 5000
!
! Tick.Text 400
! Tick.Bar 100
! Tick.Icon 250
! Tick.GPO 100
Overload 2.0
! Icons 1
! Icon1.Bitmap1 .....|.....|.....
! Icon1.Bitmap2 .*.*.|.*.*.|.....
! Icon1.Bitmap3 *****|*****|.*.*.
! Icon1.Bitmap4 *****|*****|.***.
! Icon1.Bitmap5 .***.|.***.|.***.
! Icon1.Bitmap6 .***.|.***.|..*..
! Icon1.Bitmap7 ..*..|..*..|.....
! Icon1.Bitmap8 .....|.....|.....
--- lcd4linux-0.9.11.tar.gz DELETED ---
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Leaf-cvs-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
