diff options
author | Michael Smith <msmith@cbnco.com> | 2009-08-16 20:21:10 -0400 |
---|---|---|
committer | Michael Smith <msmith@cbnco.com> | 2009-08-19 17:51:34 -0400 |
commit | 9ea30136395469306c1e690434b2855b17c58a0d (patch) | |
tree | 298c5dd37c05b0769bef7623c84b3765a1316df6 /recipes/syslinux | |
parent | 29f099ea70301ec0eb672d5e9b0d0ed36ee015f9 (diff) |
syslinux: upgrade to 3.82 and split into a few packages
3.63 is no longer available.
Signed-off-by: Michael Smith <msmith@cbnco.com>
Diffstat (limited to 'recipes/syslinux')
-rw-r--r-- | recipes/syslinux/syslinux-native_3.63.bb | 23 | ||||
-rw-r--r-- | recipes/syslinux/syslinux-native_3.82.bb | 24 | ||||
-rw-r--r-- | recipes/syslinux/syslinux_3.63.bb | 32 | ||||
-rw-r--r-- | recipes/syslinux/syslinux_3.82.bb | 41 |
4 files changed, 65 insertions, 55 deletions
diff --git a/recipes/syslinux/syslinux-native_3.63.bb b/recipes/syslinux/syslinux-native_3.63.bb deleted file mode 100644 index 3cd1ff8da0..0000000000 --- a/recipes/syslinux/syslinux-native_3.63.bb +++ /dev/null @@ -1,23 +0,0 @@ -# syslinux-native OE build file -# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved -# Copyright (C) 2009, O.S. Systems Software Ltda. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -require syslinux_${PV}.bb -inherit native - -STAGE_TEMP="${WORKDIR}/stage_temp" - -do_stage() { - install -d ${STAGE_TEMP} - oe_runmake install INSTALLROOT="${STAGE_TEMP}" - - install -d ${STAGING_BINDIR} - install -m 755 ${STAGE_TEMP}/usr/bin/syslinux ${STAGING_BINDIR} - install -m 755 ${STAGE_TEMP}/sbin/extlinux ${STAGING_BINDIR} - - install -d ${STAGING_DATADIR}/syslinux - install -m 0644 ${STAGE_TEMP}/usr/lib/syslinux/isolinux.bin ${STAGING_DATADIR}/syslinux/isolinux.bin - install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys - install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss -} diff --git a/recipes/syslinux/syslinux-native_3.82.bb b/recipes/syslinux/syslinux-native_3.82.bb new file mode 100644 index 0000000000..69ab9c1c9b --- /dev/null +++ b/recipes/syslinux/syslinux-native_3.82.bb @@ -0,0 +1,24 @@ +# syslinux-native OE build file +# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved +# Copyright (C) 2009, O.S. Systems Software Ltda. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require syslinux_${PV}.bb +inherit native + +STAGE_TEMP="${WORKDIR}/stage_temp" + +do_stage() { + install -d ${STAGE_TEMP} + oe_runmake install INSTALLROOT="${STAGE_TEMP}" + + install -d ${STAGING_BINDIR} + install -m 755 ${STAGE_TEMP}/${bindir}/syslinux ${STAGING_BINDIR} + install -m 755 ${STAGE_TEMP}/${base_sbindir}/extlinux ${STAGING_BINDIR} + + install -d ${STAGING_DATADIR}/syslinux + install -m 0644 ${STAGE_TEMP}/${datadir}/syslinux/isolinux.bin ${STAGING_DATADIR}/syslinux/isolinux.bin + install -m 0644 ${STAGE_TEMP}/${datadir}/syslinux/mbr.bin ${STAGING_DATADIR}/syslinux/mbr.bin + install -m 0644 ${S}/core/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys + install -m 0644 ${S}/core/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss +} diff --git a/recipes/syslinux/syslinux_3.63.bb b/recipes/syslinux/syslinux_3.63.bb deleted file mode 100644 index 95fb55708a..0000000000 --- a/recipes/syslinux/syslinux_3.63.bb +++ /dev/null @@ -1,32 +0,0 @@ -# syslinux OE build file -# Copyright (C) 2009, O.S. Systems Software Ltda. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="A multi-purpose linux bootloader" -HOMEPAGE="http://syslinux.zytor.com/" -LICENSE="GPL" -DEPENDS="nasm-native" -RDEPENDS="mtools" -PR="r2" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 " - -S="${WORKDIR}/syslinux-${PV}" - -inherit autotools - -do_configure_prepend() { - # drop win32 targets or build fails - sed -i 's,win32/\S*,,g' -i Makefile -} - -do_compile() { - oe_runmake CC="${CC}" -} - -do_install() { - oe_runmake install INSTALLROOT="${D}" - - # we don't use com32, drop it - rm -r "${D}/${libdir}/syslinux/com32" -} diff --git a/recipes/syslinux/syslinux_3.82.bb b/recipes/syslinux/syslinux_3.82.bb new file mode 100644 index 0000000000..4c4102e19d --- /dev/null +++ b/recipes/syslinux/syslinux_3.82.bb @@ -0,0 +1,41 @@ +# syslinux OE build file +# Copyright (C) 2009, O.S. Systems Software Ltda. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION = "A multi-purpose linux bootloader" +HOMEPAGE = "http://syslinux.zytor.com/" +LICENSE = "GPL" +DEPENDS = "nasm-native" +RRECOMMENDS_${PN} = "mtools" +PR = "r0" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 " + +EXTRA_OEMAKE = " \ + BINDIR=${bindir} SBINDIR=${base_sbindir} LIBDIR=${libdir} \ + DATADIR=${datadir} MANDIR=${mandir} INCDIR=${includedir} \ +" + +do_configure() { + # drop win32 targets or build fails + sed -e 's,win32/\S*,,g' -i Makefile + + # clean installer executables included in source tarball + oe_runmake clean +} + +do_compile() { + # Rebuild only the installer; keep precompiled bootloaders + # as per author's request (doc/distrib.txt) + oe_runmake CC="${CC}" installer +} + +do_install() { + oe_runmake install INSTALLROOT="${D}" +} + +PACKAGES =+ "${PN}-extlinux ${PN}-mbr" +FILES_${PN} = "${bindir}/syslinux" +FILES_${PN}-extlinux = "${base_sbindir}/extlinux" +FILES_${PN}-mbr = "${datadir}/${PN}/mbr.bin" +FILES_${PN}-dev += "${datadir}/${PN}/com32" |