diff options
| author | Jonathan Liu <net147@gmail.com> | 2013-05-09 13:24:02 +1000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-16 00:05:07 +0300 |
| commit | 17e7ac0c5e75245d17a90e5cc49ade3d18a168ba (patch) | |
| tree | a539034f8e12bbe4758878edea384db0b54cb056 /meta/classes | |
| parent | b2cc92595b30d96a79f33ea7a7217834c8b6bff7 (diff) | |
| download | openembedded-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')
| -rw-r--r-- | meta/classes/boot-directdisk.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/syslinux.bbclass | 8 |
2 files changed, 6 insertions, 6 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 diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass index 0b90eab228..501bc6db8e 100644 --- a/meta/classes/syslinux.bbclass +++ b/meta/classes/syslinux.bbclass @@ -40,9 +40,9 @@ syslinux_populate() { syslinux_iso_populate() { syslinux_populate ${ISODIR} ${ISOLINUXDIR} isolinux.cfg - install -m 0644 ${STAGING_LIBDIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR} + install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR} if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then - install -m 0644 ${STAGING_LIBDIR}/syslinux/vesamenu.c32 ${ISODIR}${ISOLINUXDIR}/vesamenu.c32 + install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32 ${ISODIR}${ISOLINUXDIR}/vesamenu.c32 if [ "${SYSLINUX_SPLASH}" != "" ] ; then install -m 0644 ${SYSLINUX_SPLASH} ${ISODIR}${ISOLINUXDIR}/splash.lss fi @@ -51,9 +51,9 @@ syslinux_iso_populate() { syslinux_hddimg_populate() { syslinux_populate ${HDDDIR} ${SYSLINUXDIR} syslinux.cfg - install -m 0444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys + install -m 0444 ${STAGING_DATADIR}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then - install -m 0644 ${STAGING_LIBDIR}/syslinux/vesamenu.c32 ${HDDDIR}${SYSLINUXDIR}/vesamenu.c32 + install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32 ${HDDDIR}${SYSLINUXDIR}/vesamenu.c32 if [ "${SYSLINUX_SPLASH}" != "" ] ; then install -m 0644 ${SYSLINUX_SPLASH} ${HDDDIR}${SYSLINUXDIR}/splash.lss fi |