summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/boot-directdisk.bbclass4
-rw-r--r--meta/classes/syslinux.bbclass8
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() {
48 install -d ${HDDDIR} 48 install -d ${HDDDIR}
49 install -m 0644 ${STAGING_KERNEL_DIR}/bzImage ${HDDDIR}/vmlinuz 49 install -m 0644 ${STAGING_KERNEL_DIR}/bzImage ${HDDDIR}/vmlinuz
50 install -m 0644 ${S}/syslinux.cfg ${HDDDIR}/syslinux.cfg 50 install -m 0644 ${S}/syslinux.cfg ${HDDDIR}/syslinux.cfg
51 install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys 51 install -m 444 ${STAGING_DATADIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
52 52
53 BLOCKS=`du -bks ${HDDDIR} | cut -f 1` 53 BLOCKS=`du -bks ${HDDDIR} | cut -f 1`
54 BLOCKS=`expr $BLOCKS + ${BOOTDD_EXTRA_SPACE}` 54 BLOCKS=`expr $BLOCKS + ${BOOTDD_EXTRA_SPACE}`
@@ -82,7 +82,7 @@ build_boot_dd() {
82 parted $IMAGE print 82 parted $IMAGE print
83 83
84 OFFSET=`expr $END2 / 512` 84 OFFSET=`expr $END2 / 512`
85 dd if=${STAGING_LIBDIR}/syslinux/mbr.bin of=$IMAGE conv=notrunc 85 dd if=${STAGING_DATADIR}/syslinux/mbr.bin of=$IMAGE conv=notrunc
86 dd if=${HDDIMG} of=$IMAGE conv=notrunc seek=1 bs=512 86 dd if=${HDDIMG} of=$IMAGE conv=notrunc seek=1 bs=512
87 dd if=${ROOTFS} of=$IMAGE conv=notrunc seek=$OFFSET bs=512 87 dd if=${ROOTFS} of=$IMAGE conv=notrunc seek=$OFFSET bs=512
88 88
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() {
40 40
41syslinux_iso_populate() { 41syslinux_iso_populate() {
42 syslinux_populate ${ISODIR} ${ISOLINUXDIR} isolinux.cfg 42 syslinux_populate ${ISODIR} ${ISOLINUXDIR} isolinux.cfg
43 install -m 0644 ${STAGING_LIBDIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR} 43 install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR}
44 if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then 44 if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then
45 install -m 0644 ${STAGING_LIBDIR}/syslinux/vesamenu.c32 ${ISODIR}${ISOLINUXDIR}/vesamenu.c32 45 install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32 ${ISODIR}${ISOLINUXDIR}/vesamenu.c32
46 if [ "${SYSLINUX_SPLASH}" != "" ] ; then 46 if [ "${SYSLINUX_SPLASH}" != "" ] ; then
47 install -m 0644 ${SYSLINUX_SPLASH} ${ISODIR}${ISOLINUXDIR}/splash.lss 47 install -m 0644 ${SYSLINUX_SPLASH} ${ISODIR}${ISOLINUXDIR}/splash.lss
48 fi 48 fi
@@ -51,9 +51,9 @@ syslinux_iso_populate() {
51 51
52syslinux_hddimg_populate() { 52syslinux_hddimg_populate() {
53 syslinux_populate ${HDDDIR} ${SYSLINUXDIR} syslinux.cfg 53 syslinux_populate ${HDDDIR} ${SYSLINUXDIR} syslinux.cfg
54 install -m 0444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys 54 install -m 0444 ${STAGING_DATADIR}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys
55 if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then 55 if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then
56 install -m 0644 ${STAGING_LIBDIR}/syslinux/vesamenu.c32 ${HDDDIR}${SYSLINUXDIR}/vesamenu.c32 56 install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32 ${HDDDIR}${SYSLINUXDIR}/vesamenu.c32
57 if [ "${SYSLINUX_SPLASH}" != "" ] ; then 57 if [ "${SYSLINUX_SPLASH}" != "" ] ; then
58 install -m 0644 ${SYSLINUX_SPLASH} ${HDDDIR}${SYSLINUXDIR}/splash.lss 58 install -m 0644 ${SYSLINUX_SPLASH} ${HDDDIR}${SYSLINUXDIR}/splash.lss
59 fi 59 fi