diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-03-25 14:09:06 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-03-25 14:09:06 +0000 |
commit | f89cd3158a95890e15c97de4009e688bee8bc087 (patch) | |
tree | 5a1dd7aab813fcc3d06f4b71e7ee550551c0f31f | |
parent | 91f093a2b26d4574cd5ce68171a2e872ac000047 (diff) | |
download | poky-f89cd3158a95890e15c97de4009e688bee8bc087.tar.gz |
bootimg/boot-directdisk.bbclass: Update afer syslinux changes, fix mbr.bin location and fix dependencies
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | meta/classes/boot-directdisk.bbclass | 10 | ||||
-rw-r--r-- | meta/classes/bootimg.bbclass | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass index f4abae991b..d87dc2258a 100644 --- a/meta/classes/boot-directdisk.bbclass +++ b/meta/classes/boot-directdisk.bbclass | |||
@@ -20,8 +20,10 @@ | |||
20 | # ${ROOTFS} - the rootfs image to incorporate | 20 | # ${ROOTFS} - the rootfs image to incorporate |
21 | 21 | ||
22 | do_bootdirectdisk[depends] += "dosfstools-native:do_populate_sysroot \ | 22 | do_bootdirectdisk[depends] += "dosfstools-native:do_populate_sysroot \ |
23 | syslinux:do_populate_sysroot \ | 23 | syslinux:do_populate_sysroot \ |
24 | syslinux-installer-native:do_populate_sysroot" | 24 | syslinux-native:do_populate_sysroot \ |
25 | parted-native:do_populate_sysroot \ | ||
26 | mtools-native:do_populate_sysroot " | ||
25 | 27 | ||
26 | PACKAGES = " " | 28 | PACKAGES = " " |
27 | EXCLUDE_FROM_WORLD = "1" | 29 | EXCLUDE_FROM_WORLD = "1" |
@@ -48,7 +50,7 @@ build_boot_dd() { | |||
48 | 50 | ||
49 | install -d ${HDDDIR} | 51 | install -d ${HDDDIR} |
50 | install -m 0644 ${STAGING_DIR}/${MACHINE}${HOST_VENDOR}-${HOST_OS}/kernel/bzImage ${HDDDIR}/vmlinuz | 52 | install -m 0644 ${STAGING_DIR}/${MACHINE}${HOST_VENDOR}-${HOST_OS}/kernel/bzImage ${HDDDIR}/vmlinuz |
51 | install -m 444 ${STAGING_DATADIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys | 53 | install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys |
52 | 54 | ||
53 | BLOCKS=`du -bks ${HDDDIR} | cut -f 1` | 55 | BLOCKS=`du -bks ${HDDDIR} | cut -f 1` |
54 | SIZE=`expr $BLOCKS + ${BOOTDD_EXTRA_SPACE}` | 56 | SIZE=`expr $BLOCKS + ${BOOTDD_EXTRA_SPACE}` |
@@ -74,7 +76,7 @@ build_boot_dd() { | |||
74 | parted $IMAGE print | 76 | parted $IMAGE print |
75 | 77 | ||
76 | OFFSET=`expr $END2 / 512` | 78 | OFFSET=`expr $END2 / 512` |
77 | dd if=/tmp/mbr.bin of=$IMAGE conv=notrunc | 79 | dd if=${STAGING_LIBDIR}/syslinux/mbr.bin of=$IMAGE conv=notrunc |
78 | dd if=${HDDIMG} of=$IMAGE conv=notrunc seek=1 bs=512 | 80 | dd if=${HDDIMG} of=$IMAGE conv=notrunc seek=1 bs=512 |
79 | dd if=${ROOTFS} of=$IMAGE conv=notrunc seek=$OFFSET bs=512 | 81 | dd if=${ROOTFS} of=$IMAGE conv=notrunc seek=$OFFSET bs=512 |
80 | 82 | ||
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass index 2de8d50934..f1e2ba4b43 100644 --- a/meta/classes/bootimg.bbclass +++ b/meta/classes/bootimg.bbclass | |||
@@ -60,8 +60,7 @@ build_boot_bin() { | |||
60 | install -m 0644 ${ROOTFS} ${HDDDIR}/rootfs.img | 60 | install -m 0644 ${ROOTFS} ${HDDDIR}/rootfs.img |
61 | fi | 61 | fi |
62 | 62 | ||
63 | install -m 444 ${STAGING_DATADIR}/syslinux/ldlinux.sys \ | 63 | install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys |
64 | ${HDDDIR}/ldlinux.sys | ||
65 | 64 | ||
66 | # Do a little math, bash style | 65 | # Do a little math, bash style |
67 | #BLOCKS=`du -s ${HDDDIR} | cut -f 1` | 66 | #BLOCKS=`du -s ${HDDDIR} | cut -f 1` |
@@ -102,8 +101,7 @@ build_boot_bin() { | |||
102 | fi | 101 | fi |
103 | 102 | ||
104 | # And install the syslinux stuff | 103 | # And install the syslinux stuff |
105 | cp ${STAGING_DATADIR}/syslinux/isolinux.bin \ | 104 | cp ${STAGING_LIBDIR}/syslinux/isolinux.bin ${ISODIR} |
106 | ${ISODIR} | ||
107 | 105 | ||
108 | mkisofs -V ${BOOTIMG_VOLUME_ID} \ | 106 | mkisofs -V ${BOOTIMG_VOLUME_ID} \ |
109 | -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \ | 107 | -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \ |