diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-04 08:09:31 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-04 08:09:31 +0000 |
| commit | 842f7bcf3e851d855647fd63627653d1fcc09dae (patch) | |
| tree | cc0a3d45ca0cf452fa8362c2166d553e2d9a1b6c | |
| parent | 0f9d542422a9a6367eac8c67381e8f12d407ec5d (diff) | |
syslinux: added 3.31, fixed previous commit, unified
| -rw-r--r-- | packages/syslinux/syslinux-native_2.11.bb | 4 | ||||
| -rw-r--r-- | packages/syslinux/syslinux-native_3.11.bb | 21 | ||||
| -rw-r--r-- | packages/syslinux/syslinux-native_3.31.bb | 3 | ||||
| -rw-r--r-- | packages/syslinux/syslinux.inc | 4 | ||||
| -rw-r--r-- | packages/syslinux/syslinux3.inc | 20 |
5 files changed, 28 insertions, 24 deletions
diff --git a/packages/syslinux/syslinux-native_2.11.bb b/packages/syslinux/syslinux-native_2.11.bb index fc41678dc6..a05728f0a5 100644 --- a/packages/syslinux/syslinux-native_2.11.bb +++ b/packages/syslinux/syslinux-native_2.11.bb @@ -4,3 +4,7 @@ SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.ta file://edx_assume_zero.patch;patch=1" require syslinux.inc + +do_compile() { + oe_runmake syslinux +} diff --git a/packages/syslinux/syslinux-native_3.11.bb b/packages/syslinux/syslinux-native_3.11.bb index a33ef75c9b..28d750aab5 100644 --- a/packages/syslinux/syslinux-native_3.11.bb +++ b/packages/syslinux/syslinux-native_3.11.bb @@ -2,23 +2,4 @@ PR="r1" SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 " -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 -} +require syslinux3.inc diff --git a/packages/syslinux/syslinux-native_3.31.bb b/packages/syslinux/syslinux-native_3.31.bb new file mode 100644 index 0000000000..6971874ea3 --- /dev/null +++ b/packages/syslinux/syslinux-native_3.31.bb @@ -0,0 +1,3 @@ +SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 " + +require syslinux3.inc diff --git a/packages/syslinux/syslinux.inc b/packages/syslinux/syslinux.inc index 2753f166cd..41be168d12 100644 --- a/packages/syslinux/syslinux.inc +++ b/packages/syslinux/syslinux.inc @@ -15,10 +15,6 @@ S="${WORKDIR}/syslinux-${PV}" inherit native -do_compile() { - oe_runmake syslinux -} - do_stage() { install -d ${STAGING_BINDIR} install -m 755 ${S}/syslinux ${STAGING_BINDIR} diff --git a/packages/syslinux/syslinux3.inc b/packages/syslinux/syslinux3.inc new file mode 100644 index 0000000000..25942aab84 --- /dev/null +++ b/packages/syslinux/syslinux3.inc @@ -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 +} |