merge [15491] for 2.6.30

[openwrt.git] / target / linux / x86 / image / Makefile

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 839646e..2bdfba5 100644 (file)
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -49,9 +49,9 @@ ifneq ($(HOST_OS),Darwin)
   define Image/Prepare/grub
        # for the image builder
        $(CP) \
   define Image/Prepare/grub
        # for the image builder
        $(CP) \

-               $(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/stage1 \
-               $(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/stage2 \
-               $(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/e2fs_stage1_5 \
+               $(STAGING_DIR_HOST)/usr/lib/grub/i386-*/stage1 \
+               $(STAGING_DIR_HOST)/usr/lib/grub/i386-*/stage2 \
+               $(STAGING_DIR_HOST)/usr/lib/grub/i386-*/e2fs_stage1_5 \

                $(KDIR)/
   endef
 else
                $(KDIR)/
   endef
 else


@@ -93,7 +93,7 @@ endef
 
 define Image/Build/iso 
        $(CP) \
 
 define Image/Build/iso 
        $(CP) \

-               $(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/stage2_eltorito \
+               $(STAGING_DIR_HOST)/usr/lib/grub/i386-openwrt/stage2_eltorito \

                $(KDIR)/root.grub/boot/grub/stage2_eltorito 
        sed -i \
                -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \
                $(KDIR)/root.grub/boot/grub/stage2_eltorito 
        sed -i \
                -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \