Merge branch 'tizen' into tizen_4.0

Change-Id: Ic18bec6aeb90d8d44f563abe0697994c746595fa

diff --cc mk_delta/common/bin/CreatePatch.py
index 4268197,4268197..3974105
--- 1/mk_delta/common/bin/CreatePatch.py
--- 2/mk_delta/common/bin/CreatePatch.py
+++ b/mk_delta/common/bin/CreatePatch.py
@@@ -1,13 -1,13 +1,6 @@@
  #!/usr/bin/python
  
  import sys
--
--
--if sys.hexversion < 0x02040000:
--  print >> sys.stderr, "Python 2.4 or newer is required."
--  sys.exit(1)
--
--import sys
  import os
  import filecmp
  import shutil
@@@ -24,6 -24,6 +17,11 @@@ import loggin
  import glob
  import apt
  import stat
++
++if sys.hexversion < 0x02040000:
++      print >> sys.stderr, "Python 2.4 or newer is required."
++      sys.exit(1)
++
  '''
  Diff two folders and create delta using SS_BSDIFF
  Will maintain same format of script that will be generated when we use diffutil
@@@ -92,6 -92,6 +90,7 @@@ FULL_IMG = "FULL_IMG
  DELTA_IMG = "DELTA_IMG"
  DELTA_FS = "DELTA_FS"
  EXTRA = "EXTRA"
++PRE_UA = "PRE_UA"
  LOGFILE = "Delta.log"
  VERBATIM_LIST = "Verbatim_List.txt"
  EMPTY = ""
@@@ -183,6 -183,6 +182,8 @@@ def main()
  
                elif UPDATE_TYPE == EXTRA:
                        print('UPDATE_TYPE ---- EXTRA')
++              elif UPDATE_TYPE == PRE_UA:
++                      print('UPDATE_TYPE ---- PRE_UA')
                else:
                        print('UPDATE_TYPE ---- UNKNOWN FORMAT')
  

diff --cc mk_delta/common/bin/mk_delta.sh
Simple merge

diff --cc mk_delta/common/bin/mk_part_delta.sh
index f8de095,3e0854a..cb2fc9b
--- 1/mk_delta/common/bin/mk_part_delta.sh
--- 2/mk_delta/common/bin/mk_part_delta.sh
+++ b/mk_delta/common/bin/mk_part_delta.sh
@@@ -569,8 -552,14 +569,13 @@@ elif [ "${PART_NAME}" = "ROOTFS" ]; the
        fn_extract_from_image ${PART_BIN} /usr/bin/upgrade-trigger.sh
  fi
  
+ if [ "${UPDATE_TYPE}" = "EXCLUDED" ]; then
+       exit 0
+ fi
+ 
+ OLD_TAR_MISSING=
  if [ "z${OLD_TAR_FILE}" = "z" ]; then
 -      OLD_TAR_MISSING="TRUE"
 -      if [ ! "${UPDATE_TYPE}" = "FULL_IMG" ]; then
 +      if [ ! "${UPDATE_TYPE}" = "FULL_IMG" ] && [ ! "${UPDATE_TYPE}" = "PRE_UA" ]; then
                echo "[old] tar file does not exist in ${DATA_DIR}/${OLD_TAR_DIR} which contains ${PART_BIN}"
                #exit 0, cos this is not an error.
                exit 0