diff options
Diffstat (limited to 'meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb')
-rw-r--r-- | meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb index 5604901592..c8e7f25d2b 100644 --- a/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb +++ b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb @@ -28,7 +28,6 @@ SRC_URI[md5sum] = "2b31c78f087f99179feb357da312d7ec" SRC_URI[sha256sum] = "4441a5d593f85bb6e8d578cf6653fb4ec30f9e8f4a2315a3d8f2d0a8b3fadf94" # remove at next version upgrade or when output changes -PR = "r1" RECIPE_NO_UPDATE_REASON = "6.04-pre3 is broken" UPSTREAM_CHECK_URI = "https://www.zytor.com/pub/syslinux/" @@ -49,7 +48,7 @@ TARGET_LDFLAGS = "" SECURITY_LDFLAGS = "" LDFLAGS_SECTION_REMOVAL = "" -CFLAGS:append = " -DNO_INLINE_FUNCS" +CFLAGS:append = " -DNO_INLINE_FUNCS -Wno-error=implicit-function-declaration" EXTRA_OEMAKE = " \ BINDIR=${bindir} SBINDIR=${sbindir} LIBDIR=${libdir} \ @@ -64,6 +63,10 @@ EXTRA_OEMAKE = " \ RANLIB="${RANLIB}" \ " +# mtools allows non-root users to install syslinux +PACKAGECONFIG ??= "mtools" +PACKAGECONFIG[mtools] = ",,," + # # Tasks for native/nativesdk which just build the installer. # @@ -78,10 +81,15 @@ do_compile() { do_install() { install -d ${D}${bindir} install \ - ${B}/bios/mtools/syslinux \ ${B}/bios/extlinux/extlinux \ ${B}/bios/utils/isohybrid \ ${D}${bindir} + + if ${@bb.utils.contains("PACKAGECONFIG", "mtools", "true", "false", d)}; then + install ${B}/bios/mtools/syslinux ${D}${bindir} + else + install ${B}/bios/linux/syslinux ${D}${bindir} + fi } # @@ -105,14 +113,12 @@ do_install:class-target() { install -m 644 ${S}/bios/core/ldlinux.bss ${D}${datadir}/syslinux/ } -PACKAGES += "${PN}-nomtools ${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc" +PACKAGES += "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc" -RDEPENDS:${PN} += "mtools" -RDEPENDS:${PN}-nomtools += "libext2fs" +RDEPENDS:${PN} += "${@bb.utils.contains("PACKAGECONFIG", "mtools", "mtools", "", d)}" 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" |