Revision: 5632
http://ipcop.svn.sourceforge.net/ipcop/?rev=5632&view=rev
Author: gespinasse
Date: 2011-04-20 20:47:25 +0000 (Wed, 20 Apr 2011)
Log Message:
-----------
Upgrade syslinux to 4.0.4
Set CFLAGS/LDFLAGS in case we need a day to recompile syslinux
My patch to fix (on gxpe) full compilation is not yet include, should be in for
4.05
Unsure we need to include the new syslinux in update
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/arch_i486/syslinux
ipcop/trunk/lfs/syslinux
Modified: ipcop/trunk/config/rootfiles/arch_i486/syslinux
===================================================================
--- ipcop/trunk/config/rootfiles/arch_i486/syslinux 2011-04-20 06:14:12 UTC
(rev 5631)
+++ ipcop/trunk/config/rootfiles/arch_i486/syslinux 2011-04-20 20:47:25 UTC
(rev 5632)
@@ -1,4 +1,4 @@
-## syslinux-4.03
+## syslinux-4.04
##
boot/extlinux.conf
boot/mbr.bin
@@ -57,6 +57,24 @@
#usr/share/syslinux/com32/include/getopt.h
#usr/share/syslinux/com32/include/gplinclude
#usr/share/syslinux/com32/include/gplinclude/README
+#usr/share/syslinux/com32/include/gplinclude/acpi
+#usr/share/syslinux/com32/include/gplinclude/acpi/acpi.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/boot.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/dsdt.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/ecdt.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/facs.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/fadt.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/hpet.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/madt.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/mcfg.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/rsdp.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/rsdt.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/sbst.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/slic.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/ssdt.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/structs.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/tcpa.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/xsdt.h
#usr/share/syslinux/com32/include/gplinclude/cpuid.h
#usr/share/syslinux/com32/include/gplinclude/disk
#usr/share/syslinux/com32/include/gplinclude/disk/bootloaders.h
@@ -110,7 +128,9 @@
#usr/share/syslinux/com32/include/stdio.h
#usr/share/syslinux/com32/include/stdlib.h
#usr/share/syslinux/com32/include/string.h
+#usr/share/syslinux/com32/include/suffix_number.h
#usr/share/syslinux/com32/include/sys
+#usr/share/syslinux/com32/include/sys/bitops.h
#usr/share/syslinux/com32/include/sys/cpu.h
#usr/share/syslinux/com32/include/sys/dirent.h
#usr/share/syslinux/com32/include/sys/elf32.h
@@ -160,6 +180,10 @@
#usr/share/syslinux/config.c32
#usr/share/syslinux/cpuid.c32
#usr/share/syslinux/cpuidtest.c32
+#usr/share/syslinux/diag
+#usr/share/syslinux/diag/geodsp1s.img.xz
+#usr/share/syslinux/diag/geodspms.img.xz
+#usr/share/syslinux/diag/handoff.bin
#usr/share/syslinux/disk.c32
#usr/share/syslinux/dmitest.c32
#usr/share/syslinux/dosutil
@@ -174,6 +198,7 @@
#usr/share/syslinux/gptmbr_f.bin
#usr/share/syslinux/gpxecmd.c32
#usr/share/syslinux/gpxelinux.0
+#usr/share/syslinux/gpxelinuxk.0
#usr/share/syslinux/hdt.c32
#usr/share/syslinux/host.c32
#usr/share/syslinux/ifcpu.c32
@@ -214,6 +239,7 @@
#usr/share/syslinux/syslinux.com
#usr/share/syslinux/syslinux.exe
#usr/share/syslinux/syslinux64.exe
+#usr/share/syslinux/ver.com
#usr/share/syslinux/vesainfo.c32
#usr/share/syslinux/vesamenu.c32
#usr/share/syslinux/vpdtest.c32
Modified: ipcop/trunk/lfs/syslinux
===================================================================
--- ipcop/trunk/lfs/syslinux 2011-04-20 06:14:12 UTC (rev 5631)
+++ ipcop/trunk/lfs/syslinux 2011-04-20 20:47:25 UTC (rev 5632)
@@ -33,16 +33,19 @@
include Config
PKG_NAME = syslinux
-VER = 4.03
+VER = 4.04
HOST_ARCH = i486
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
DL_FILE = $(THISAPP).tar.bz2
-DL_FROM = $(URL_KERNEL)/linux/utils/boot/syslinux/4.xx
+DL_FROM = $(URL_KERNEL)/linux/utils/boot/syslinux
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+CFLAGS += -fno-PIE -nopie -norelro -nonow -nocombreloc
+LDFLAGS := -nopie
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -51,7 +54,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a7ca38a0a5786b6efae8fb01a1ae8070
+$(DL_FILE)_MD5 = a3936208767eb7ced65320abe2e33a10
install : $(TARGET)
@@ -82,6 +85,9 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ # 4.0.4-pre1{3,4} were badly compiled, so full recompilation was
required
+ #cd $(DIR_APP) && make spotless && make
+
# the recommended way is to use precompiled ldlinux.asm
# but installer could be recompiled
cd $(DIR_APP) && make installer
@@ -95,5 +101,5 @@
cp -f $(DIR_SRC)/config/arch/i486/extlinux.conf /boot
cp -f $(DIR_SRC)/config/arch/i486/splash.png /boot
- rm -rf $(DIR_APP)
+ @rm -rf $(DIR_APP)
@$(POSTBUILD)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
