images: rename CONFIG_TARGET_ROOTFS_FSPART to CONFIG_TARGET_ROOTFS_PARTSIZE

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

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 1c94634f2c579946f1174dc996dc2fa9b95aad09..8df00c24fe5657fea2bf97b4bdcdcd9c3aa90782 100644 (file)
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -56,7 +56,9 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
        # left here because the image builder doesnt need these
        $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub
        $(CP) \
-               $(KDIR)/*stage* \
+               $(KDIR)/stage1 \
+               $(KDIR)/stage2 \
+               $(KDIR)/e2fs_stage1_5 \
                $(KDIR)/root.grub/boot/grub/
        $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
        sed \
@@ -67,16 +69,17 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
        PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_x86.sh \
                $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
                $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub \
-               $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
+               $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
        $(call Image/Build/grub/$(1))
   endef
 
   define Image/Prepare/grub
        # for the image builder
        $(CP) \
-               $(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 \
+               $(STAGING_DIR)/usr/lib/grub/i386-openwrt/stage1 \
+               $(STAGING_DIR)/usr/lib/grub/i386-openwrt/stage2 \
+               $(STAGING_DIR)/usr/lib/grub/i386-openwrt/stage2_eltorito \
+               $(STAGING_DIR)/usr/lib/grub/i386-openwrt/e2fs_stage1_5 \
                $(KDIR)/
   endef
 
@@ -86,7 +89,7 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
        PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" NOGRUB=1 ./gen_image_x86.sh 
                $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
                $(CONFIG_X86_GRUB_KERNELPART) "" \
-               $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
+               $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
   endef
 
  endif
@@ -123,7 +126,7 @@ ifneq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),)
        PADDING="$(CONFIG_OLPC_BOOTSCRIPT_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_olpc.sh \
                $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
                $(CONFIG_OLPC_BOOTSCRIPT_KERNELPART) $(KDIR)/root.bootscript \
-               $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
+               $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
   endef
 
 endif
@@ -135,8 +138,8 @@ endef
 define Image/Build/iso 
        $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub
        $(CP) \
-               $(STAGING_DIR_HOST)/usr/lib/grub/i386-openwrt/stage2_eltorito \
-               $(KDIR)/root.grub/boot/grub/stage2_eltorito 
+               $(KDIR)/stage2_eltorito \
+               $(KDIR)/root.grub/boot/grub/ 
        sed \
                -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \
                -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \
@@ -152,7 +155,7 @@ ifneq ($(CONFIG_X86_VDI_IMAGES),)
   define Image/Build/vdi
     # left here because the image builder doesnt need these
     ifeq ($(1),ext2)
-               rm $(BIN_DIR)/$(IMG_PREFIX)-ext2.vdi || true
+               rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
                VBoxManage convertfromraw -format VDI \
                        $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
                        $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
@@ -166,7 +169,7 @@ ifneq ($(CONFIG_X86_VMDK_IMAGES),)
   define Image/Build/vmdk
     # left here because the image builder doesnt need these
     ifeq ($(1),ext2)
-               rm $(BIN_DIR)/$(IMG_PREFIX)-ext2.vmdk || true
+               rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true
                qemu-img convert -f raw -O vmdk \
                        $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
                        $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk