summaryrefslogtreecommitdiff
path: root/meta/classes/bootimg.bbclass
diff options
context:
space:
mode:
authorAndrzej Zaborowski <andrew@openedhand.com>2008-10-20 00:22:07 +0000
committerAndrzej Zaborowski <andrew@openedhand.com>2008-10-20 00:22:07 +0000
commit3f93ed6bce12da9ece86e3f965e4e667b22fb306 (patch)
tree3d059c6ebe00f5d19590c4e660696dfc7c0964bd /meta/classes/bootimg.bbclass
parent4cb659823ba8f8631d623a870695c79ba352a6ad (diff)
downloadopenembedded-core-3f93ed6bce12da9ece86e3f965e4e667b22fb306.tar.gz
openembedded-core-3f93ed6bce12da9ece86e3f965e4e667b22fb306.tar.bz2
openembedded-core-3f93ed6bce12da9ece86e3f965e4e667b22fb306.zip
syslinux-native: Try to make syslinux cross-compile friendly.
We only had one package for building both the bootloader and the installer, i.e. target and host code. It used always the host compiler. Split the package into syslinux and syslinux-installer-native, require both for a cd bootable image. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5539 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes/bootimg.bbclass')
-rw-r--r--meta/classes/bootimg.bbclass7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 7bd367b9ae..d15818ee5b 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -13,7 +13,8 @@
# ${SYSLINUX_OPTS} - additional options to add to the syslinux file ';' delimited
do_bootimg[depends] += "dosfstools-native:do_populate_staging \
- syslinux-native:do_populate_staging \
+ syslinux:do_populate_staging \
+ syslinux-installer-native:do_populate_staging \
mtools-native:do_populate_staging \
cdrtools-native:do_populate_staging"
@@ -45,7 +46,7 @@ build_boot_bin() {
install -m 0644 ${ROOTFS} ${HDDDIR}/rootfs.img
fi
- install -m 444 ${STAGING_DATADIR_NATIVE}/syslinux/ldlinux.sys \
+ install -m 444 ${STAGING_DATADIR}/syslinux/ldlinux.sys \
${HDDDIR}/ldlinux.sys
# Do a little math, bash style
@@ -83,7 +84,7 @@ build_boot_bin() {
install -m 0644 ${INITRD} ${ISODIR}/initrd
# And install the syslinux stuff
- cp ${STAGING_DATADIR_NATIVE}/syslinux/isolinux.bin \
+ cp ${STAGING_DATADIR}/syslinux/isolinux.bin \
${ISODIR}
mkisofs -V ${BOOTIMG_VOLUME_ID} \