[oe-commits] org.oe.dev syslinux: added 3.31, fixed previous commit, unified

[hrw commit]

syslinux: added 3.31, fixed previous commit, unified

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

#
# mt diff -rd880ea61e2bca54df3d1fe6b9027a926aea2bbc5 -r195a518cd7cd1344369f00d72ef14dc19d4962c9
#
# 
# 
# add_file "packages/syslinux/syslinux-native_3.31.bb"
#  content [0bb3d740bbf4ec23badb0b6fb50f69b421b9b181]
# 
# add_file "packages/syslinux/syslinux3.inc"
#  content [dd8a39d7d737cbd8568b86be7921070da934ef3f]
# 
# patch "packages/syslinux/syslinux-native_2.11.bb"
#  from [46e6bf40963d7173d0f2311c15a34c3796ee49d2]
#    to [ff9d4e25f4477f431baf16a33ca12d18c08afcb3]
# 
# patch "packages/syslinux/syslinux-native_3.11.bb"
#  from [feae25c85a13c7f1101d1f3f738415735a54a4d0]
#    to [6fe87bc96246f56152a590260c12006e0834be14]
# 
# patch "packages/syslinux/syslinux.inc"
#  from [a67be263d80fb75fbe0eccb800d2224164a57582]
#    to [6741d26de1cd0932672927c625bc83766941857f]
# 
============================================================
--- packages/syslinux/syslinux-native_3.31.bb	0bb3d740bbf4ec23badb0b6fb50f69b421b9b181
+++ packages/syslinux/syslinux-native_3.31.bb	0bb3d740bbf4ec23badb0b6fb50f69b421b9b181
@@ -0,0 +1,3 @@
+SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 "
+
+require syslinux3.inc
============================================================
--- packages/syslinux/syslinux3.inc	dd8a39d7d737cbd8568b86be7921070da934ef3f
+++ packages/syslinux/syslinux3.inc	dd8a39d7d737cbd8568b86be7921070da934ef3f
@@ -0,0 +1,20 @@
+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}
+
+	# 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
+}
============================================================
--- packages/syslinux/syslinux-native_2.11.bb	46e6bf40963d7173d0f2311c15a34c3796ee49d2
+++ packages/syslinux/syslinux-native_2.11.bb	ff9d4e25f4477f431baf16a33ca12d18c08afcb3
@@ -1,6 +1,10 @@ require syslinux.inc
 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
+}
============================================================
--- packages/syslinux/syslinux-native_3.11.bb	feae25c85a13c7f1101d1f3f738415735a54a4d0
+++ packages/syslinux/syslinux-native_3.11.bb	6fe87bc96246f56152a590260c12006e0834be14
@@ -1,24 +1,5 @@ SRC_URI="${KERNELORG_MIRROR}/pub/linux/u
 PR="r1"
 
 SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 "
 
+require syslinux3.inc
-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}
-
-	# 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
-}
============================================================
--- packages/syslinux/syslinux.inc	a67be263d80fb75fbe0eccb800d2224164a57582
+++ packages/syslinux/syslinux.inc	6741d26de1cd0932672927c625bc83766941857f
@@ -15,10 +15,6 @@ inherit native
 
 inherit native
 
-do_compile() {
-	oe_runmake syslinux
-}
-
 do_stage() {
 	install -d ${STAGING_BINDIR}
 	install -m 755 ${S}/syslinux ${STAGING_BINDIR}