diff -r 22486c9c7b15 -r 378360dbbdba imgtools/imaker/src/imaker_rofs3.mk
--- a/imgtools/imaker/src/imaker_rofs3.mk	Wed Jun 23 17:27:59 2010 +0800
+++ b/imgtools/imaker/src/imaker_rofs3.mk	Wed Jun 30 11:35:58 2010 +0800
@@ -23,166 +23,55 @@
 # |_|_\\___/|_| |___/ |___/
 #
 
-ROFS3_TITLE      = ROFS3
-ROFS3_DIR        = $(WORKDIR)/rofs3
-ROFS3_NAME       = $(NAME)
-ROFS3_PREFIX     = $(ROFS3_DIR)/$(ROFS3_NAME)
-ROFS3_IDIR       =
-ROFS3_HBY        =
-ROFS3_OBY        =
-ROFS3_OPT        =
-ROFS3_MSTOBY     = $(ROFS3_PREFIX)_rofs3_master.oby
-ROFS3_HEADER     =
-ROFS3_INLINE     =
-ROFS3_FOOTER     =
-ROFS3_TIME       = $(DAY)/$(MONTH)/$(YEAR)
-
-ROFS3_OBYGEN     = #geniby | $(ROFS3_PREFIX)_rofs3_collected.oby | $(E32ROMINC)/customervariant/* | *.iby | \#include "%3" | end
-
-ROFS3_VERIBY     = $(ROFS3_PREFIX)_rofs3_version.iby
-ROFS3_ROMVER     = 0.01(0)
-ROFS3_VERSION    = $(CORE_VERSION)
-ROFS3_CUSTSWFILE = $(ROFS3_PREFIX)_rofs3_customersw.txt
-ROFS3_CUSTSWINFO = $(ROFS3_VERSION)\\\n$(DAY)-$(MONTH)-$(YEAR2)
-ROFS3_FWIDFILE   = $(ROFS3_PREFIX)_rofs3_fwid.txt
-ROFS3_FWID       = customer
-ROFS3_FWIDVER    = $(ROFS3_VERSION) Customer
-ROFS3_FWIDINFO   = id=$(ROFS3_FWID)\nversion=$(ROFS3_FWIDVER)\n
-
-ROFS3_IMG        = $(ROFS3_PREFIX).rofs3.img
-ROFS3_LOG        = $(ROFS3_PREFIX).rofs3.log
-ROFS3_OUTOBY     = $(ROFS3_PREFIX).rofs3.oby
-ROFS3_SYM        = $(ROFS3_PREFIX).rofs3.symbol
-
-ROFS3_PLUGINLOG  = $(ROFS3_PREFIX)_rofs3_bldromplugin.log
-ROFS3_PAGEFILE   = $(ODP_PAGEFILE)
-ROFS3_UDEBFILE   = $(TRACE_UDEBFILE)
-
-ROFS3_ICHKLOG    = $(ROFS3_PREFIX)_rofs3_imgcheck.log
-ROFS3_ICHKOPT    = $(IMGCHK_OPT)
-ROFS3_ICHKIMG    = $(ROFS3_IMG) $(ROFS2_ICHKIMG)
-
-ROFS3_I2FDIR     = $(ROFS3_DIR)/img2file
-
-#==============================================================================
-
-define ROFS3_MSTOBYINFO
-  $(BLDROM_HDRINFO)
-
-  ROM_IMAGE 0        non-xip size=0x00000000
-  ROM_IMAGE 1 dummy1 non-xip size=$(ROFS_MAXSIZE)
-  ROM_IMAGE 2 dummy2 non-xip size=$(ROFS_MAXSIZE)
-  ROM_IMAGE 3  rofs3 non-xip size=$(ROFS_MAXSIZE)
-
-  $(BLDROM_PLUGINFO)
+ROFS3_FEAXML   = $(E32INC)/s60customswfeatures.xml
+ROFS3_FEAIBY   = $(ROFS3_DIR)/s60customswfeatures.iby
 
-  // ROFS3 header
-  //
-  $(ROFS3_HDRINFO)
-
-  ROM_IMAGE[3] {
-    $(call ODP_CODEINFO,3)
-    $(BLR.ROFS3.OBY)
-    $(ROFS3_INLINE)
-    $(ROFS3_FOOTERINFO)
-  }
-endef
-
-define ROFS3_HDRINFO
-  $(DEFINE) _IMAGE_WORKDIR $(ROFS3_DIR)
-  $(call mac2cppdef,$(BLR.ROFS3.OPT))
-  $(BLR.ROFS3.HBY)
-  $(ROFS3_HEADER)
-  $(if $(filter 3,$(USE_VARIANTBLD)),$(VARIANT_HEADER))
-endef
-
-define ROFS3_FOOTERINFO
-  $(if $(ROFS3_TIME),time=$(ROFS3_TIME))
-  $(ROFS3_FOOTER)
-endef
+ROFS3_ID       = $(CUSTVARIANT_ID)
+ROFS3_REVISION = $(CUSTVARIANT_REVISION)
+ROFS3_SWVERTGT = $(IMAGE_VERSDIR)\customersw.txt
+ROFS3_FWID     = customer
 
-define ROFS3_VERIBYINFO
-  // Generated `$(ROFS3_VERIBY)$' for ROFS3 image creation
-  $(if $(ROFS3_ROMVER),
-
-    version=$(ROFS3_ROMVER))
-
-  OVERRIDE_REPLACE/ADD
-  $(if $(ROFS3_CUSTSWINFO),
-    data-override=$(ROFS3_CUSTSWFILE)  RESOURCE_FILES_DIR\versions\customersw.txt)
-  $(call iif,$(USE_FOTA),
-    data-override=$(ROFS3_FWIDFILE)  RESOURCE_FILES_DIR\versions\fwid3.txt)
-  OVERRIDE_END
-endef
+ROFS3_ICHKIMG += $(ROFS2_ICHKIMG)
 
-#==============================================================================
-
-CLEAN_ROFS3FILE =\
-  del | "$(ROFS3_MSTOBY)" "$(ROFS3_VERIBY)" "$(ROFS3_CUSTSWFILE)" "$(ROFS3_FWIDFILE)" |\
-  del | $(call getgenfiles,$(ROFS3_OBYGEN))
-
-BUILD_ROFS3FILE =\
-  echo-q | Generating file(s) for ROFS3 image creation |\
-  write  | $(ROFS3_MSTOBY) | $(call def2str,$(ROFS3_MSTOBYINFO)) |\
-  $(call iif,$(USE_VERGEN),\
-    write  | $(ROFS3_VERIBY)     | $(call def2str,$(ROFS3_VERIBYINFO)) |\
-    writeu | $(ROFS3_CUSTSWFILE) | $(ROFS3_CUSTSWINFO) |\
-    writeu | $(ROFS3_FWIDFILE)   | $(ROFS3_FWIDINFO) |)\
-  $(ROFS3_OBYGEN)
+ROFS3_CONECONF = $(PRODUCT_NAME)_custvariant_$(CUSTVARIANT_ID)$(addprefix _,$(CUSTVARIANT_NAME))_root.confml
+ROFS3_CONEOPT  = --layer-wildcard=*/custvariant* --impl-tag=target:rofs3
 
 
 ###############################################################################
-# ROFS3 pre
-
-CLEAN_ROFS3PRE = $(if $(filter 3,$(USE_VARIANTBLD)),$(CLEAN_CUSTVARIANT) |) $(CLEAN_ROFS3FILE)
-BUILD_ROFS3PRE =\
-  $(if $(filter 3,$(USE_VARIANTBLD)),$(BUILD_CUSTVARIANT) |)\
-  mkcd | $(ROFS3_DIR) |\
-  $(BUILD_ROFS3FILE)
-
-#==============================================================================
-# ROFS3 build
+# Customer variant
 
-BLR.ROFS3.IDIR = $(call dir2inc,$(ROFS3_IDIR) $(call iif,$(USE_FEATVAR),,$(FEATVAR_IDIR)))
-BLR.ROFS3.HBY  = $(call includeiby,$(IMAGE_HBY) $(ROFS3_HBY))
-BLR.ROFS3.OBY  = $(call includeiby,$(ROFS3_OBY) $(if $(filter 3,$(USE_VARIANTBLD)),$(VARIANT_OBY)) $(call iif,$(USE_VERGEN),$(ROFS3_VERIBY)))
-BLR.ROFS3.OPT  = $(ROFS3_OPT) $(if $(filter 3,$(USE_PAGEDCODE)),$(if $(ODP_CODECOMP),-c$(ODP_CODECOMP))) -o$(notdir $(ROFS3_NAME).img) $(BLDROPT)
-BLR.ROFS3.POST = $(call iif,$(KEEPTEMP),,del | $(ROFS3_PREFIX).???)
-
-CLEAN_ROFS3 = $(CLEAN_BLDROM)
-BUILD_ROFS3 = $(BUILD_BLDROM)
+CUSTVARIANT_ROOT     = $(PRODUCT_DIR)/customer
+CUSTVARIANT_ROOT2    = $(if $(PRODUCT_MSTNAME),$(PRODUCT_MSTDIR)/customer)
+#CUSTVARIANT_ROOT3    = $(PLATFORM_DIR)/country
+CUSTVARIANT_PREFIX   = custvariant_
+CUSTVARIANT_ID       = $(if $(filter $(CUSTVARIANT_PREFIX)%,$(TARGETNAME)),$(TARGETID1),00)
+CUSTVARIANT_NAME     = $(if $(filter $(CUSTVARIANT_PREFIX)%,$(TARGETNAME)),$(TARGETID2-),vanilla)
+CUSTVARIANT_REVISION = 01
+CUSTVARIANT_DIR      = $(if $(and $(call true,$(USE_CONE)),$(call true,$(IMAKER_MKRESTARTS))),$(CONE_OUTDIR),$(strip\
+  $(eval __i_custvardir :=)$(foreach croot,$(sort $(filter CUSTVARIANT_ROOT%,$(.VARIABLES))),\
+    $(if $(__i_custvardir),,$(eval __i_custvardir := $(if $(wildcard $($(croot))),\
+      $(wildcard $($(croot))/$(CUSTVARIANT_PREFIX)$(CUSTVARIANT_ID)$(addprefix _,$(CUSTVARIANT_NAME)))))))\
+  )$(or $(__i_custvardir),$(CUSTVARIANT_ROOT)/$(CUSTVARIANT_PREFIX)$(CUSTVARIANT_ID)$(addprefix _,$(CUSTVARIANT_NAME)))$(call iif,$(USE_CONE),/content))
+CUSTVARIANT_COMPLP   =
 
-#==============================================================================
-# ROFS3 post
+CUSTVARIANT_EXPORT = $(if $(filter $(CUSTVARIANT_PREFIX)%,$(TARGETNAME)),$(addprefix $(CUSTVARIANT_PREFIX)%:CUSTVARIANT_,ID NAME))
+TARGET_EXPORT     += $(CUSTVARIANT_EXPORT)
 
-CLEAN_ROFS3POST = $(CLEAN_IMGCHK) | $(CLEAN_MAKSYMROFS)
-BUILD_ROFS3POST =\
-  $(call iif,$(USE_IMGCHK),$(BUILD_IMGCHK) |)\
-  $(call iif,$(USE_SYMGEN),$(BUILD_MAKSYMROFS))
-
-#==============================================================================
-
-SOS.ROFS3.STEPS = $(call iif,$(USE_ROFS3),$(call iif,$(SKIPPRE),,ROFS3PRE) $(call iif,$(SKIPBLD),,ROFS3) $(call iif,$(SKIPPOST),,ROFS3POST))
-ALL.ROFS3.STEPS = $(SOS.ROFS3.STEPS)
+# custvariant_%
+$(CUSTVARIANT_PREFIX)%: rofs3_$$* ;
 
 
 ###############################################################################
-# Targets
+# Helps
 
-.PHONY: rofs3 rofs3-all rofs3-image rofs3-pre rofs3-check rofs3-symbol rofs3-i2file
-
-rofs3 rofs3-%  : IMAGE_TYPE = ROFS3
-rofs3-all      : USE_SYMGEN = 1
+$(call add_help,CUSTVARIANT_DIR,v,(string),Overrides the VARIANT_DIR for customer variant, see the instructions of VARIANT_DIR for details.)
+$(call add_help,CUSTVARIANT_COMPLP,v,(string),Compatible language variant.)
 
-rofs3 rofs3-all: ;@$(call IMAKER,$$(ALL.ROFS3.STEPS))
-rofs3-image    : ;@$(call IMAKER,$$(SOS.ROFS3.STEPS))
+CUSTVARIANT_HELP = $(call add_help,$(foreach croot,$(filter CUSTVARIANT_ROOT%,$(.VARIABLES)),\
+  $(if $(wildcard $($(croot))),$(call getlastdir,$(filter %/,$(wildcard $($(croot))/$(CUSTVARIANT_PREFIX)*/))))),\
+  t,Customer $$(subst $$(CUSTVARIANT_PREFIX),,$$1) variant target.)
 
-rofs3-pre      : ;@$(call IMAKER,ROFS3PRE)
-rofs3-check    : ;@$(call IMAKER,IMGCHK)
-rofs3-symbol   : ;@$(call IMAKER,MAKSYMROFS)
-
-rofs3-i2file   : USE_ROFS = 3
-rofs3-i2file   : ;@$(call IMAKER,VARIANTI2F)
+BUILD_HELPDYNAMIC += $(CUSTVARIANT_HELP)
 
 
 # END OF IMAKER_ROFS3.MK