From 3bc998dd251fd651b62ea4c9360c27ddd70cc3fd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 27 Dec 2013 21:34:41 +0100 Subject: [PATCH] syslinux: convert to new package format Signed-off-by: Stephan Raue --- packages/tools/syslinux/build | 54 -------------------- packages/tools/syslinux/install | 30 ----------- packages/tools/syslinux/{meta => package.mk} | 54 +++++++++++++++++++- 3 files changed, 52 insertions(+), 86 deletions(-) delete mode 100755 packages/tools/syslinux/build delete mode 100755 packages/tools/syslinux/install rename packages/tools/syslinux/{meta => package.mk} (52%) diff --git a/packages/tools/syslinux/build b/packages/tools/syslinux/build deleted file mode 100755 index b246379ce1..0000000000 --- a/packages/tools/syslinux/build +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it 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. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -. config/options $1 - -$SCRIPTS/build toolchain - -cd $PKG_BUILD - -setup_toolchain host -HOST_LDFLAGS=`echo $HOST_LDFLAGS | sed -e "s|-Wl,--as-needed||"` -HOST_CFLAGS="$HOST_CFLAGS -I../libinstaller -I../libfat" - -# TODO: fix -cp $ROOT/$PKG_BUILD/com32/include/com32.h $ROOT/$TOOLCHAIN/include -make clean -make CC=$CC \ - AR=$AR \ - RANLIB="$RANLIB" \ - LDFLAGS="$HOST_LDFLAGS" \ - CFLAGS="$HOST_CFLAGS -fomit-frame-pointer -D_FILE_OFFSET_BITS=64" \ - installer - -# TODO: fix -cp $ROOT/$PKG_BUILD/extlinux/extlinux $ROOT/$PKG_BUILD/extlinux/extlinux.host - -setup_toolchain target -LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` -CFLAGS="$CFLAGS -I../libinstaller -I../libfat" - -make clean -make CC=$CC \ - AR=$AR \ - RANLIB="$RANLIB" \ - LDFLAGS="$LDFLAGS" \ - CFLAGS="$CFLAGS -fomit-frame-pointer -D_FILE_OFFSET_BITS=64" \ - installer diff --git a/packages/tools/syslinux/install b/packages/tools/syslinux/install deleted file mode 100755 index 368a9d012b..0000000000 --- a/packages/tools/syslinux/install +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it 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. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/extlinux/extlinux $INSTALL/usr/bin - cp $PKG_BUILD/linux/syslinux $INSTALL/usr/bin - -mkdir -p $INSTALL/usr/share/syslinux - cp $PKG_BUILD/core/isolinux.bin $INSTALL/usr/share/syslinux - cp $PKG_BUILD/mbr/mbr.bin $INSTALL/usr/share/syslinux - cp $PKG_BUILD/mbr/gptmbr.bin $INSTALL/usr/share/syslinux diff --git a/packages/tools/syslinux/meta b/packages/tools/syslinux/package.mk similarity index 52% rename from packages/tools/syslinux/meta rename to packages/tools/syslinux/package.mk index 821ba7cd84..57f77888a8 100644 --- a/packages/tools/syslinux/meta +++ b/packages/tools/syslinux/package.mk @@ -24,11 +24,61 @@ PKG_LICENSE="GPL" PKG_SITE="http://syslinux.zytor.com/" PKG_URL="http://www.kernel.org/pub/linux/utils/boot/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain util-linux:host util-linux e2fsprogs" +PKG_BUILD_DEPENDS_HOST="toolchain util-linux:host" +PKG_BUILD_DEPENDS_TARGET="toolchain util-linux e2fsprogs" PKG_PRIORITY="optional" PKG_SECTION="tools" PKG_SHORTDESC="syslinux: Linux bootloader collection" PKG_LONGDESC="The SYSLINUX project covers lightweight linux bootloaders for floppy media (syslinux), network booting (pxelinux) and bootable el-torito cd-roms (isolinux)." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +PKG_MAKE_OPTS_HOST="CC=$CC AR=$AR RANLIB=$RANLIB installer" +PKG_MAKE_OPTS_TARGET="CC=$CC AR=$AR RANLIB=$RANLIB installer" + +# Unset all compiler FLAGS + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + +pre_build_target() { + mkdir -p $PKG_BUILD/.$TARGET_NAME + cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME +} + +pre_build_host() { + mkdir -p $PKG_BUILD/.$HOST_NAME + cp -RP $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME +} + +pre_make_target() { + cd .$TARGET_NAME +} + +pre_make_host() { + cd .$HOST_NAME +} + +makeinstall_host() { + mkdir -p $ROOT/$TOOLCHAIN/bin + cp extlinux/extlinux $ROOT/$TOOLCHAIN/bin + + mkdir -p $ROOT/$TOOLCHAIN/share/syslinux + cp com32/menu/vesamenu.c32 $ROOT/$TOOLCHAIN/share/syslinux + cp com32/lib/libcom32.c32 $ROOT/$TOOLCHAIN/share/syslinux + cp com32/libutil/libutil.c32 $ROOT/$TOOLCHAIN/share/syslinux + cp mbr/mbr.bin $ROOT/$TOOLCHAIN/share/syslinux +} + +makeinstall_target() { + mkdir -p $INSTALL/usr/bin + cp extlinux/extlinux $INSTALL/usr/bin + cp linux/syslinux $INSTALL/usr/bin + + mkdir -p $INSTALL/usr/share/syslinux + cp core/isolinux.bin $INSTALL/usr/share/syslinux + cp mbr/mbr.bin $INSTALL/usr/share/syslinux + cp mbr/gptmbr.bin $INSTALL/usr/share/syslinux +}