meta-tizen: update to revision used in tizen-distro 0.9
authorPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 14:33:14 +0000 (06:33 -0800)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 17:44:47 +0000 (09:44 -0800)
commit68ec9e2b9cfe63ae806a03a32a3d79ac7bf89112
tree6a64163d6c9b202df0238410d62869d76ed8d8e5
parenta69031746bf410e3998fc527f7c02652e985fe43
meta-tizen: update to revision used in tizen-distro 0.9

Importing the entire history of meta-tizen via combo-layer often ran into
problems due to merge commits with manual conflict resolution. Those do not
translate well into a linear history as generated by combo-layer.

The problematic patches were imported semi-automatically with:

patch=<patch file name as printed by combo-layer>
(set -ex; rev=$(grep 'From meta-tizen rev' $patch | sed -e 's/.* rev:\(.*\))/\1/');
  merge=$((cd ../meta-tizen;
           git rev-list --ancestry-path $rev..origin/tizen) | tail -1);
  git am $patch || (
      patch -p1 <$patch ||
      for i in `find meta-tizen -name *.rej`; do
          base=`echo $i | sed -e 's;meta-tizen/\(.*\)\.rej;\1;'`;
          (cd ../meta-tizen; git show $merge:$base) >meta-tizen/$base ||
          rm meta-tizen/$base;
          rm meta-tizen/$base.rej;
      done; ) )
git status

This relies on "patch" creating .rej files for all problematic files,
then gets the content of these files from the following commit in upstream
meta-tizen, which is typically the merge commit with conflicts resolved.

This is not always entirely correct, so some old commits may be slightly
bogus. Still this is better than not having any history at all.

The process also missed the removal of some files. Those were found via
diffing against rev_0.9 and removed manually.
conf/combo-layer.conf
meta-tizen/recipes-tizen/chromium/chromium-extraconf.inc [deleted file]
meta-tizen/recipes-tizen/com-core/com-core-extraconf.inc [deleted file]
meta-tizen/recipes-tizen/download-provider/download-provider-extraconf.inc [deleted file]
meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo-extraconf.inc [deleted file]
meta-tizen/recipes-tizen/libwifi-direct/libwifi-direct-extraconf.inc [deleted file]
meta-tizen/recipes-tizen/notification/notification-extraconf.inc [deleted file]
meta-tizen/recipes-tizen/syspopup/syspopup-extraconf.inc [deleted file]