summaryrefslogtreecommitdiff
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-26 17:27:23 +0100
commit63d164b755b984021f7e3cdba7280918ded6e821 (patch)
treed788c10282650ecc6254e74119360f29e83d624e /meta/classes/syslinux.bbclass
parent17d74fbd09e377e100423e1a73b9d4ce761a21d7 (diff)
downloadopenembedded-core-63d164b755b984021f7e3cdba7280918ded6e821.tar.gz
openembedded-core-63d164b755b984021f7e3cdba7280918ded6e821.tar.bz2
openembedded-core-63d164b755b984021f7e3cdba7280918ded6e821.zip
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] 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() {
}
syslinux_iso_populate() {
- syslinux_populate ${ISODIR} ${ISOLINUXDIR} isolinux.cfg
- install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR}
- install -m 0644 ${STAGING_DATADIR}/syslinux/ldlinux.c32 ${ISODIR}${ISOLINUXDIR}
+ iso_dir=$1
+ syslinux_populate $iso_dir ${ISOLINUXDIR} isolinux.cfg
+ install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin $iso_dir${ISOLINUXDIR}
+ install -m 0644 ${STAGING_DATADIR}/syslinux/ldlinux.c32 $iso_dir${ISOLINUXDIR}
}
syslinux_hddimg_populate() {
- syslinux_populate ${HDDDIR} ${SYSLINUXDIR} syslinux.cfg
- install -m 0444 ${STAGING_DATADIR}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys
+ hdd_dir=$1
+ syslinux_populate $hdd_dir ${SYSLINUXDIR} syslinux.cfg
+ install -m 0444 ${STAGING_DATADIR}/syslinux/ldlinux.sys $hdd_dir${SYSLINUXDIR}/ldlinux.sys
}
syslinux_hddimg_install() {