X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/907958f26817fd7ae5bcf01a290187c9c452109e..03dd7f31977df09b73dd223730c77adbaa6bcf5f:/include/image.mk

diff --git a/include/image.mk b/include/image.mk
index 5fc87efa1..4ec7d91bf 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -1,21 +1,58 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
+override TARGET_BUILD=
 include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host.mk
-KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 
-ifneq ($(CONFIG_BIG_ENDIAN),y)
-JFFS2OPTS     :=  --pad --little-endian --squash
-SQUASHFS_OPTS :=  -le
+.NOTPARALLEL:
+override MAKEFLAGS=
+override MAKE:=$(SUBMAKE)
+KDIR=$(KERNEL_BUILD_DIR)
+
+IMG_PREFIX:=openwrt-$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
+
+ifneq ($(CONFIG_BIG_ENDIAN),)
+  JFFS2OPTS     :=  --pad --big-endian --squash -v
+  SQUASHFS_OPTS :=  -be
 else
-JFFS2OPTS     :=  --pad --big-endian --squash
-SQUASHFS_OPTS :=  -be
+  JFFS2OPTS     :=  --pad --little-endian --squash -v
+  SQUASHFS_OPTS :=  -le
+endif
+
+ifeq ($(CONFIG_JFFS2_RTIME),y)
+  JFFS2OPTS += -X rtime
+endif
+ifeq ($(CONFIG_JFFS2_ZLIB),y) 
+  JFFS2OPTS += -X zlib
+endif
+ifeq ($(CONFIG_JFFS2_LZMA),y)
+  JFFS2OPTS += -X lzma --compression-mode=size
+endif
+ifneq ($(CONFIG_JFFS2_RTIME),y)
+  JFFS2OPTS +=  -x rtime
+endif
+ifneq ($(CONFIG_JFFS2_ZLIB),y)
+  JFFS2OPTS += -x zlib
+endif
+ifneq ($(CONFIG_JFFS2_LZMA),y)
+  JFFS2OPTS += -x lzma
+endif
+
+ifneq ($(CONFIG_LINUX_2_6_25),)
+  USE_SQUASHFS3 := y
+endif
+
+ifneq ($(USE_SQUASHFS3),)
+  MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs-lzma
+else
+  MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs4
+  SQUASHFS_OPTS  := -comp lzma -processors 1
 endif
 
 JFFS2_BLOCKSIZE ?= 64k 128k
@@ -24,109 +61,157 @@ define add_jffs2_mark
 	echo -ne '\xde\xad\xc0\xde' >> $(1)
 endef
 
-# pad to 64k and add jffs2 end-of-filesystem mark
-# do this twice to make sure that this works with 128k blocksize as well
+# pad to 4k, 8k, 64k, 128k and add jffs2 end-of-filesystem mark
 define prepare_generic_squashfs
-	dd if=$(1) of=$(KDIR)/tmpfile.1 bs=64k conv=sync
+	dd if=$(1) of=$(KDIR)/tmpfile.0 bs=4k conv=sync
+	$(call add_jffs2_mark,$(KDIR)/tmpfile.0)
+	dd if=$(KDIR)/tmpfile.0 of=$(KDIR)/tmpfile.1 bs=4k conv=sync
 	$(call add_jffs2_mark,$(KDIR)/tmpfile.1)
-	dd of=$(1) if=$(KDIR)/tmpfile.1 bs=64k conv=sync
+	dd if=$(KDIR)/tmpfile.1 of=$(KDIR)/tmpfile.2 bs=64k conv=sync
+	$(call add_jffs2_mark,$(KDIR)/tmpfile.2)
+	dd if=$(KDIR)/tmpfile.2 of=$(1) bs=64k conv=sync
 	$(call add_jffs2_mark,$(1))
+	rm -f $(KDIR)/tmpfile.*
 endef
 
-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
-  ifeq ($(CONFIG_TARGET_ROOTFS_JFFS2),y)
+
+ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+
+  define Image/BuildKernel
+		cp $(KDIR)/vmlinux.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.elf
+		$(call Image/Build/Initramfs)
+  endef
+
+else
+
+  ifneq ($(CONFIG_TARGET_ROOTFS_JFFS2),)
+    define Image/mkfs/jffs2/sub
+		# FIXME: removing this line will cause strange behaviour in the foreach loop below
+		$(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(JFFS2OPTS) -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(1) -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/'
+		$(call add_jffs2_mark,$(KDIR)/root.jffs2-$(1))
+		$(call Image/Build,jffs2-$(1))
+    endef
     define Image/mkfs/jffs2
-		rm -rf $(BUILD_DIR)/root/jffs
-		
-		$(foreach SZ,$(JFFS2_BLOCKSIZE),\
-			$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e $(patsubst %k,%KiB,$(SZ)) -o $(KDIR)/root.jffs2-$(SZ) -d $(BUILD_DIR)/root; \
-			$(call add_jffs2_mark,$(KDIR)/root.jffs2-$(SZ)); \
-			$(call Image/Build,jffs2-$(SZ)) \
-		)
+		$(foreach SZ,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/sub,$(SZ)))
     endef
   endif
-    
-  ifeq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),y)
+
+  ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
     define Image/mkfs/squashfs
-		@mkdir -p $(BUILD_DIR)/root/jffs
-		$(STAGING_DIR)/bin/mksquashfs-lzma $(BUILD_DIR)/root $(KDIR)/root.squashfs -nopad -noappend -root-owned $(SQUASHFS_OPTS)
+		@mkdir -p $(TARGET_DIR)/overlay
+		$(MKSQUASHFS_CMD) $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned $(SQUASHFS_OPTS)
 		$(call Image/Build,squashfs)
     endef
   endif
-    
-  ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
-    define Image/mkfs/tgz
-		$(TAR) -zcf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ .
+
+  ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
+    define Image/mkfs/ubifs
+		$(CP) ./ubinize.cfg $(KDIR)
+		$(STAGING_DIR_HOST)/bin/mkfs.ubifs $(UBIFS_OPTS) -o $(KDIR)/root.ubifs -d $(TARGET_DIR)
+		(cd $(KDIR); \
+		$(STAGING_DIR_HOST)/bin/ubinize $(UBINIZE_OPTS) -o $(KDIR)/root.ubi ubinize.cfg)
+		$(call Image/Build,ubi)
     endef
   endif
-else
-  define Image/BuildKernel
-	cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux.elf
-	$(call Image/Build/Initramfs)
+
+endif
+
+ifneq ($(CONFIG_TARGET_ROOTFS_CPIOGZ),)
+  define Image/mkfs/cpiogz
+		( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9 >$(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz )
   endef
 endif
 
+ifneq ($(CONFIG_TARGET_ROOTFS_TARGZ),)
+  define Image/mkfs/targz
+		$(TAR) -zcf $(BIN_DIR)/$(IMG_PREFIX)-rootfs.tar.gz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
+  endef
+endif
+
+ifneq ($(CONFIG_TARGET_ROOTFS_EXT2FS),)
+  E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_PARTSIZE)*1024)))
 
-ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y)
-  E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_FSPART)*1024)))
-  
   define Image/mkfs/ext2
-		$(STAGING_DIR)/bin/genext2fs -U -b $(E2SIZE) -I $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2
+		$(STAGING_DIR_HOST)/bin/genext2fs -U -b $(E2SIZE) -N $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext2
 		$(call Image/Build,ext2)
   endef
 endif
 
+ifneq ($(CONFIG_TARGET_ROOTFS_ISO),)
+  define Image/mkfs/iso
+		$(call Image/Build,iso)
+  endef
+endif
+
 
 define Image/mkfs/prepare/default
-	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
-	chmod 0777 $(BUILD_DIR)/root/tmp
+	- $(FIND) $(TARGET_DIR) -type f -not -perm +0100 -not -name 'ssh_host*' -print0 | $(XARGS) -0 chmod 0644
+	- $(FIND) $(TARGET_DIR) -type f -perm +0100 -print0 | $(XARGS) -0 chmod 0755
+	- $(FIND) $(TARGET_DIR) -type d -print0 | $(XARGS) -0 chmod 0755
+	$(INSTALL_DIR) $(TARGET_DIR)/tmp
+	chmod 0777 $(TARGET_DIR)/tmp
 endef
 
 define Image/mkfs/prepare
 	$(call Image/mkfs/prepare/default)
 endef
 
+
+define Image/Checksum
+	( cd ${BIN_DIR} ; \
+		$(FIND) -maxdepth 1 -type f \! -name 'md5sums'  -printf "%P\n" | sort | xargs \
+		md5sum --binary > md5sums \
+	)
+endef
+
+
 define BuildImage
-download:
-prepare:
-ifneq ($(IB),1)
-  compile: compile-targets
-	$(call Build/Compile)
-else
-  compile:
-endif
 
-ifneq ($(IB),1)
-  install: compile install-targets
-	$(call Image/Prepare)
-	$(call Image/mkfs/prepare)
-	$(call Image/BuildKernel)
-	$(call Image/mkfs/jffs2)
-	$(call Image/mkfs/squashfs)
-	$(call Image/mkfs/tgz)
-	$(call Image/mkfs/ext2)
-else
-  install: compile install-targets
-	$(call Image/BuildKernel)
-	$(call Image/mkfs/jffs2)
-	$(call Image/mkfs/squashfs)
-	$(call Image/mkfs/tgz)
-	$(call Image/mkfs/ext2)
-endif
-	
-ifneq ($(IB),1)
-  clean: clean-targets
-	$(call Build/Clean)
-else
-  clean:
-endif
+  download:
+  prepare:
 
-compile-targets:
-install-targets:
-clean-targets:
-endef
+  ifeq ($(IB),)
+    compile: compile-targets FORCE
+		$(call Build/Compile)
+  else
+    compile:
+  endif
+
+  ifeq ($(IB),)
+    install: compile install-targets FORCE
+		$(call Image/Prepare)
+		$(call Image/mkfs/prepare)
+		$(call Image/BuildKernel)
+		$(call Image/mkfs/cpiogz)
+		$(call Image/mkfs/targz)
+		$(call Image/mkfs/ext2)
+		$(call Image/mkfs/iso)
+		$(call Image/mkfs/jffs2)
+		$(call Image/mkfs/squashfs)
+		$(call Image/mkfs/ubifs)
+		$(call Image/Checksum)
+  else
+    install: compile install-targets
+		$(call Image/BuildKernel)
+		$(call Image/mkfs/cpiogz)
+		$(call Image/mkfs/targz)
+		$(call Image/mkfs/ext2)
+		$(call Image/mkfs/iso)
+		$(call Image/mkfs/jffs2)
+		$(call Image/mkfs/squashfs)
+		$(call Image/mkfs/ubifs)
+		$(call Image/Checksum)
+  endif
 
+  ifeq ($(IB),)
+    clean: clean-targets
+		$(call Build/Clean)
+  else
+    clean:
+  endif
+
+  compile-targets:
+  install-targets:
+  clean-targets:
 
+endef