diff --git a/x86/syslinux/syslinux.conf b/x86/syslinux/syslinux.conf index 202409b95..f81210d1b 100644 --- a/x86/syslinux/syslinux.conf +++ b/x86/syslinux/syslinux.conf @@ -14,20 +14,8 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -# we want (do we?) to rebuild ITARGET tools -# -var_append makeopt ' ' '$ITARGET' - -hook_add preconf 5 'syslinux_itarget_prepare' -syslinux_itarget_prepare() { - export ITARGET=$( grep ^ITARGET Makefile | cut -d= -f2- | sed -e 's/^ *//' ) - - [ -z "$ITARGET" ] || rm -v $ITARGET -} - -# install mkdiskimage -# -hook_add postmake 5 "cp -v mkdiskimage $root$bindir/" +# let's build'em all +hook_add premake 2 "$MAKE $makeopt clean" var_remove GCC2_WRAPPER_INSERT ' ' "-fstack-protector" var_remove GCC3_WRAPPER_INSERT ' ' "-fstack-protector" diff --git a/x86/syslinux/syslinux.desc b/x86/syslinux/syslinux.desc index abae7076b..95ec5a9f4 100644 --- a/x86/syslinux/syslinux.desc +++ b/x86/syslinux/syslinux.desc @@ -34,8 +34,8 @@ [L] GPL [S] Stable -[V] 3.63 +[V] 3.70 [P] X -?---5---9 110.300 -[D] 2231369251 syslinux-3.63.tar.bz2 http://www.kernel.org/pub/linux/utils/boot/syslinux/ +[D] 1712575567 syslinux-3.70.tar.bz2 http://www.kernel.org/pub/linux/utils/boot/syslinux/ diff --git a/x86/syslinux/win32.patch b/x86/syslinux/win32.patch new file mode 100644 index 000000000..2ed75ae39 --- /dev/null +++ b/x86/syslinux/win32.patch @@ -0,0 +1,27 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../syslinux/win32.patch +# Copyright (C) 2008 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./Makefile.orig 2008-07-02 09:41:07.000000000 +0000 ++++ ./Makefile 2008-07-02 09:42:39.000000000 +0000 +@@ -45,7 +45,7 @@ + # files that depend only on the B phase, but may have to be regenerated + # for "make installer". + BSUBDIRS = codepage core memdisk com32 mbr memdump gpxe sample \ +- libinstaller dos win32 ++ libinstaller dos + ITARGET = + IOBJECTS = $(ITARGET) dos/copybs.com utils/gethostip utils/mkdiskimage \ + mtools/syslinux linux/syslinux extlinux/extlinux