summaryrefslogtreecommitdiffstats
path: root/meta/packages/syslinux
diff options
context:
space:
mode:
authorAndrzej Zaborowski <andrew@openedhand.com>2008-10-20 00:22:07 +0000
committerAndrzej Zaborowski <andrew@openedhand.com>2008-10-20 00:22:07 +0000
commit3f93ed6bce12da9ece86e3f965e4e667b22fb306 (patch)
tree3d059c6ebe00f5d19590c4e660696dfc7c0964bd /meta/packages/syslinux
parent4cb659823ba8f8631d623a870695c79ba352a6ad (diff)
downloadpoky-3f93ed6bce12da9ece86e3f965e4e667b22fb306.tar.gz
syslinux-native: Try to make syslinux cross-compile friendly.
We only had one package for building both the bootloader and the installer, i.e. target and host code. It used always the host compiler. Split the package into syslinux and syslinux-installer-native, require both for a cd bootable image. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5539 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/syslinux')
-rw-r--r--meta/packages/syslinux/syslinux-installer-native_3.36.bb26
-rw-r--r--meta/packages/syslinux/syslinux-native_3.36.bb3
-rw-r--r--meta/packages/syslinux/syslinux.inc29
-rw-r--r--meta/packages/syslinux/syslinux3.inc21
-rw-r--r--meta/packages/syslinux/syslinux_3.36.bb14
5 files changed, 40 insertions, 53 deletions
diff --git a/meta/packages/syslinux/syslinux-installer-native_3.36.bb b/meta/packages/syslinux/syslinux-installer-native_3.36.bb
new file mode 100644
index 0000000000..ae5b73afac
--- /dev/null
+++ b/meta/packages/syslinux/syslinux-installer-native_3.36.bb
@@ -0,0 +1,26 @@
1# syslinux-native OE build file
2# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved
3# Released under the MIT license (see packages/COPYING)
4
5DESCRIPTION="A multi-purpose linux bootloader"
6HOMEPAGE="http://syslinux.zytor.com/"
7LICENSE="GPL"
8SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 "
9
10S="${WORKDIR}/syslinux-${PV}"
11STAGE_TEMP="${WORKDIR}/stage_temp"
12
13inherit native
14
15do_compile() {
16 oe_runmake installer
17}
18
19do_stage() {
20 install -d ${STAGE_TEMP}
21 oe_runmake install INSTALLROOT="${STAGE_TEMP}"
22
23 install -d ${STAGING_BINDIR}
24 install -m 755 ${STAGE_TEMP}/usr/bin/syslinux ${STAGING_BINDIR}
25 install -m 755 ${STAGE_TEMP}/sbin/extlinux ${STAGING_BINDIR}
26}
diff --git a/meta/packages/syslinux/syslinux-native_3.36.bb b/meta/packages/syslinux/syslinux-native_3.36.bb
deleted file mode 100644
index d9019a4ab4..0000000000
--- a/meta/packages/syslinux/syslinux-native_3.36.bb
+++ /dev/null
@@ -1,3 +0,0 @@
1SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 "
2
3require syslinux3.inc
diff --git a/meta/packages/syslinux/syslinux.inc b/meta/packages/syslinux/syslinux.inc
deleted file mode 100644
index 41be168d12..0000000000
--- a/meta/packages/syslinux/syslinux.inc
+++ /dev/null
@@ -1,29 +0,0 @@
1# syslinux-native OE build file
2# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved
3# Released under the MIT license (see packages/COPYING)
4
5DESCRIPTION="A multi-purpose linux bootloader"
6HOMEPAGE="http://syslinux.zytor.com/"
7LICENSE="GPL"
8
9# If you really want to run syslinux, you need mtools. We just want the
10# ldlinux.* stuff for now, so skip mtools-native
11DEPENDS="nasm-native"
12
13S="${WORKDIR}/syslinux-${PV}"
14
15
16inherit native
17
18do_stage() {
19 install -d ${STAGING_BINDIR}
20 install -m 755 ${S}/syslinux ${STAGING_BINDIR}
21
22 # When building media, the syslinux binary isn't nearly as useful
23 # as the DOS data files, so we copy those into a special location
24 # for usage during a image build stage
25
26 install -d ${STAGING_DATADIR}/syslinux
27 install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys
28 install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss
29}
diff --git a/meta/packages/syslinux/syslinux3.inc b/meta/packages/syslinux/syslinux3.inc
deleted file mode 100644
index 95124d6160..0000000000
--- a/meta/packages/syslinux/syslinux3.inc
+++ /dev/null
@@ -1,21 +0,0 @@
1require syslinux.inc
2
3STAGE_TEMP="${WORKDIR}/stage_temp"
4
5do_stage() {
6 install -d ${STAGE_TEMP}
7 oe_runmake install INSTALLROOT="${STAGE_TEMP}"
8
9 install -d ${STAGING_BINDIR}
10 install -m 755 ${STAGE_TEMP}/usr/bin/syslinux ${STAGING_BINDIR}
11 install -m 755 ${STAGE_TEMP}/sbin/extlinux ${STAGING_BINDIR}
12
13 # When building media, the syslinux binary isn't nearly as useful
14 # as the DOS data files, so we copy those into a special location
15 # for usage during a image build stage
16
17 install -d ${STAGING_DATADIR}/syslinux
18 install -m 0644 ${STAGE_TEMP}/usr/lib/syslinux/isolinux.bin ${STAGING_DATADIR}/syslinux/isolinux.bin
19 install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys
20 install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss
21}
diff --git a/meta/packages/syslinux/syslinux_3.36.bb b/meta/packages/syslinux/syslinux_3.36.bb
new file mode 100644
index 0000000000..4458c1f234
--- /dev/null
+++ b/meta/packages/syslinux/syslinux_3.36.bb
@@ -0,0 +1,14 @@
1DESCRIPTION="A multi-purpose linux bootloader"
2HOMEPAGE="http://syslinux.zytor.com/"
3LICENSE="GPL"
4SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 "
5
6# If you really want to run syslinux, you need mtools. We just want the
7# ldlinux.* stuff for now, so skip mtools-native
8DEPENDS="nasm-native"
9
10S="${WORKDIR}/syslinux-${PV}"
11
12do_configure() {
13 sed -i ${S}/Makefile ${S}/*/Makefile -e 's/\(CC[\t ]*\)=/\1?=/'
14}