X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fimage.mk;h=efbc76db36a25d6e098463fc397d64f3b11911b8;hb=aa954c1c5dd50c89f91ac2574482ab7c927a3c54;hp=d7e4ccd36baa734555b34fa0004b3402083e8b7c;hpb=a93683386efd3ac123321caaa2eb7b901c4524d1;p=openwrt-10.03%2F.git

diff --git a/include/image.mk b/include/image.mk
index d7e4ccd36..efbc76db3 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -61,18 +61,18 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
 
   ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
     define Image/mkfs/tgz
-		$(TAR) -zcf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tgz --owner=root --group=root -C $(TARGET_DIR)/ .
+		$(TAR) -zcf $(BIN_DIR)/openwrt-$(BOARD)-rootfs.tgz --owner=root --group=root -C $(TARGET_DIR)/ .
     endef
   endif
 
   ifeq ($(CONFIG_TARGET_ROOTFS_CPIOGZ),y)
     define Image/mkfs/cpiogz
-		( cd $(BUILD_DIR)/root; find . | cpio -o -H newc | gzip -9 >$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.cpio.gz )
+		( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9 >$(BIN_DIR)/openwrt-$(BOARD)-rootfs.cpio.gz )
     endef
   endif
 else
   define Image/BuildKernel
-	cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux.elf
+	cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.elf
 	$(call Image/Build/Initramfs)
   endef
 endif
@@ -88,9 +88,9 @@ ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y)
 endif
 
 ifeq ($(CONFIG_TARGET_ROOTFS_ISO),y)
-  define Image/mkfs/iso 
-		$(call Image/Build,iso) 
-  endef 
+  define Image/mkfs/iso
+		$(call Image/Build,iso)
+  endef
 endif
 
 
@@ -137,7 +137,7 @@ else
 	$(call Image/mkfs/ext2)
 	$(call Image/mkfs/iso)
 endif
-	
+
 ifneq ($(IB),1)
   clean: clean-targets
 	$(call Build/Clean)