summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-10-20 11:58:05 +0000
committerRichard Purdie <richard@openedhand.com>2008-10-20 11:58:05 +0000
commit22170fe71182c7da0ae14fb3101be1c474753c64 (patch)
treea8385e332aa47103dfcc095d4662741a3a8c7cbf
parentf105cdc88a735b6e0a0b1b0c5a0bd3931a5ad9c3 (diff)
downloadopenembedded-core-22170fe71182c7da0ae14fb3101be1c474753c64.tar.gz
openembedded-core-22170fe71182c7da0ae14fb3101be1c474753c64.tar.bz2
openembedded-core-22170fe71182c7da0ae14fb3101be1c474753c64.tar.xz
openembedded-core-22170fe71182c7da0ae14fb3101be1c474753c64.zip
syslinux: Various cleanups and add back some missing staging pieces
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5542 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/syslinux/syslinux-installer-native_3.36.bb11
-rw-r--r--meta/packages/syslinux/syslinux_3.36.bb29
2 files changed, 28 insertions, 12 deletions
diff --git a/meta/packages/syslinux/syslinux-installer-native_3.36.bb b/meta/packages/syslinux/syslinux-installer-native_3.36.bb
index ae5b73afa..88bc37a1d 100644
--- a/meta/packages/syslinux/syslinux-installer-native_3.36.bb
+++ b/meta/packages/syslinux/syslinux-installer-native_3.36.bb
@@ -1,14 +1,13 @@
-# 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"
+DESCRIPTION = "A multi-purpose linux bootloader"
+HOMEPAGE = "http://syslinux.zytor.com/"
+LICENSE = "GPL"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 "
-S="${WORKDIR}/syslinux-${PV}"
-STAGE_TEMP="${WORKDIR}/stage_temp"
+S = "${WORKDIR}/syslinux-${PV}"
+STAGE_TEMP = "${WORKDIR}/stage_temp"
inherit native
diff --git a/meta/packages/syslinux/syslinux_3.36.bb b/meta/packages/syslinux/syslinux_3.36.bb
index 4458c1f23..42880f407 100644
--- a/meta/packages/syslinux/syslinux_3.36.bb
+++ b/meta/packages/syslinux/syslinux_3.36.bb
@@ -1,14 +1,31 @@
-DESCRIPTION="A multi-purpose linux bootloader"
-HOMEPAGE="http://syslinux.zytor.com/"
-LICENSE="GPL"
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 "
+DESCRIPTION = "A multi-purpose linux bootloader"
+HOMEPAGE = "http://syslinux.zytor.com/"
+LICENSE = "GPL"
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2"
+PR = "r1"
# 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"
+DEPENDS = "nasm-native"
-S="${WORKDIR}/syslinux-${PV}"
+S = "${WORKDIR}/syslinux-${PV}"
do_configure() {
sed -i ${S}/Makefile ${S}/*/Makefile -e 's/\(CC[\t ]*\)=/\1?=/'
}
+
+STAGE_TEMP = "${WORKDIR}/stage_temp"
+
+do_stage() {
+ install -d ${STAGE_TEMP}
+ oe_runmake install INSTALLROOT="${STAGE_TEMP}"
+
+ # 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
+}