Add tizen_ivi branch mapping back in. Remove extraneous profile/ivi/meta-ivi and...

diff --git a/git-obs-mapping.xml b/git-obs-mapping.xml
index afafdd8..c98cf28 100644 (file)
--- a/git-obs-mapping.xml
+++ b/git-obs-mapping.xml
@@ -12,6 +12,7 @@
         <branch name="tizen_ivi_release" OBS_project="Tizen:IVI:Release" OBS_staging_project="Tizen:IVI:Release:build"/>
         <branch name="tizen_ivi_genivi" OBS_project="Tizen:IVI:Genivi" OBS_staging_project="Tizen:IVI:Genivi:build"/>
         <branch name="tizen_ivi_demo" OBS_project="Tizen:IVI:demo" OBS_staging_project="Tizen:IVI:demo:build"/>
+        <branch name="tizen_ivi" OBS_project="Tizen:IVI" OBS_staging_project="Tizen:IVI:build"/>
         <branch name="tizen" OBS_project="Tizen:Generic" OBS_staging_project="Tizen:Generic:build"/>
         <branch name="tizen_generic" OBS_project="Tizen:Generic" OBS_staging_project="Tizen:Generic:build"/>
         <branch name="tizen_generic_release" OBS_project="Tizen:Generic:Release" OBS_staging_project="Tizen:Generic:Release:build"/>
@@ -90,6 +91,7 @@
     </path>
     <path name="/profile/ivi/">
         <branch name="tizen" OBS_project="Tizen:IVI" OBS_staging_project="Tizen:IVI:build"/>
+        <branch name="tizen_ivi" OBS_project="Tizen:IVI" OBS_staging_project="Tizen:IVI:build"/>
         <branch name="tizen_ivi_genivi" OBS_project="Tizen:IVI:Genivi" OBS_staging_project="Tizen:IVI:Genivi:build"/>   
         <branch name="tizen_ivi_release" OBS_project="Tizen:IVI:Release" OBS_staging_project="Tizen:IVI:Release:build"/>
         <branch name="tizen_ivi_demo" OBS_project="Tizen:IVI:demo" OBS_staging_project="Tizen:IVI:demo:build"/>
@@ -117,6 +119,7 @@
         <branch name="tizen_mobile" OBS_project="Tizen:Mobile" OBS_staging_project="Tizen:Mobile:build"/>
         <branch name="tizen_mobile_release" OBS_project="Tizen:Mobile:Release" OBS_staging_project="Tizen:Mobile:Release:build"/>
         <branch name="tizen" OBS_project="Tizen:IVI" OBS_staging_project="Tizen:IVI:build"/>
+        <branch name="tizen_ivi" OBS_project="Tizen:IVI" OBS_staging_project="Tizen:IVI:build"/>
         <branch name="tizen_ivi_release" OBS_project="Tizen:IVI:Release" OBS_staging_project="Tizen:IVI:Release:build"/>
         <branch name="tizen_ivi_demo" OBS_project="Tizen:IVI:demo" OBS_staging_project="Tizen:IVI:demo:build"/>
         <branch name="tizen_ivi_genivi" OBS_project="Tizen:IVI:Genivi" OBS_staging_project="Tizen:IVI:Genivi:build"/>
@@ -181,18 +184,6 @@
     <branch name="tizen_2.1" OBS_project="Tizen:2.1:Main" OBS_staging_project="Tizen:2.1:Main:build"/>
     <branch name="tizen_2.2" OBS_project="Tizen:2.2:Main" OBS_staging_project="Tizen:2.2:Main:build"/>
   </project>
-  <project name="profile/ivi/meta-ivi">
-    <branch name="tizen" OBS_project="Tizen:IVI" OBS_staging_project="Tizen:IVI:build"/>
-    <branch name="tizen_ivi_release" OBS_project="Tizen:IVI:Release" OBS_staging_project="Tizen:IVI:Release:build"/>
-    <branch name="tizen_ivi_genivi" OBS_project="Tizen:IVI:Genivi" OBS_staging_project="Tizen:IVI:Genivi:build"/>
-    <branch name="tizen_ivi_demo" OBS_project="Tizen:IVI:demo" OBS_staging_project="Tizen:IVI:demo:build"/>
-  </project>
-  <project name="profile/ivi/ivi-repos">
-    <branch name="tizen" OBS_project="Tizen:IVI" OBS_staging_project="Tizen:IVI:build"/>
-    <branch name="tizen_ivi_release" OBS_project="Tizen:IVI:Release" OBS_staging_project="Tizen:IVI:Release:build"/>
-    <branch name="tizen_ivi_genivi" OBS_project="Tizen:IVI:Genivi" OBS_staging_project="Tizen:IVI:Genivi:build"/>
-    <branch name="tizen_ivi_demo" OBS_project="Tizen:IVI:demo" OBS_staging_project="Tizen:IVI:demo:build"/>
-  </project>
   <!-- framework/ projects -->
   <project name="framework/uifw/xorg/util/xorg-x11-util-macros">
     <branch name="tizen_2.0" OBS_project="Tizen:2.0:Panda" OBS_staging_project="Tizen:2.0:IVI:build"/>