From feb7067476a59ceebe3a30ca35dee2e793a13aa9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 11 Oct 2007 21:40:26 +0000 Subject: syslinux, nasm: Move from meta-extras to meta git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2864 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../syslinux-native-2.11/edx_assume_zero.patch | 10 ++++++++ meta/packages/syslinux/syslinux-native_2.11.bb | 10 ++++++++ meta/packages/syslinux/syslinux-native_3.11.bb | 5 ++++ meta/packages/syslinux/syslinux-native_3.31.bb | 3 +++ meta/packages/syslinux/syslinux-native_3.36.bb | 3 +++ meta/packages/syslinux/syslinux.inc | 29 ++++++++++++++++++++++ meta/packages/syslinux/syslinux3.inc | 21 ++++++++++++++++ 7 files changed, 81 insertions(+) create mode 100644 meta/packages/syslinux/syslinux-native-2.11/edx_assume_zero.patch create mode 100644 meta/packages/syslinux/syslinux-native_2.11.bb create mode 100644 meta/packages/syslinux/syslinux-native_3.11.bb create mode 100644 meta/packages/syslinux/syslinux-native_3.31.bb create mode 100644 meta/packages/syslinux/syslinux-native_3.36.bb create mode 100644 meta/packages/syslinux/syslinux.inc create mode 100644 meta/packages/syslinux/syslinux3.inc (limited to 'meta/packages/syslinux') diff --git a/meta/packages/syslinux/syslinux-native-2.11/edx_assume_zero.patch b/meta/packages/syslinux/syslinux-native-2.11/edx_assume_zero.patch new file mode 100644 index 0000000000..7243464224 --- /dev/null +++ b/meta/packages/syslinux/syslinux-native-2.11/edx_assume_zero.patch @@ -0,0 +1,10 @@ +--- syslinux-2.11/ldlinux.asm.orig 2005-11-01 14:25:10.767581544 -0700 ++++ syslinux-2.11/ldlinux.asm 2005-11-01 14:25:42.175806768 -0700 +@@ -724,7 +724,6 @@ + + mov eax,[bsHidden] ; Hidden sectors + add edx,[bxResSectors] +- add eax,edx + mov ecx,[bxFATsecs] ; Sectors/FAT + fat_load_loop: + mov ebp,ecx ; Make sure high EBP = 0 diff --git a/meta/packages/syslinux/syslinux-native_2.11.bb b/meta/packages/syslinux/syslinux-native_2.11.bb new file mode 100644 index 0000000000..a05728f0a5 --- /dev/null +++ b/meta/packages/syslinux/syslinux-native_2.11.bb @@ -0,0 +1,10 @@ +PR="r1" + +SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 \ + file://edx_assume_zero.patch;patch=1" + +require syslinux.inc + +do_compile() { + oe_runmake syslinux +} diff --git a/meta/packages/syslinux/syslinux-native_3.11.bb b/meta/packages/syslinux/syslinux-native_3.11.bb new file mode 100644 index 0000000000..28d750aab5 --- /dev/null +++ b/meta/packages/syslinux/syslinux-native_3.11.bb @@ -0,0 +1,5 @@ +PR="r1" + +SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 " + +require syslinux3.inc diff --git a/meta/packages/syslinux/syslinux-native_3.31.bb b/meta/packages/syslinux/syslinux-native_3.31.bb new file mode 100644 index 0000000000..6971874ea3 --- /dev/null +++ b/meta/packages/syslinux/syslinux-native_3.31.bb @@ -0,0 +1,3 @@ +SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 " + +require syslinux3.inc diff --git a/meta/packages/syslinux/syslinux-native_3.36.bb b/meta/packages/syslinux/syslinux-native_3.36.bb new file mode 100644 index 0000000000..d9019a4ab4 --- /dev/null +++ b/meta/packages/syslinux/syslinux-native_3.36.bb @@ -0,0 +1,3 @@ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 " + +require syslinux3.inc diff --git a/meta/packages/syslinux/syslinux.inc b/meta/packages/syslinux/syslinux.inc new file mode 100644 index 0000000000..41be168d12 --- /dev/null +++ b/meta/packages/syslinux/syslinux.inc @@ -0,0 +1,29 @@ +# syslinux-native OE build file +# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION="A multi-purpose linux bootloader" +HOMEPAGE="http://syslinux.zytor.com/" +LICENSE="GPL" + +# If you really want to run syslinux, you need mtools. We just want the +# ldlinux.* stuff for now, so skip mtools-native +DEPENDS="nasm-native" + +S="${WORKDIR}/syslinux-${PV}" + + +inherit native + +do_stage() { + install -d ${STAGING_BINDIR} + install -m 755 ${S}/syslinux ${STAGING_BINDIR} + + # When building media, the syslinux binary isn't nearly as useful + # as the DOS data files, so we copy those into a special location + # for usage during a image build stage + + install -d ${STAGING_DATADIR}/syslinux + 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/meta/packages/syslinux/syslinux3.inc b/meta/packages/syslinux/syslinux3.inc new file mode 100644 index 0000000000..95124d6160 --- /dev/null +++ b/meta/packages/syslinux/syslinux3.inc @@ -0,0 +1,21 @@ +require syslinux.inc + +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} + + # When building media, the syslinux binary isn't nearly as useful + # as the DOS data files, so we copy those into a special location + # for usage during a image build stage + + 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 +} -- cgit v1.2.3-54-g00ecf