manifest_fix.xml: updated based on current state of Tizen IVI

Projects listed here override the revisions used by either Common of IVI.

The list was partly out-dated, causing spec2yocto to use code older than used
in Tizen IVI. Sometimes an entry could be removed entirely (when merged into
Tizen), sometimes the change had to be rebased.

There were also cases (e.g. edbus) were a change had been merged, but then the
change got lost when someone overwrote the spec file. Where applicable, such
changes were submitted anew.

Changes related to bashisms were dropped. Such issues can be addressed more
easily by enforcing the use of bash when running shell scripts, for example
by patching bitbake in tizen-distro. Compatibilty with dash can be tested
and ensured more carefully in the future.

The review was done with the help of the following perl script:

while (<>) {
    if (m;<project.*/(.*)" +revision="(.*)";) {
        print "cd /data/yocto/tizen/proto-meta-Tizen_generic/git_package/$1; (echo $1; git diff --color=always \$(grep '/$1\"' /data/yocto/tizen/proto-meta-Tizen_generic/manifest_file/tizen-ivi_20150126.2_atom.xml | sed -e 's/.*revision=\"\\(.*\\)\".*/\\1/')..$2) | less\n";
    }
}

Change-Id: Ifb88650654c78376e340b04d9f572b9f290a6328

diff --git a/proto-meta-Tizen_generic/manifest_fix.xml b/proto-meta-Tizen_generic/manifest_fix.xml
index a2782e0..3361a8f 100644 (file)
--- a/proto-meta-Tizen_generic/manifest_fix.xml
+++ b/proto-meta-Tizen_generic/manifest_fix.xml
@@ -4,17 +4,9 @@
   <default remote="tizen-gerrit"/>
 
  <!-- YOCTO FIX -->
- <!-- Merged NOT submitted On IVI-->
- <!-- phoned https://review.tizen.org/gerrit/28545 -->
- <project name="profile/ivi/phoned"  revision="7e698bc380b479faec28ffd192058ee162de9cb5" />
- <!-- murphy https://review.tizen.org/gerrit/28042 -->
- <project name="profile/ivi/murphy" revision="b9d006e4db4bc964e5acad83feab71e00d34968d" />
+ <!-- change either not merged or not accepted into Tizen IVI --> 
  <!-- ico-vic-carsimulator https://review.tizen.org/gerrit/28957 -->
  <project name="profile/ivi/ico-vic-carsimulator" revision="bf9beedad80666c9ddff39154e6fc741bbaed5e4" />
- <!-- genivi-audio-manager https://review.tizen.org/gerrit/27879 -->
- <project name="profile/ivi/genivi/genivi-audio-manager"  revision="e73abf1288387f6c0d58cde8ac48a1950062294b" />
- 
- <!-- Merged NOT submitted On Common-->
  <!-- gsignond-plugin-sasl https://review.tizen.org/gerrit/28162 -->
  <project name="platform/upstream/gsignond-plugin-sasl" revision="74233b7793f7f012aaeb3118694f7dfbe35f0d38" />
  <!-- gsignond-plugin-oauth https://review.tizen.org/gerrit/28163 -->
@@ -31,44 +23,30 @@
  <project name="platform/core/system/system-server"  revision="9c78025072cb67f27da99d22bac34afb01ea0a23" />
  <!-- nfc-manager-neard https://review.tizen.org/gerrit/31161 -->
  <project name="platform/core/connectivity/nfc-manager-neard"  revision="45f2831a6d738c5df32b065c6853636fea85f42a" />
- <!-- gpg2 https://review.tizen.org/gerrit/28377 -->
- <project name="platform/upstream/gpg2" revision="fd45bba47cfbab680118e8154c47993549dfbad6" />
- <!-- evolution-data-server https://review.tizen.org/gerrit/28458 -->
- <project name="platform/upstream/evolution-data-server"  revision="653b6ed2103475434475d89019dac05efd62d37a" />
- <!-- edbus https://review.tizen.org/gerrit/28161 -->
- <project name="platform/upstream/edbus" revision="26ff9807ff9364ed035c38fc909d3e7a3c85320b" />
+ <!-- gpg2 https://review.tizen.org/gerrit/34442 https://review.tizen.org/gerrit/34443 -->
+ <project name="platform/upstream/gpg2" revision="ce13d49dd27a045bd66e6b7d98ee08aa12fdb871" />
+ <!-- edbus https://review.tizen.org/gerrit/34444 -->
+ <project name="platform/upstream/edbus" revision="434ea19660951c48ccfa8540f36443c58d6523ea" />
  <!-- app-checker https://review.tizen.org/gerrit/28725 -->
  <project name="platform/core/appfw/app-checker" revision="70200243a1e419ff81a30fa8a436571422a33a3d" />
- <!-- weston-common https://review.tizen.org/gerrit/31770/ -->
- <project name="profile/common/weston-common" revision="bba9e6c2ec15757449e129454efb97b4a16925aa" />
  <!-- common-multimedia-suite https://review.tizen.org/gerrit/29420 -->
+ <!-- more recent than in Tizen IVI, use anyway -->
  <project name="test/common/common-multimedia-suite" revision="0a75992bd0357284a47973ebba5264bc2f18e8b6" />
- <!-- common https://review.tizen.org/gerrit/28680 -->
- <project name="platform/core/api/common" revision="09b56a10f65dd1869c2d1ea987190fa9d9cafd69" />
+ <!-- common https://review.tizen.org/gerrit/28680 merged, but not in IVI - fix converted bb manually -->
  <!-- testkit-lite https://review.tizen.org/gerrit/31164 -->
- <project name="test/tools/testkit-lite"  revision="da799487c06614bf07afd6006f2a57520f3f036c" />
- <!-- gumd https://review.tizen.org/gerrit/31798 -->
+ <project name="test/tools/testkit-lite"  revision="9644c166e065747de5da831d4c22fdd8bb9c8818" />
+ <!-- gumd https://review.tizen.org/gerrit/31798 - accepted for IVI, but not included yet -->
  <project name="platform/upstream/gumd"  revision="f247444ac80494744acf7e5678482398f4f0adee" />
  <!-- python-pygments https://review.tizen.org/gerrit/27847 -->
  <project name="platform/upstream/python-pygments"  revision="1c7de0a40c2763b3bd3f611462f9b6e856a347a5" />
- <!-- pulseaudio https://review.tizen.org/gerrit/31169 -->
- <project name="platform/upstream/pulseaudio"  revision="9f3f3d9dfe4449a019945f65002f714aa49dcc2d" />
- <!-- libmm-log https://review.tizen.org/gerrit/31006/ -->
- <project name="platform/core/multimedia/libmm-log"  revision="9e5e5b23416d9a169c587a25a7653fa884444f74" />
- <!-- libmm-utility https://review.tizen.org/gerrit/28154 -->
- <project name="platform/core/multimedia/libmm-utility"  revision="4295b93e417e4734c90639d20ff6c60b110172d7" />
- <!-- libmm-player https://review.tizen.org/gerrit/28123 -->
- <project name="platform/core/multimedia/libmm-player"  revision="d396a30a561a0db96094560b21e24e99029481c0" />
+ <!-- libmm-log https://review.tizen.org/gerrit/31006/ - bashism and make invocation fix which was merged and later overwritten by Samsung. Samsung also removed the .manifest file. -->
+ <!-- project name="platform/core/multimedia/libmm-log"  revision="9e5e5b23416d9a169c587a25a7653fa884444f74" / -->
  <!-- libhangul https://review.tizen.org/gerrit/27601 -->
  <project name="platform/core/uifw/libhangul"  revision="2fe339978867090f76ae0ebb1b1863e374b63ee2" />
- <!-- libdrm https://review.tizen.org/gerrit/28530 -->
- <project name="platform/upstream/libdrm"  revision="2a8aaf2b9f403cde35b88653394906af578845ab" />
  <!-- ibus https://review.tizen.org/gerrit/27947 -->
  <project name="platform/upstream/ibus"  revision="d474a5c218f8630192ee2bea8d321c245e2c2b89" />
  <!-- ecryptfs https://review.tizen.org/gerrit/#/c/27842/  -->
  <project name="platform/upstream/ecryptfs-utils"  revision="f496d10d2711cbb2b9d3f7600756487df383e737" />
- <!-- ppl https://review.tizen.org/gerrit/27891 -->
- <project name="platform/upstream/ppl"  revision="80f9727a1037f97cef51a371d298a286e20961e3" />
  
  <!-- +2 but not merge -->
 
@@ -80,8 +58,6 @@
 
  <!-- App Framework -->
  <!-- applications -->
- <!-- libslp-memo https://review.tizen.org/gerrit/28067 -->
- <project name="apps/core/preloaded/libslp-memo"  revision="2d7a05e35636d8a379f4f2eaac3b180c51e18592" />
  <!-- status https://review.tizen.org/gerrit/31186 -->
  <project name="platform/core/appfw/status"  revision="bebaf1fd70a6b15dbb428f223e75811a83ece711" />
  
@@ -109,7 +85,7 @@
  <!-- efl https://review.tizen.org/gerrit/27834  -->
  <project name="platform/upstream/efl"  revision="f7a97238b515310da98621328aadb9275bc92012" />
  <!-- efl-theme-tizen https://review.tizen.org/gerrit/31175 -->
- <project name="platform/core/uifw/efl-theme-tizen"  revision="49873649c3970d5c3cbbd45ef1d141eda696f50d" />
+ <project name="platform/core/uifw/efl-theme-tizen"  revision="9db03fec5e9f1e4ad7e3ad8c93f7c6ac45af6e2d" />
  
  <!-- Graphics and UI Framework/Input Framework -->
 
@@ -118,29 +94,26 @@
  
  <!-- Multimedia -->
  <!-- alsa-scenario https://review.tizen.org/gerrit/28116 -->
- <project name="framework/multimedia/alsa-scenario-0.2"  revision="915491684441521d60e55c6a5cbb65d482e5e5ab" />
+ <project name="platform/core/multimedia/alsa-scenario-0.2"  revision="d3f70eaddda8052dd3b67f290c3490da3f12fabb" />
  <!-- avsystem https://review.tizen.org/gerrit/28140 -->
- <project name="platform/core/multimedia/avsystem"  revision="e2bc7b88d123b0ff997061e9a4998106f7f5c3f3" />
+ <project name="platform/core/multimedia/avsystem"  revision="817c8dc27cf69702e01bd1e926ccf7fe0a10af21" />
 
  
  <!-- Multimedia/Media Service -->
 
  
  <!-- Multimedia/Audio FW -->
- <!-- libmedia-service https://review.tizen.org/gerrit/28225 -->
- <project name="platform/core/multimedia/libmedia-service"  revision="b7f1f1ec421c16a4e6fea164495c281887a5d3b8" />
-
 
 
  <!-- Multimedia/Libraries -->
  <!-- libav https://review.tizen.org/gerrit/28295 -->
- <project name="platform/upstream/libav"  revision="1445e9282952f0200ac2ce1a3988334a7d7992122f0f3" />
-
+ <project name="platform/upstream/libav"  revision="11dc5a2a12a83d2edffc724cb8efa3a97eddc50a" />
+ 
  <!-- Network and Connectivity-->
  <!-- download-provider https://review.tizen.org/gerrit/27812  -->
  <project name="platform/framework/web/download-provider"  revision="cfad1aa260356701996248ded3e9c90541ddcb11" />
- <!-- hplip https://review.tizen.org/gerrit/27844  -->
- <project name="platform/upstream/hplip"  revision="c8d20b298c235248c8f32c82ca72a93bc7c6a75c" />
+ <!-- hplip https://review.tizen.org/gerrit/27844 - abandoned, probably shouldn't be converted anymore -->
+ <!-- project name="platform/upstream/hplip"  revision="c8d20b298c235248c8f32c82ca72a93bc7c6a75c" / -->
  
  <!-- Security/Accounts -->
 
@@ -151,20 +124,14 @@
  <!-- Social & Content -->
 
  <!-- Social & Content/pim -->
- <!-- contacts-service https://review.tizen.org/gerrit/27753 -->
- <project name="platform/core/pim/contacts-service"  revision="65311cfbd4a5530192daba9099ff9454318b907e" />
  
  <!-- system/logging -->
- <!-- sys-string https://review.tizen.org/gerrit/27823  -->
- <project name="platform/core/base/sys-string-0"  revision="c055d6d016ce7b4d2189df8355d583fcfa434210" />
  
  <!-- platform_development/python -->
  
  <!-- system -->
- <!-- libwbxml2 https://review.tizen.org/gerrit/28066 -->
- <project name="platform/upstream/libwbxml2"  revision="717cf1e3430cacd4c0ba04394b8f60f1e4ad4900" />
  <!-- libmedia-thumbnail https://review.tizen.org/gerrit/31933 -->
- <project name="platform/core/multimedia/libmedia-thumbnail"  revision="b97d0b8ec596a5e17dbec92fd4e487ec9a91f8ef" />
+ <project name="platform/core/multimedia/libmedia-thumbnail"  revision="6c555f6ca4479d41f8d792f664aa7a0e145666a6" />
  
  
  <!-- Testing -->
@@ -183,11 +150,11 @@
  
  <!-- Base/Utilities -->
  <!-- gconf-dbus https://review.tizen.org/gerrit/28439 -->
- <project name="platform/core/base/gconf-dbus" revision="9c7d4e87f97450c4aff1d96db71d7bff881959b2" />
+ <project name="platform/core/base/gconf-dbus" revision="114caebedcb470c0d8ff6b8dbd09692db3a12639" />
  
  <!-- System/Libraries -->
  <!-- system-info https://review.tizen.org/gerrit/28699 -->
- <project name="platform/core/api/system-info" revision="5697b6bdb6f3cccc3637a0ce50e461dbc7eb9ff3" />
+ <project name="platform/core/api/system-info" revision="7c1c890c5fdc4c80d99b6a74d1011bfb144ee5b3" />
  <!-- privacy-manager-server https://review.tizen.org/gerrit/29928 -->
  <project name="platform/core/security/privacy-manager" revision="866b0492038f7515b22f415f40c6edfa02e8cb84" />
 
@@ -198,7 +165,5 @@
  
 
  
- <!-- libav https://review.tizen.org/gerrit/29650 -->
- <project name="platform/upstream/libav" revision="0fd9bbab02cc36060782e7a1f68417b5810300bf" />
 
  </manifest>