summaryrefslogtreecommitdiff
path: root/meta/classes/boot-directdisk.bbclass
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-05-09 13:24:02 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-16 00:05:07 +0300
commit17e7ac0c5e75245d17a90e5cc49ade3d18a168ba (patch)
treea539034f8e12bbe4758878edea384db0b54cb056 /meta/classes/boot-directdisk.bbclass
parentb2cc92595b30d96a79f33ea7a7217834c8b6bff7 (diff)
downloadopenembedded-core-17e7ac0c5e75245d17a90e5cc49ade3d18a168ba.tar.gz
openembedded-core-17e7ac0c5e75245d17a90e5cc49ade3d18a168ba.tar.bz2
openembedded-core-17e7ac0c5e75245d17a90e5cc49ade3d18a168ba.zip
syslinux: Update to 4.06
Patches are now part of upstream or no longer needed. Added new util-linux dependency for isohybrid. Paths updated to reflect directory structure changes. Add CFLAGS and LDFLAGS overrides. [YOCTO #4438] Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/boot-directdisk.bbclass')
-rw-r--r--meta/classes/boot-directdisk.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index 2a8823da20..a3c9a876c1 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -48,7 +48,7 @@ build_boot_dd() {
install -d ${HDDDIR}
install -m 0644 ${STAGING_KERNEL_DIR}/bzImage ${HDDDIR}/vmlinuz
install -m 0644 ${S}/syslinux.cfg ${HDDDIR}/syslinux.cfg
- install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
+ install -m 444 ${STAGING_DATADIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
BLOCKS=`du -bks ${HDDDIR} | cut -f 1`
BLOCKS=`expr $BLOCKS + ${BOOTDD_EXTRA_SPACE}`
@@ -82,7 +82,7 @@ build_boot_dd() {
parted $IMAGE print
OFFSET=`expr $END2 / 512`
- dd if=${STAGING_LIBDIR}/syslinux/mbr.bin of=$IMAGE conv=notrunc
+ dd if=${STAGING_DATADIR}/syslinux/mbr.bin of=$IMAGE conv=notrunc
dd if=${HDDIMG} of=$IMAGE conv=notrunc seek=1 bs=512
dd if=${ROOTFS} of=$IMAGE conv=notrunc seek=$OFFSET bs=512