Update of /cvsroot/leaf/src/bering-uclibc/apps/syslinux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3660
Modified Files:
buildtool.cfg buildtool.mk syslinux-make.patch
Log Message:
update to version 3.11
Index: syslinux-make.patch
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/syslinux/syslinux-make.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** syslinux-make.patch 23 Jan 2006 17:55:45 -0000 1.1
--- syslinux-make.patch 13 Apr 2006 18:48:56 -0000 1.2
***************
*** 1,16 ****
! 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
--- 1,16 ----
! diff -urN syslinux-3.11.orig/Makefile syslinux-3.11/Makefile
! --- syslinux-3.11.orig/Makefile 2005-08-31 00:54:14.000000000 +0200
! +++ syslinux-3.11/Makefile 2006-04-09 19:31:07.000000000 +0200
! @@ -64,10 +64,10 @@
! pxelinux.0 mbr.bin isolinux.bin isolinux-debug.bin \
! extlinux.bin extlinux.bss extlinux.sys
! BOBJECTS = $(BTARGET) dos/syslinux.com win32/syslinux.exe memdisk/memdisk
! -BSUBDIRS = memdisk dos win32
! +BSUBDIRS = memdisk
! ITARGET = copybs.com gethostip mkdiskimage
! IOBJECTS = $(ITARGET) mtools/syslinux unix/syslinux extlinux/extlinux
! -ISUBDIRS = mtools unix extlinux sample com32
! +ISUBDIRS = mtools unix extlinux com32
! DOCS = COPYING NEWS README TODO BUGS *.doc sample menu com32
! OTHER = Makefile bin2c.pl now.pl genhash.pl keywords findpatch.pl \
! keytab-lilo.pl version version.pl sys2ansi.pl \
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/syslinux/buildtool.cfg,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** buildtool.cfg 8 Mar 2006 20:53:01 -0000 1.6
--- buildtool.cfg 13 Apr 2006 18:48:56 -0000 1.7
***************
*** 2,6 ****
Type = http
Name = www.kernel.org
! Serverpath = pub/linux/utils/boot/syslinux/Old
</Server>
--- 2,6 ----
Type = http
Name = www.kernel.org
! Serverpath = pub/linux/utils/boot/syslinux
</Server>
***************
*** 11,15 ****
</File>
! <File syslinux-2.08.tar.bz2>
Server = kernel.org
envname = SYSLINUX_SOURCE
--- 11,15 ----
</File>
! <File syslinux-3.11.tar.bz2>
Server = kernel.org
envname = SYSLINUX_SOURCE
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/syslinux/buildtool.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** buildtool.mk 26 Jan 2006 20:52:04 -0000 1.5
--- buildtool.mk 13 Apr 2006 18:48:56 -0000 1.6
***************
*** 6,10 ****
include $(MASTERMAKEFILE)
! SYSLINUX_DIR:=syslinux-2.08
SYSLINUX_TARGET_DIR:=$(BT_BUILD_DIR)/syslinux
--- 6,10 ----
include $(MASTERMAKEFILE)
! SYSLINUX_DIR:=syslinux-3.11
SYSLINUX_TARGET_DIR:=$(BT_BUILD_DIR)/syslinux
***************
*** 16,29 ****
$(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 -a $(SYSLINUX_DIR)/mbr.bin $(SYSLINUX_TARGET_DIR)/usr/bin/mbr.bin
- mkdir -p $(BT_STAGING_DIR)/usr/bin
cp -a $(SYSLINUX_TARGET_DIR)/usr/bin/syslinux $(BT_STAGING_DIR)/usr/bin/
- cp -a $(SYSLINUX_DIR)/syslinux-nomtools
$(SYSLINUX_TARGET_DIR)/usr/bin/syslinux-nomtools
- cp -a $(SYSLINUX_TARGET_DIR)/usr/bin/syslinux-nomtools
$(BT_STAGING_DIR)/usr/bin/
cp -a $(SYSLINUX_TARGET_DIR)/usr/bin/mbr.bin $(BT_STAGING_DIR)/usr/bin/
touch $(SYSLINUX_DIR)/.build
--- 16,26 ----
$(SYSLINUX_DIR)/.build: $(SYSLINUX_DIR)/.source
-mkdir $(SYSLINUX_TARGET_DIR)
+ mkdir -p $(BT_STAGING_DIR)/usr/bin
$(MAKE) CC=$(TARGET_CC) -C $(SYSLINUX_DIR) clean
! $(MAKE) CC=$(TARGET_CC) -C $(SYSLINUX_DIR)
$(MAKE) CC=$(TARGET_CC) -C $(SYSLINUX_DIR)
INSTALLROOT=$(SYSLINUX_TARGET_DIR) install
+ -$(BT_STRIP) $(BT_STRIP_BINOPTS) $(SYSLINUX_TARGET_DIR)/usr/bin/syslinux
cp -a $(SYSLINUX_DIR)/mbr.bin $(SYSLINUX_TARGET_DIR)/usr/bin/mbr.bin
cp -a $(SYSLINUX_TARGET_DIR)/usr/bin/syslinux $(BT_STAGING_DIR)/usr/bin/
cp -a $(SYSLINUX_TARGET_DIR)/usr/bin/mbr.bin $(BT_STAGING_DIR)/usr/bin/
touch $(SYSLINUX_DIR)/.build
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
leaf-cvs-commits mailing list
leaf-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
