projects
/
15.05
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7bb6460
)
x86: rename the iso file to openwrt-x86-generic.iso
author
Felix Fietkau
<nbd@openwrt.org>
Sun, 7 Oct 2012 23:05:39 +0000
(23:05 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sun, 7 Oct 2012 23:05:39 +0000
(23:05 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33641
3c298f89
-4303-0410-b956-
a3cf2f4a3e73
target/linux/x86/image/Makefile
patch
|
blob
|
history
diff --git
a/target/linux/x86/image/Makefile
b/target/linux/x86/image/Makefile
index
028612a
..
3552748
100644
(file)
--- 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