X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/65aeed311cbddeb66427150582239ff1623246d9..78c205401ed5d3a55f0b5a92c098af8bf7145540:/include/image.mk

diff --git a/include/image.mk b/include/image.mk
index 87d6815ee..59204581d 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -41,21 +41,26 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
     
   ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
     define Image/mkfs/tgz
-		tar -zcf $(BIN_DIR)/openwrt-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ .
+		tar -zcf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ .
     endef
   endif
   
-  ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y)
-    define Image/mkfs/ext2
-		genext2fs -q -b 4096 -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2
-		$(call Image/Build,ext2)
-    endef
-  endif
   
 endif
 
+
+ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y)
+  E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_FSPART)*1024)))
+  
+  define Image/mkfs/ext2
+		$(STAGING_DIR)/bin/genext2fs -q -b $(E2SIZE) -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2
+		$(call Image/Build,ext2)
+  endef
+endif
+
+
 define Image/mkfs/prepare/default
-	find $(BUILD_DIR)/root -type f -not -perm +0100 | xargs chmod 0644
+	find $(BUILD_DIR)/root -type f -not -perm +0100 -not -name 'ssh_host*' | xargs chmod 0644
 	find $(BUILD_DIR)/root -type f -perm +0100 | xargs chmod 0755
 	find $(BUILD_DIR)/root -type d | xargs chmod 0755
 	mkdir -p $(BUILD_DIR)/root/tmp