[oe-commits] org.oe.dev syslinux: unify

[hrw commit]

syslinux: unify

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: d880ea61e2bca54df3d1fe6b9027a926aea2bbc5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d880ea61e2bca54df3d1fe6b9027a926aea2bbc5
Files:
1
packages/syslinux/syslinux.inc
packages/syslinux/syslinux-native_2.11.bb
packages/syslinux/syslinux-native_3.11.bb
Diffs:

#
# mt diff -r4d3df47bc28a299968d0133642d35ddd7edefce9 -rd880ea61e2bca54df3d1fe6b9027a926aea2bbc5
#
# 
# 
# add_file "packages/syslinux/syslinux.inc"
#  content [a67be263d80fb75fbe0eccb800d2224164a57582]
# 
# patch "packages/syslinux/syslinux-native_2.11.bb"
#  from [12fd7f1066550ab87bf93690f1d5bcf8ccfcfda8]
#    to [46e6bf40963d7173d0f2311c15a34c3796ee49d2]
# 
# patch "packages/syslinux/syslinux-native_3.11.bb"
#  from [6e209f15aed8fa18e70e99afc21ec151f0da4bf9]
#    to [feae25c85a13c7f1101d1f3f738415735a54a4d0]
# 
============================================================
--- packages/syslinux/syslinux.inc	a67be263d80fb75fbe0eccb800d2224164a57582
+++ packages/syslinux/syslinux.inc	a67be263d80fb75fbe0eccb800d2224164a57582
@@ -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
+}
============================================================
--- packages/syslinux/syslinux-native_2.11.bb	12fd7f1066550ab87bf93690f1d5bcf8ccfcfda8
+++ packages/syslinux/syslinux-native_2.11.bb	46e6bf40963d7173d0f2311c15a34c3796ee49d2
@@ -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"
+         file://edx_assume_zero.patch;patch=1"
 
+require syslinux.inc
-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
-
-	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
-}
============================================================
--- packages/syslinux/syslinux-native_3.11.bb	6e209f15aed8fa18e70e99afc21ec151f0da4bf9
+++ packages/syslinux/syslinux-native_3.11.bb	feae25c85a13c7f1101d1f3f738415735a54a4d0
@@ -1,24 +1,9 @@
-# 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}"
+require syslinux.inc
 
-# 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
-
 STAGE_TEMP="${WORKDIR}/stage_temp"
 
 do_stage() {