summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-17 16:18:38 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-17 16:18:38 +0000
commit54c9e936a25b68a9fbb1be8bd1f60789870dea65 (patch)
tree750c6db537c46a770d260e749f4fa2444a98c750
parentfe89792652db5097f15e54f41cdaf50ebc593179 (diff)
downloadpoky-54c9e936a25b68a9fbb1be8bd1f60789870dea65.tar.gz
syslinux/syslinux-installer-native: Convert to stage with do_install
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/syslinux/syslinux-installer-native_3.36.bb9
-rw-r--r--meta/packages/syslinux/syslinux_3.36.bb10
2 files changed, 10 insertions, 9 deletions
diff --git a/meta/packages/syslinux/syslinux-installer-native_3.36.bb b/meta/packages/syslinux/syslinux-installer-native_3.36.bb
index cc61693be0..c304a2d293 100644
--- 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() {
16 oe_runmake installer 16 oe_runmake installer
17} 17}
18 18
19do_stage() { 19NATIVE_INSTALL_WORKS = "1"
20do_install() {
20 install -d ${STAGE_TEMP} 21 install -d ${STAGE_TEMP}
21 oe_runmake install INSTALLROOT="${STAGE_TEMP}" 22 oe_runmake install INSTALLROOT="${STAGE_TEMP}"
22 23
23 install -d ${STAGING_BINDIR} 24 install -d ${D}${bindir}/
24 install -m 755 ${STAGE_TEMP}/usr/bin/syslinux ${STAGING_BINDIR} 25 install -m 755 ${STAGE_TEMP}/usr/bin/syslinux ${D}${bindir}/
25 install -m 755 ${STAGE_TEMP}/sbin/extlinux ${STAGING_BINDIR} 26 install -m 755 ${STAGE_TEMP}/sbin/extlinux ${D}${bindir}/
26} 27}
diff --git a/meta/packages/syslinux/syslinux_3.36.bb b/meta/packages/syslinux/syslinux_3.36.bb
index bbfbdbf1b0..8db2055dc9 100644
--- 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"
18 18
19COMPATIBLE_HOST = '(x86_64|i.86.*)-(linux|freebsd.*)' 19COMPATIBLE_HOST = '(x86_64|i.86.*)-(linux|freebsd.*)'
20 20
21do_stage() { 21do_install() {
22 install -d ${STAGE_TEMP} 22 install -d ${STAGE_TEMP}
23 oe_runmake install INSTALLROOT="${STAGE_TEMP}" 23 oe_runmake install INSTALLROOT="${STAGE_TEMP}"
24 24
@@ -26,8 +26,8 @@ do_stage() {
26 # as the DOS data files, so we copy those into a special location 26 # as the DOS data files, so we copy those into a special location
27 # for usage during a image build stage 27 # for usage during a image build stage
28 28
29 install -d ${STAGING_DATADIR}/syslinux 29 install -d ${D}${datadir}/syslinux/
30 install -m 0644 ${STAGE_TEMP}/usr/lib/syslinux/isolinux.bin ${STAGING_DATADIR}/syslinux/isolinux.bin 30 install -m 0644 ${STAGE_TEMP}/usr/lib/syslinux/isolinux.bin ${D}${datadir}/syslinux/isolinux.bin
31 install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys 31 install -m 644 ${S}/ldlinux.sys ${D}${datadir}/syslinux/ldlinux.sys
32 install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss 32 install -m 644 ${S}/ldlinux.bss ${D}${datadir}/syslinux/ldlinux.bss
33} 33}