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.

diff --git a/conf/combo-layer.conf b/conf/combo-layer.conf
index a80bb50..372dcc9 100644 (file)
--- a/conf/combo-layer.conf
+++ b/conf/combo-layer.conf
@@ -31,4 +31,4 @@ src_uri = git://review.tizen.org/scm/bb/meta-tizen
 dest_dir = meta-tizen
 hook = conf/combo-layerhook-meta-tizen.sh
 branch = tizen
-last_revision =
+last_revision = 2da0c02c8ca98f9faa731a27bfcf819b8dcf1375

diff --git a/meta-tizen/recipes-tizen/chromium/chromium-extraconf.inc b/meta-tizen/recipes-tizen/chromium/chromium-extraconf.inc
deleted file mode 100644 (file)
index 9d37240..0000000
--- a/meta-tizen/recipes-tizen/chromium/chromium-extraconf.inc
+++ /dev/null
@@ -1 +0,0 @@
-INSANE_SKIP_${PN} = "dev-so"

diff --git a/meta-tizen/recipes-tizen/com-core/com-core-extraconf.inc b/meta-tizen/recipes-tizen/com-core/com-core-extraconf.inc
deleted file mode 100644 (file)
index 380c88a..0000000
--- a/meta-tizen/recipes-tizen/com-core/com-core-extraconf.inc
+++ /dev/null
@@ -1 +0,0 @@
-INSANE_SKIP_lib${PN} = "dev-so"

diff --git a/meta-tizen/recipes-tizen/download-provider/download-provider-extraconf.inc b/meta-tizen/recipes-tizen/download-provider/download-provider-extraconf.inc
deleted file mode 100644 (file)
index 9d37240..0000000
--- a/meta-tizen/recipes-tizen/download-provider/download-provider-extraconf.inc
+++ /dev/null
@@ -1 +0,0 @@
-INSANE_SKIP_${PN} = "dev-so"

diff --git a/meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo-extraconf.inc b/meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo-extraconf.inc
deleted file mode 100644 (file)
index af8b214..0000000
--- a/meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo-extraconf.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-do_install() {
- echo export RPM_BUILD_ROOT=${D}
- cd ${S}
- LANG=C
- export LANG
- unset DISPLAY
- rm -rf ${D}
- mkdir -p ${D}
-
-
-   oe_runmake \
-         DESTDIR=${D} \
-         INSTALL_ROOT=${D} \
-         BINDIR=${prefix}/bin \
-   install
-   rm -f ${D}${infodir}/dir
-   find ${D} -regex ".*\.la$" | xargs rm -f --
-   find ${D} -regex ".*\.a$" | xargs rm -f --
-
-
-
-
-}
-
-INSANE_SKIP_${PN} = "dev-so"
\ No newline at end of file

diff --git a/meta-tizen/recipes-tizen/libwifi-direct/libwifi-direct-extraconf.inc b/meta-tizen/recipes-tizen/libwifi-direct/libwifi-direct-extraconf.inc
deleted file mode 100644 (file)
index 42700ed..0000000
--- a/meta-tizen/recipes-tizen/libwifi-direct/libwifi-direct-extraconf.inc
+++ /dev/null
@@ -1 +0,0 @@
-INSANE_SKIP_libwifi-direct = "dev-so"

diff --git a/meta-tizen/recipes-tizen/notification/notification-extraconf.inc b/meta-tizen/recipes-tizen/notification/notification-extraconf.inc
deleted file mode 100644 (file)
index 9d37240..0000000
--- a/meta-tizen/recipes-tizen/notification/notification-extraconf.inc
+++ /dev/null
@@ -1 +0,0 @@
-INSANE_SKIP_${PN} = "dev-so"

diff --git a/meta-tizen/recipes-tizen/syspopup/syspopup-extraconf.inc b/meta-tizen/recipes-tizen/syspopup/syspopup-extraconf.inc
deleted file mode 100644 (file)
index 9a26e7f..0000000
--- a/meta-tizen/recipes-tizen/syspopup/syspopup-extraconf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-do_install_append() {
- rm -fr ${D}/usr/share/syspopup
-}