sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bootimg/boot-directdisk.bbclass: Update afer syslinux changes, fix mbr.bin location and fix dependencies 

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2010-03-25 14:09:06 +00:00
parent 91f093a2b2
commit f89cd3158a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta/classes/boot-directdisk.bbclass
View File

@ -20,8 +20,10 @@
# ${ROOTFS} - the rootfs image to incorporate
do_bootdirectdisk[depends] += "dosfstools-native:do_populate_sysroot \
syslinux:do_populate_sysroot \
syslinux-installer-native:do_populate_sysroot"
syslinux:do_populate_sysroot \
syslinux-native:do_populate_sysroot \
parted-native:do_populate_sysroot \
mtools-native:do_populate_sysroot "
PACKAGES = " "
EXCLUDE_FROM_WORLD = "1"
@ -48,7 +50,7 @@ build_boot_dd() {
install -d ${HDDDIR}
install -m 0644 ${STAGING_DIR}/${MACHINE}${HOST_VENDOR}-${HOST_OS}/kernel/bzImage ${HDDDIR}/vmlinuz
install -m 444 ${STAGING_DATADIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
BLOCKS=`du -bks ${HDDDIR} | cut -f 1`
SIZE=`expr $BLOCKS + ${BOOTDD_EXTRA_SPACE}`
@ -74,7 +76,7 @@ build_boot_dd() {
parted $IMAGE print
OFFSET=`expr $END2 / 512`
dd if=/tmp/mbr.bin of=$IMAGE conv=notrunc
dd if=${STAGING_LIBDIR}/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

6
meta/classes/bootimg.bbclass
View File

@ -60,8 +60,7 @@ build_boot_bin() {
install -m 0644 ${ROOTFS} ${HDDDIR}/rootfs.img
fi
install -m 444 ${STAGING_DATADIR}/syslinux/ldlinux.sys \
${HDDDIR}/ldlinux.sys
install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
# Do a little math, bash style
#BLOCKS=`du -s ${HDDDIR} | cut -f 1`
@ -102,8 +101,7 @@ build_boot_bin() {
fi
# And install the syslinux stuff
cp ${STAGING_DATADIR}/syslinux/isolinux.bin \
${ISODIR}
cp ${STAGING_LIBDIR}/syslinux/isolinux.bin ${ISODIR}
mkisofs -V ${BOOTIMG_VOLUME_ID} \
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \