summaryrefslogtreecommitdiff
path: root/target/linux/x86/image
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-07 23:05:39 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-07 23:05:39 +0000
commit821655e4a83bbda466d884a7e1c18b389edc13f5 (patch)
tree2446bb062ca5aefd0a4f9978625ebffe864f9080 /target/linux/x86/image
parent48e426d185cde9337ec788ac46a93468f3c0c47e (diff)
x86: rename the iso file to openwrt-x86-generic.iso
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33641 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86/image')
-rw-r--r--target/linux/x86/image/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 028612a12e..3552748e60 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -219,8 +219,10 @@ define Image/Build
$(call Image/Build/grub2,$(1))
$(call Image/Build/vdi,$(1))
$(call Image/Build/vmdk,$(1))
- endif
$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
+ else
+ $(CP) $(KDIR)/root.iso $(BIN_DIR)/$(IMG_PREFIX).iso
+ endif
$(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz
$(call Image/Build/gzip/$(1))
endef