--- smage/trunk/core/grub/grub-0.97-r17.smage2 2010/10/21 15:29:32 735 +++ smage/trunk/core/grub/grub-0.97-r17.smage2 2010/10/21 16:39:54 738 @@ -181,13 +181,19 @@ mmake DESTDIR=${BINDIR} install || die + local archhost + case ${ARCH} in + i486) archhost="i386-${CHOST/i486-linux-gnu/}" ;; + *) archhost="${CHOST/-linux-gnu/}" ;; + esac + # install netboot grub - minstallexec nbgrub /usr/$(mlibdir)/grub/${CHOST/-linux-gnu/}/ || die - minstallexec pxegrub /usr/$(mlibdir)/grub/${CHOST/-linux-gnu/}/ || die - minstallexec stage2/stage2.netboot /usr/$(mlibdir)/grub/${CHOST/-linux-gnu/}/ || die + minstallexec nbgrub /usr/$(mlibdir)/grub/${archhost}/ || die + minstallexec pxegrub /usr/$(mlibdir)/grub/${archhost}/ || die + minstallexec stage2/stage2.netboot /usr/$(mlibdir)/grub/${archhost}/ || die # now copying all stage files - for i in ${BINDIR}/usr/$(mlibdir)/grub/${CHOST/-linux-gnu/}/* + for i in ${BINDIR}/usr/$(mlibdir)/grub/${archhost}/* do [ -f ${i} ] && cp -p ${i} ${BINDIR}/boot/grub || die ${i} done