Merge prism.xml into default.xml.
- Remove the prism specific manifest file.
- Merge the repos into default.xml.
With this CL enables us to use the same development environment for
both ONU and TV/Storage boxes development.
Thought the repo sync may take longer, if we develop both prism and
bruno code, we will save one more workspace. Plus, it is easier to
integrate into the current auto-build environment.
Change-Id: I41e24e1d3a90252f3ac2dcedc9b142da4c106aed
diff --git a/default.xml b/default.xml
index 6af8c04..332a882 100644
--- a/default.xml
+++ b/default.xml
@@ -4,15 +4,19 @@
fetch="https://gfiber-internal.googlesource.com/"
name="gfiber-internal"
review="https://gfiber-internal-review.googlesource.com/"/>
- <default remote="gfiber-internal" revision="master" sync-j="12"/>
+ <default remote="gfiber-internal" revision="prism_dev" sync-j="12"/>
+ <manifest-server
+ url="http://gfiber-autobot.mtv.corp.google.com:8000/manifest"/>
- <project name="manifests" path="manifest"/>
<project name="toolchains/bruno"/>
+ <project name="toolchains/prism"/>
<project name="kernel/bruno"/>
+ <project name="kernel/prism"/>
<project name="vendor/opensource/toolbox" path="toolbox-for-linux"/>
<project name="buildroot"/>
<project name="vendor/broadcom/alsa"/>
<project name="vendor/broadcom/AppLibs"/>
+ <project name="vendor/broadcom/cfe-bin"/>
<project name="vendor/broadcom/common"/>
<project name="vendor/broadcom/directfb"/>
<project name="vendor/broadcom/netflix"/>
@@ -22,6 +26,7 @@
<project name="vendor/broadcom/magnum"/>
<project name="vendor/broadcom/nexus"/>
<project name="vendor/broadcom/rockford"/>
+ <project name="vendor/broadcom/vudu"/>
<project name="vendor/humax/bootloader"/>
<project name="vendor/humax/misc"/>
<project name="vendor/google/catawampus"/>
@@ -42,6 +47,7 @@
<project name="vendor/google/tvstreamparser"/>
<project name="vendor/google/mcastcapture"/>
<project name="vendor/google/widevine"/>
+ <project name="vendor/marvell/application"/>
<project name="vendor/netflix/nrd"/>
<project name="vendor/opensource/ffmpeg"/>
<project name="vendor/opensource/hdhomerun_plugin"/>
@@ -53,4 +59,5 @@
<project name="vendor/sagetv/miniclient"/>
<project name="vendor/sagetv/pullreader"/>
<project name="vendor/skelmir/vm"/>
+ <project name="uboot/prism"/>
</manifest>
diff --git a/prism.xml b/prism.xml
deleted file mode 100644
index 30160d2..0000000
--- a/prism.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
- <remote
- fetch="https://gfiber-internal.googlesource.com/"
- name="gfiber-internal"
- review="https://gfiber-internal-review.googlesource.com/"/>
- <default remote="gfiber-internal" revision="prism_dev" sync-j="12"/>
-
- <project name="buildroot"/>
- <project name="kernel/prism"/>
- <project name="manifests" path="manifest"/>
- <project name="toolchains/prism"/>
- <project name="uboot/prism"/>
- <project name="vendor/google/catawampus"/>
- <project name="vendor/google/platform"/>
- <project name="vendor/marvell/application"/>
- <project name="vendor/opensource/tarballs"/>
- <project name="vendor/opensource/toolbox" path="toolbox-for-linux"/>
-</manifest>
