Update of /cvsroot/leaf/src/bering-uclibc/apps/syslinux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10588

Modified Files:
        buildtool.cfg buildtool.mk 
Added Files:
        syslinux-make.patch 
Log Message:
make sure syslinux-nomtools is linked against uClibc

--- NEW FILE: syslinux-make.patch ---
diff -urN syslinux-2.08.orig/Makefile syslinux-2.08/Makefile
--- syslinux-2.08.orig/Makefile 2003-11-26 01:52:40.000000000 +0100
+++ syslinux-2.08/Makefile      2006-01-23 18:46:21.000000000 +0100
@@ -84,10 +84,10 @@
 DATE    := $(HEXDATE)
 endif
 
-all:   $(BTARGET) $(ITARGET) samples memdisk
+all:   $(BTARGET) $(ITARGET) memdisk
        ls -l $(BTARGET) $(ITARGET) memdisk/memdisk
 
-installer: $(ITARGET) samples
+installer: $(ITARGET)
        ls -l $(BTARGET) $(ITARGET)
 
 .PHONY: samples

Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/syslinux/buildtool.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** buildtool.cfg       24 Mar 2005 20:45:48 -0000      1.4
--- buildtool.cfg       23 Jan 2006 17:55:45 -0000      1.5
***************
*** 16,17 ****
--- 16,23 ----
  </File>
  
+ <File syslinux-make.patch>
+   Server = cvs-sourceforge
+   Revision = HEAD
+   envname = SYSLINUX_PATCH
+ </File>
+ 

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/syslinux/buildtool.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.mk        14 Jun 2004 18:54:38 -0000      1.3
--- buildtool.mk        23 Jan 2006 17:55:45 -0000      1.4
***************
*** 11,21 ****
  $(SYSLINUX_DIR)/.source: 
        bzcat $(SYSLINUX_SOURCE) |  tar -xvf - 
        touch $(SYSLINUX_DIR)/.source
        
  $(SYSLINUX_DIR)/.build: $(SYSLINUX_DIR)/.source
        -mkdir $(SYSLINUX_TARGET_DIR)
        $(MAKE) CC=$(TARGET_CC) -C $(SYSLINUX_DIR) syslinux
!       -$(BT_STRIP) --strip-unneeded $(SYSLINUX_DIR)/syslinux
!       -$(BT_STRIP) --strip-unneeded $(SYSLINUX_DIR)/syslinux-nomtools
        $(MAKE) CC=$(TARGET_CC) -C $(SYSLINUX_DIR) 
INSTALLROOT=$(SYSLINUX_TARGET_DIR) install
        cp $(SYSLINUX_DIR)/mbr.bin $(SYSLINUX_TARGET_DIR)/usr/bin/mbr.bin
--- 11,23 ----
  $(SYSLINUX_DIR)/.source: 
        bzcat $(SYSLINUX_SOURCE) |  tar -xvf - 
+       cat $(SYSLINUX_PATCH) | patch -d $(SYSLINUX_DIR) -p1
        touch $(SYSLINUX_DIR)/.source
        
  $(SYSLINUX_DIR)/.build: $(SYSLINUX_DIR)/.source
        -mkdir $(SYSLINUX_TARGET_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(SYSLINUX_DIR) clean
        $(MAKE) CC=$(TARGET_CC) -C $(SYSLINUX_DIR) syslinux
!       -$(BT_STRIP) $(BT_STRIP_BINOPTS) $(SYSLINUX_DIR)/syslinux
!       -$(BT_STRIP) $(BT_STRIP_BINOPTS) $(SYSLINUX_DIR)/syslinux-nomtools
        $(MAKE) CC=$(TARGET_CC) -C $(SYSLINUX_DIR) 
INSTALLROOT=$(SYSLINUX_TARGET_DIR) install
        cp $(SYSLINUX_DIR)/mbr.bin $(SYSLINUX_TARGET_DIR)/usr/bin/mbr.bin



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
leaf-cvs-commits mailing list
leaf-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits

Reply via email to