[package] firewall: change the order of IPv4/IPv6 address detection, fixes mixed...

[openwrt.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index 3341f10..6df656b 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -1,5 +1,5 @@
 #
 #

-# 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.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -15,12 +15,44 @@ override MAKEFLAGS=
 override MAKE:=$(SUBMAKE)
 KDIR=$(KERNEL_BUILD_DIR)
 
 override MAKE:=$(SUBMAKE)
 KDIR=$(KERNEL_BUILD_DIR)
 

-ifneq ($(CONFIG_BIG_ENDIAN),y)
-JFFS2OPTS     :=  --pad --little-endian --squash
-SQUASHFS_OPTS :=  -le
+IMG_PREFIX:=openwrt-$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
+
+ifneq ($(CONFIG_BIG_ENDIAN),)
+  JFFS2OPTS     :=  --pad --big-endian --squash -v
+  SQUASHFS_OPTS :=  -be
+else
+  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_4)$(CONFIG_LINUX_2_6_25),)
+  USE_SQUASHFS3 := y
+endif
+
+ifneq ($(USE_SQUASHFS3),)
+  MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs-lzma

 else
 else

-JFFS2OPTS     :=  --pad --big-endian --squash
-SQUASHFS_OPTS :=  -be
+  MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs4
+  SQUASHFS_OPTS  := -comp lzma -processors 1

 endif
 
 JFFS2_BLOCKSIZE ?= 64k 128k
 endif
 
 JFFS2_BLOCKSIZE ?= 64k 128k


@@ -29,65 +61,75 @@ define add_jffs2_mark
        echo -ne '\xde\xad\xc0\xde' >> $(1)
 endef
 
        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
 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)
        $(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))
        $(call add_jffs2_mark,$(1))

+       rm -f $(KDIR)/tmpfile.*

 endef
 
 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
     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)
+               $(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
                $(call add_jffs2_mark,$(KDIR)/root.jffs2-$(1))
                $(call Image/Build,jffs2-$(1))
     endef
     define Image/mkfs/jffs2

-               rm -rf $(TARGET_DIR)/jffs

                $(foreach SZ,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/sub,$(SZ)))
     endef
   endif
 
                $(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
     define Image/mkfs/squashfs

-               @mkdir -p $(TARGET_DIR)/jffs
-               $(STAGING_DIR_HOST)/bin/mksquashfs-lzma $(TARGET_DIR) $(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
 
                $(call Image/Build,squashfs)
     endef
   endif
 

-  ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
-    define Image/mkfs/tgz
-               $(TAR) -zcf $(BIN_DIR)/openwrt-$(BOARD)-rootfs.tgz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
+  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
 
     endef
   endif
 

-  ifeq ($(CONFIG_TARGET_ROOTFS_CPIOGZ),y)
-    define Image/mkfs/cpiogz
-               ( 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)-vmlinux.elf
-       $(call Image/Build/Initramfs)
-  endef

 endif
 
 endif
 

-define Image/Checksum
-       ( cd ${BIN_DIR} ; \
-               $(FIND) -maxdepth 1 -type f \! -name 'md5sums'  -printf "%P\n" | xargs \
-               md5sum > md5sums \
-       )
-endef
+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

 
 

-ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y)
-  E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_FSPART)*1024)))
+ifneq ($(CONFIG_TARGET_ROOTFS_EXT2FS),)
+  E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_PARTSIZE)*1024)))

 
   define Image/mkfs/ext2
                $(STAGING_DIR_HOST)/bin/genext2fs -U -b $(E2SIZE) -N $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext2
 
   define Image/mkfs/ext2
                $(STAGING_DIR_HOST)/bin/genext2fs -U -b $(E2SIZE) -N $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext2


@@ -95,7 +137,7 @@ ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y)
   endef
 endif
 
   endef
 endif
 

-ifeq ($(CONFIG_TARGET_ROOTFS_ISO),y)
+ifneq ($(CONFIG_TARGET_ROOTFS_ISO),)

   define Image/mkfs/iso
                $(call Image/Build,iso)
   endef
   define Image/mkfs/iso
                $(call Image/Build,iso)
   endef


@@ -103,9 +145,9 @@ endif
 
 
 define Image/mkfs/prepare/default
 
 
 define Image/mkfs/prepare/default

-       - find $(TARGET_DIR) -type f -not -perm +0100 -not -name 'ssh_host*' | $(XARGS) chmod 0644
-       - find $(TARGET_DIR) -type f -perm +0100 | $(XARGS) chmod 0755
-       - find $(TARGET_DIR) -type d | $(XARGS) chmod 0755
+       - $(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
        $(INSTALL_DIR) $(TARGET_DIR)/tmp
        chmod 0777 $(TARGET_DIR)/tmp
 endef


@@ -114,50 +156,62 @@ define Image/mkfs/prepare
        $(call Image/mkfs/prepare/default)
 endef
 
        $(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
 define BuildImage

-download:
-prepare:
-ifneq ($(IB),1)
-  compile: compile-targets FORCE
-       $(call Build/Compile)
-else
-  compile:
-endif

 
 

-ifneq ($(IB),1)
-  install: compile install-targets FORCE
-       $(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/cpiogz)
-       $(call Image/mkfs/ext2)
-       $(call Image/mkfs/iso)
-       $(call Image/Checksum)
-else
-  install: compile install-targets
-       $(call Image/BuildKernel)
-       $(call Image/mkfs/jffs2)
-       $(call Image/mkfs/squashfs)
-       $(call Image/mkfs/tgz)
-       $(call Image/mkfs/cpiogz)
-       $(call Image/mkfs/ext2)
-       $(call Image/mkfs/iso)
-       $(call Image/Checksum)
-endif
+  download:
+  prepare:

 
 

-ifneq ($(IB),1)
-  clean: clean-targets
-       $(call Build/Clean)
-else
-  clean:
-endif
+  ifeq ($(IB),)
+    compile: compile-targets FORCE
+               $(call Build/Compile)
+  else
+    compile:
+  endif

 
 

-compile-targets:
-install-targets:
-clean-targets:
-endef
+  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