diff options
Diffstat (limited to 'meta/recipes-devtools/syslinux/syslinux_6.03.bb')
| -rw-r--r-- | meta/recipes-devtools/syslinux/syslinux_6.03.bb | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/meta/recipes-devtools/syslinux/syslinux_6.03.bb index 33dd776f1b..69bce1f8d7 100644 --- a/meta/recipes-devtools/syslinux/syslinux_6.03.bb +++ b/meta/recipes-devtools/syslinux/syslinux_6.03.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ # ldlinux.* stuff for now, so skip mtools-native DEPENDS = "nasm-native util-linux e2fsprogs" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/6.xx/syslinux-${PV}.tar.xz \ +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/syslinux-${PV}.tar.xz \ file://syslinux-fix-parallel-building-issue.patch \ file://syslinux-libupload-depend-lib.patch \ file://syslinux-remove-clean-script.patch \ @@ -21,6 +21,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/6.xx/syslinux-${PV}.tar file://0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch \ file://0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch \ file://0009-linux-syslinux-implement-install_bootblock.patch \ + file://0010-gcc46-compatibility.patch \ + file://0011-mk-MMD-does-not-take-any-arguments.patch \ + file://syslinux-6.03-sysmacros.patch \ " SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13" @@ -35,8 +38,6 @@ EXTRA_OEMAKE = " \ BINDIR=${bindir} SBINDIR=${sbindir} LIBDIR=${libdir} \ DATADIR=${datadir} MANDIR=${mandir} INCDIR=${includedir} \ " -# syslinux uses $LD for linking, strip `-Wl,' so it can work -export LDFLAGS = "`echo $LDFLAGS | sed 's/-Wl,//g'`" do_configure() { # drop win32 targets or build fails @@ -57,23 +58,26 @@ do_compile() { # Rebuild only the installer; keep precompiled bootloaders # as per author's request (doc/distrib.txt) - oe_runmake CC="${CC} ${CFLAGS}" LDFLAGS="${LDFLAGS}" firmware="bios" installer + oe_runmake CC="${CC} ${CFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}" firmware="bios" installer } do_install() { - oe_runmake CC="${CC} ${CFLAGS}" install INSTALLROOT="${D}" firmware="bios" + oe_runmake CC="${CC} ${CFLAGS}" LD="${LD}" install INSTALLROOT="${D}" firmware="bios" install -d ${D}${datadir}/syslinux/ install -m 644 ${S}/bios/core/ldlinux.sys ${D}${datadir}/syslinux/ install -m 644 ${S}/bios/core/ldlinux.bss ${D}${datadir}/syslinux/ + install -m 755 ${S}/bios/linux/syslinux-nomtools ${D}${bindir}/ } -PACKAGES += "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc" +PACKAGES += "${PN}-nomtools ${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc" RDEPENDS_${PN} += "mtools" +RDEPENDS_${PN}-nomtools += "libext2fs" RDEPENDS_${PN}-misc += "perl" FILES_${PN} = "${bindir}/syslinux" +FILES_${PN}-nomtools = "${bindir}/syslinux-nomtools" FILES_${PN}-extlinux = "${sbindir}/extlinux" FILES_${PN}-mbr = "${datadir}/${BPN}/mbr.bin" FILES_${PN}-chain = "${datadir}/${BPN}/chain.c32" |