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

diff --git a/include/image.mk b/include/image.mk
index d7e4ccd36..6eef6ba9c 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.
@@ -10,6 +10,7 @@ include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host.mk
 
+.NOTPARALLEL:
 override MAKEFLAGS=
 override MAKE:=$(SUBMAKE)
 KDIR=$(KERNEL_BUILD_DIR)
@@ -61,18 +62,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 +89,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 +138,7 @@ else
 	$(call Image/mkfs/ext2)
 	$(call Image/mkfs/iso)
 endif
-	
+
 ifneq ($(IB),1)
   clean: clean-targets
 	$(call Build/Clean)