syslinux: update to syslinux-6.02. dont install isolinux

This commit is contained in:
Stefan Saraev 2014-02-23 00:29:00 +02:00
parent b6cb2fbb3e
commit cbba32fbf2
2 changed files with 13 additions and 14 deletions

View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="syslinux" PKG_NAME="syslinux"
PKG_VERSION="5.10" PKG_VERSION="6.02"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="i386 x86_64" PKG_ARCH="i386 x86_64"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
@ -63,29 +63,28 @@ make_host() {
make CC=$CC \ make CC=$CC \
AR=$AR \ AR=$AR \
RANLIB=$RANLIB \ RANLIB=$RANLIB \
CFLAGS="-I$ROOT/$TOOLCHAIN/include -I../libinstaller -I../libfat -fomit-frame-pointer -D_FILE_OFFSET_BITS=64" \ CFLAGS="-I$ROOT/$TOOLCHAIN/include -I$ROOT/$PKG_BUILD/libinstaller -I$ROOT/$PKG_BUILD/libfat -I$ROOT/$PKG_BUILD/bios -I$ROOT/$PKG_BUILD/utils -fomit-frame-pointer -D_FILE_OFFSET_BITS=64" \
LDFLAGS="-L$ROOT/$TOOLCHAIN/lib" \ LDFLAGS="-L$ROOT/$TOOLCHAIN/lib" \
installer installer
} }
makeinstall_host() { makeinstall_host() {
mkdir -p $ROOT/$TOOLCHAIN/bin mkdir -p $ROOT/$TOOLCHAIN/bin
cp extlinux/extlinux $ROOT/$TOOLCHAIN/bin cp bios/extlinux/extlinux $ROOT/$TOOLCHAIN/bin
mkdir -p $ROOT/$TOOLCHAIN/share/syslinux mkdir -p $ROOT/$TOOLCHAIN/share/syslinux
cp com32/menu/vesamenu.c32 $ROOT/$TOOLCHAIN/share/syslinux cp bios/com32/menu/vesamenu.c32 $ROOT/$TOOLCHAIN/share/syslinux
cp com32/lib/libcom32.c32 $ROOT/$TOOLCHAIN/share/syslinux cp bios/com32/lib/libcom32.c32 $ROOT/$TOOLCHAIN/share/syslinux
cp com32/libutil/libutil.c32 $ROOT/$TOOLCHAIN/share/syslinux cp bios/com32/libutil/libutil.c32 $ROOT/$TOOLCHAIN/share/syslinux
cp mbr/mbr.bin $ROOT/$TOOLCHAIN/share/syslinux cp bios/mbr/mbr.bin $ROOT/$TOOLCHAIN/share/syslinux
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/bin mkdir -p $INSTALL/usr/bin
cp extlinux/extlinux $INSTALL/usr/bin cp bios/extlinux/extlinux $INSTALL/usr/bin
cp linux/syslinux $INSTALL/usr/bin cp bios/linux/syslinux $INSTALL/usr/bin
mkdir -p $INSTALL/usr/share/syslinux mkdir -p $INSTALL/usr/share/syslinux
cp core/isolinux.bin $INSTALL/usr/share/syslinux cp bios/mbr/mbr.bin $INSTALL/usr/share/syslinux
cp mbr/mbr.bin $INSTALL/usr/share/syslinux cp bios/mbr/gptmbr.bin $INSTALL/usr/share/syslinux
cp mbr/gptmbr.bin $INSTALL/usr/share/syslinux
} }

View File

@ -28,7 +28,7 @@ mkdir -p $RELEASE_DIR/3rdparty/syslinux/doc
cp -PR $BUILD/syslinux-*/doc/* $RELEASE_DIR/3rdparty/syslinux/doc cp -PR $BUILD/syslinux-*/doc/* $RELEASE_DIR/3rdparty/syslinux/doc
mkdir -p $RELEASE_DIR/3rdparty/syslinux/win32 mkdir -p $RELEASE_DIR/3rdparty/syslinux/win32
cp -PR $BUILD/syslinux-*/win32/syslinux.exe $RELEASE_DIR/3rdparty/syslinux/win32 cp -PR $BUILD/syslinux-*/bios/win32/syslinux.exe $RELEASE_DIR/3rdparty/syslinux/win32
mkdir -p $RELEASE_DIR/3rdparty/syslinux/win64 mkdir -p $RELEASE_DIR/3rdparty/syslinux/win64
cp -PR $BUILD/syslinux-*/win64/syslinux64.exe $RELEASE_DIR/3rdparty/syslinux/win64 cp -PR $BUILD/syslinux-*/bios/win64/syslinux64.exe $RELEASE_DIR/3rdparty/syslinux/win64