Merge remote-tracking branch 'origin/newkernel_dev' of /ssd/athena/.repo/manifests.bak into newkernel_dev
* 'origin/newkernel_dev' of /ssd/athena/.repo/manifests.bak:
Add newkernel_dev branch.
Conflicts:
default.xml
diff --git a/default.xml b/default.xml
index 9db0ab3..5053c0f 100644
--- a/default.xml
+++ b/default.xml
@@ -1,86 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote
- name="gfiber-internal"
- fetch="https://gfiber-internal.googlesource.com/"
- review="https://gfiber-internal-review.googlesource.com/"/>
+ name="origin"
+ fetch="https://gfiber.googlesource.com/"
+ review="https://gfiber-review.googlesource.com/"/>
<default
- remote="gfiber-internal"
+ remote="origin"
revision="newkernel_dev"
- sync-j="12"/>
- <manifest-server
- url="http://gfiber-autobot.mtv.corp.google.com:8000/manifest"/>
+ sync-j="3"/>
<project name="toolchains/bruno"/>
<project name="toolchains/kvm"/>
<project name="toolchains/mindspeed"/>
<project name="toolchains/prism"/>
<project name="kernel/bruno"/>
- <project name="kernel/mindspeed"/>
<project name="kernel/prism"/>
<project name="buildroot"/>
- <project name="barebox/mindspeed"/>
- <project name="uboot/mindspeed"/>
- <project name="uboot/prism"/>
- <project name="vendor/broadcom/alsa"/>
- <project name="vendor/broadcom/AppLibs"/>
<project name="vendor/broadcom/bmoca"/>
- <project name="vendor/broadcom/cfe-bin" path="loader-bin"/>
- <project name="vendor/broadcom/chromium"/>
- <project name="vendor/broadcom/common"/>
- <project name="vendor/broadcom/directfb"/>
- <project name="vendor/broadcom/netflix"/>
- <project name="vendor/broadcom/webkit"/>
- <project name="vendor/broadcom/BSEAV"/>
- <project name="vendor/broadcom/drivers"/>
- <project name="vendor/broadcom/magnum"/>
- <project name="vendor/broadcom/miracast"/>
- <project name="vendor/broadcom/nexus"/>
- <project name="vendor/broadcom/rockford"/>
- <project name="vendor/broadcom/vudu"/>
<project name="vendor/firmware"/>
- <project name="vendor/humax/bootloader"/>
<project name="vendor/humax/misc"/>
<project name="vendor/google/catawampus"/>
- <project name="vendor/google/channel_srv"/>
- <project name="vendor/google/dvbcapture"/>
- <project name="vendor/google/freetypejni"/>
- <project name="vendor/google/gips"/>
- <project name="vendor/google/hdcp"/>
- <project name="vendor/google/imageloadjni"/>
<project name="vendor/google/jtux"/>
- <project name="vendor/google/mpegparser"/>
- <project name="vendor/google/oregano"/>
<project name="vendor/google/platform"/>
- <project name="vendor/google/prism"/>
- <project name="vendor/google/sagejni"/>
- <project name="vendor/google/sageserver"/>
<project name="vendor/google/swscale"/>
- <project name="vendor/google/tarballs"/>
- <project name="vendor/google/telepresence"/>
<project name="vendor/google/test"/>
- <project name="vendor/google/ts_check"/>
- <project name="vendor/google/tvstreamparser"/>
- <project name="vendor/google/mcastcapture"/>
- <project name="vendor/google/widevine"/>
- <project name="vendor/marvell/application"/>
- <project name="vendor/marvell/manufacturing"/>
- <project name="vendor/mindspeed/drivers"/>
- <project name="vendor/netflix/nrd"/>
- <project name="vendor/ookla"/>
<project name="vendor/opensource/bluez"/>
<project name="vendor/opensource/dial"/>
<project name="vendor/opensource/ffmpeg"/>
<project name="vendor/opensource/hdhomerun_plugin"/>
<project name="vendor/opensource/libjingle"/>
<project name="vendor/opensource/fallocate"/>
- <project name="vendor/opensource/pf_ring"/>
<project name="vendor/opensource/projectM"/>
<project name="vendor/opensource/tarballs"/>
<project name="vendor/opensource/toolbox" path="toolbox-for-linux"/>
<project name="vendor/opensource/webrtc"/>
- <project name="vendor/qualcomm/drivers"/>
- <project name="vendor/qualcomm/switch"/>
- <project name="vendor/sagetv/miniclient"/>
- <project name="vendor/sagetv/pullreader"/>
- <project name="vendor/skelmir/vm"/>
</manifest>
