summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/classes/bootimg.bbclass33
1 files changed, 18 insertions, 15 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 9df8e9e27..90bc3a430 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -17,40 +17,43 @@ do_rootfs[depends] += "dosfstools-native:do_populate_staging \
mtools-native:do_populate_staging \
cdrtools-native:do_populate_staging"
-BDIR = "${WORKDIR}/boot"
-ISODIR = "${IMAGE_ROOTFS}/isolinux/"
+PACKAGES = " "
+
+HDDDIR = "${S}/hdd/boot"
+ISODIR = "${S}/cd/isolinux"
BOOTIMG_VOLUME_ID ?= "oe"
BOOTIMG_EXTRA_SPACE ?= "64"
# Get the build_syslinux_cfg() function from the syslinux class
-SYSLINUXCFG = "${BDIR}/syslinux.cfg"
-SYSLINUXMENU = "${BDIR}/menu"
+SYSLINUXCFG = "${HDDDIR}/syslinux.cfg"
+SYSLINUXMENU = "${HDDDIR}/menu"
inherit syslinux
build_boot_bin() {
- install -d ${BDIR}
+ install -d ${HDDDIR}
install -m 0644 ${STAGING_KERNEL_DIR}/bzImage \
- ${BDIR}/vmlinuz
+ ${HDDDIR}/vmlinuz
if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then
- install -m 0644 ${INITRD} ${BDIR}/initrd
+ install -m 0644 ${INITRD} ${HDDDIR}/initrd
fi
install -m 444 ${STAGING_DIR}/${BUILD_SYS}/share/syslinux/ldlinux.sys \
- ${BDIR}/ldlinux.sys
+ ${HDDDIR}/ldlinux.sys
# Do a little math, bash style
- #BLOCKS=`du -s ${BDIR} | cut -f 1`
- BLOCKS=`du -bks ${BDIR} | cut -f 1`
+ #BLOCKS=`du -s ${HDDDIR} | cut -f 1`
+ BLOCKS=`du -bks ${HDDDIR} | cut -f 1`
SIZE=`expr $BLOCKS + ${BOOTIMG_EXTRA_SPACE}`
- mkdosfs -F 12 -n ${BOOTIMG_VOLUME_ID} -d ${BDIR} \
- -C ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-boot.bin $SIZE
+ mkdosfs -F 12 -n ${BOOTIMG_VOLUME_ID} -d ${HDDDIR} \
+ -C ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg $SIZE
- syslinux ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-boot.bin
+ syslinux ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
+ chmod 644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
#Create an ISO if we have an INITRD
if [ -n "${INITRD}" ] && [ -s "${INITRD}" ] && [ "${NOISO}" != "1" ] ; then
@@ -63,7 +66,7 @@ build_boot_bin() {
# Install the configuration files
- cp ${BDIR}/syslinux.cfg ${ISODIR}/isolinux.cfg
+ cp ${HDDDIR}/syslinux.cfg ${ISODIR}/isolinux.cfg
if [ -f ${SYSLINUXMENU} ]; then
cp ${SYSLINUXMENU} ${ISODIR}
@@ -79,7 +82,7 @@ build_boot_bin() {
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \
-b isolinux/isolinux.bin -c isolinux/boot.cat -r \
-no-emul-boot -boot-load-size 4 -boot-info-table \
- ${IMAGE_ROOTFS}
+ ${S}/cd/
fi
}