From 0f9d542422a9a6367eac8c67381e8f12d407ec5d Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 4 Jan 2007 07:55:52 +0000
Subject: syslinux: unify

---
 packages/syslinux/syslinux-native_2.11.bb | 36 ++-----------------------------
 packages/syslinux/syslinux-native_3.11.bb | 17 +--------------
 packages/syslinux/syslinux.inc            | 33 ++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 50 deletions(-)
 create mode 100644 packages/syslinux/syslinux.inc

(limited to 'packages/syslinux')

diff --git a/packages/syslinux/syslinux-native_2.11.bb b/packages/syslinux/syslinux-native_2.11.bb
index 3d0c5e5ad8..fc41678dc6 100644
--- a/packages/syslinux/syslinux-native_2.11.bb
+++ b/packages/syslinux/syslinux-native_2.11.bb
@@ -1,38 +1,6 @@
-# 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"
-
 PR="r1"
 
 SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 \
-file://edx_assume_zero.patch;patch=1"
-
-S="${WORKDIR}/syslinux-${PV}"
-
-# 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"
-
-inherit native
-
-do_compile() {
-	oe_runmake syslinux
-}
-
-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
+         file://edx_assume_zero.patch;patch=1"
 
-	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
-}
+require syslinux.inc
diff --git a/packages/syslinux/syslinux-native_3.11.bb b/packages/syslinux/syslinux-native_3.11.bb
index 5a587f2921..a33ef75c9b 100644
--- a/packages/syslinux/syslinux-native_3.11.bb
+++ b/packages/syslinux/syslinux-native_3.11.bb
@@ -1,23 +1,8 @@
-# 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"
-
 PR="r1"
 
 SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 "
 
-S="${WORKDIR}/syslinux-${PV}"
-
-# 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"
-
-inherit native
+require syslinux.inc
 
 STAGE_TEMP="${WORKDIR}/stage_temp"
 
diff --git a/packages/syslinux/syslinux.inc b/packages/syslinux/syslinux.inc
new file mode 100644
index 0000000000..2753f166cd
--- /dev/null
+++ b/packages/syslinux/syslinux.inc
@@ -0,0 +1,33 @@
+# 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_compile() {
+	oe_runmake syslinux
+}
+
+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
+}
-- 
cgit 1.2.3-korg