summaryrefslogtreecommitdiffstats
path: root/meta/classes/syslinux.bbclass
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2013-09-17 13:32:17 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-30 22:11:56 +0100
commit0ac89346dea9ae52aa9b8c11a6e6bf84ab82e3c9 (patch)
tree08e638462806ac3749bd2bc602124318a07428d5 /meta/classes/syslinux.bbclass
parentec9f4c3c25544e7613058113f283658ce604c937 (diff)
downloadpoky-0ac89346dea9ae52aa9b8c11a6e6bf84ab82e3c9.tar.gz
boot-directdisk.bbclass: Fix media generation problems with vmdk
The various populate methods need to accept a path as an argument vs using hard expanded variables. In the case of the boot-directdisk class it uses a different path for HDDDIR but it gets eclipsed by the the class definition at the point in time ${HDDDIR} gets expanded. The logical fix is to pass the arguments to the functions as opposed to using globally expanded variables from the class definitions. This patch changes 3 things: 1) syslinux_hddimg_populate takes an argument for the destination 2) syslinux_iso_populate takes an argument for the destination 3) populate is changed to boot_direct_populate because there was a conflict with it overriding the populate in bootimg.bbclass [YOCTO #3994] (From OE-Core rev: 63d164b755b984021f7e3cdba7280918ded6e821) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/syslinux.bbclass')
-rw-r--r--meta/classes/syslinux.bbclass12
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 91b973188c..944bd92da2 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -53,14 +53,16 @@ syslinux_populate() {
53} 53}
54 54
55syslinux_iso_populate() { 55syslinux_iso_populate() {
56 syslinux_populate ${ISODIR} ${ISOLINUXDIR} isolinux.cfg 56 iso_dir=$1
57 install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR} 57 syslinux_populate $iso_dir ${ISOLINUXDIR} isolinux.cfg
58 install -m 0644 ${STAGING_DATADIR}/syslinux/ldlinux.c32 ${ISODIR}${ISOLINUXDIR} 58 install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin $iso_dir${ISOLINUXDIR}
59 install -m 0644 ${STAGING_DATADIR}/syslinux/ldlinux.c32 $iso_dir${ISOLINUXDIR}
59} 60}
60 61
61syslinux_hddimg_populate() { 62syslinux_hddimg_populate() {
62 syslinux_populate ${HDDDIR} ${SYSLINUXDIR} syslinux.cfg 63 hdd_dir=$1
63 install -m 0444 ${STAGING_DATADIR}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys 64 syslinux_populate $hdd_dir ${SYSLINUXDIR} syslinux.cfg
65 install -m 0444 ${STAGING_DATADIR}/syslinux/ldlinux.sys $hdd_dir${SYSLINUXDIR}/ldlinux.sys
64} 66}
65 67
66syslinux_hddimg_install() { 68syslinux_hddimg_install() {