syslinux/syslinux-installer-native: Convert to stage with do_install

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/syslinux/syslinux-installer-native_3.36.bb b/meta/packages/syslinux/syslinux-installer-native_3.36.bb
index cc61693be0212ef1d9c58c510c5eaedec925d343..c304a2d2931f7dba3fd349b79b45914c5633448b 100644 (file)
--- a/meta/packages/syslinux/syslinux-installer-native_3.36.bb
+++ b/meta/packages/syslinux/syslinux-installer-native_3.36.bb
@@ -16,11 +16,12 @@ do_compile() {
        oe_runmake installer
 }
 
-do_stage() {
+NATIVE_INSTALL_WORKS = "1"
+do_install() {
        install -d ${STAGE_TEMP}
        oe_runmake install INSTALLROOT="${STAGE_TEMP}"
 
-       install -d ${STAGING_BINDIR}
-       install -m 755 ${STAGE_TEMP}/usr/bin/syslinux ${STAGING_BINDIR}
-       install -m 755 ${STAGE_TEMP}/sbin/extlinux ${STAGING_BINDIR}
+       install -d ${D}${bindir}/
+       install -m 755 ${STAGE_TEMP}/usr/bin/syslinux ${D}${bindir}/
+       install -m 755 ${STAGE_TEMP}/sbin/extlinux ${D}${bindir}/
 }

diff --git a/meta/packages/syslinux/syslinux_3.36.bb b/meta/packages/syslinux/syslinux_3.36.bb
index bbfbdbf1b05d5d14a585e4b98ce8ed66a66e9043..8db2055dc976afeeba921f8408546b666f1a5a66 100644 (file)
--- a/meta/packages/syslinux/syslinux_3.36.bb
+++ b/meta/packages/syslinux/syslinux_3.36.bb
@@ -18,7 +18,7 @@ STAGE_TEMP = "${WORKDIR}/stage_temp"
 
 COMPATIBLE_HOST = '(x86_64|i.86.*)-(linux|freebsd.*)'
 
-do_stage() {
+do_install() {
        install -d ${STAGE_TEMP}
        oe_runmake install INSTALLROOT="${STAGE_TEMP}"
        
@@ -26,8 +26,8 @@ do_stage() {
        # 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
+       install -d ${D}${datadir}/syslinux/
+       install -m 0644 ${STAGE_TEMP}/usr/lib/syslinux/isolinux.bin ${D}${datadir}/syslinux/isolinux.bin
+       install -m 644 ${S}/ldlinux.sys ${D}${datadir}/syslinux/ldlinux.sys
+       install -m 644 ${S}/ldlinux.bss ${D}${datadir}/syslinux/ldlinux.bss
 }