summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-08-19 22:12:28 +0000
committerGerrit Code Review <gerrit@betelgeuse.canonical.com>2012-08-19 22:12:28 +0000
commit107cf088f8c515632a53a1071fdb34a00dcf0e0d (patch)
treeab8e2a53867f832c536a868d24bf9ca6772f2c52
parentbeb6c84e372466ae7f2d5044ac23121fc92a3340 (diff)
parente04a1a288f5f96c923ab002d6758bcab1183d13d (diff)
downloadmanifest-107cf088f8c515632a53a1071fdb34a00dcf0e0d.tar.gz
Merge "manifests: (All) Use Linaro branch of openssh" into linaro_android_4.1.1
-rw-r--r--default.xml2
-rw-r--r--landing-snowball.xml2
-rw-r--r--linaro-default.xml2
-rw-r--r--staging-galaxynexus.xml2
-rw-r--r--staging-origen.xml2
-rw-r--r--staging-panda.xml2
-rw-r--r--staging-vexpress-rtsm-isw.xml2
-rw-r--r--staging-vexpress-rtsm.xml2
-rw-r--r--staging-vexpress.xml2
-rw-r--r--tracking-panda.xml2
-rw-r--r--tracking-vexpress.xml2
11 files changed, 11 insertions, 11 deletions
diff --git a/default.xml b/default.xml
index fbf4eab..2d318bf 100644
--- a/default.xml
+++ b/default.xml
@@ -111,6 +111,7 @@
<project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.1" />
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
<project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
<!-- Linaro modifications: need to be restored -->
<project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="refs/tags/android-4.1.1_r4"/>
<project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="refs/tags/android-4.1.1_r4"/>
@@ -250,7 +251,6 @@
<project path="external/oauth" name="platform/external/oauth" />
<project path="external/opencv" name="platform/external/opencv" />
<project path="external/openfst" name="platform/external/openfst" />
- <project path="external/openssh" name="platform/external/openssh" />
<project path="external/ppp" name="platform/external/ppp" />
<project path="external/proguard" name="platform/external/proguard" />
<project path="external/protobuf" name="platform/external/protobuf" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index ac5c0f9..6230a59 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -126,6 +126,7 @@
<project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
<project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
<project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
<project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
<project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
<project path="external/tremolo" name="platform/external/tremolo" />
@@ -253,7 +254,6 @@
<project path="external/oauth" name="platform/external/oauth" />
<project path="external/opencv" name="platform/external/opencv" />
<project path="external/openfst" name="platform/external/openfst" />
- <project path="external/openssh" name="platform/external/openssh" />
<project path="external/ppp" name="platform/external/ppp" />
<project path="external/proguard" name="platform/external/proguard" />
<project path="external/protobuf" name="platform/external/protobuf" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 20a85d5..37a0190 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -123,6 +123,7 @@
<project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
<project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
<project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
<project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
<project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
<project path="external/tremolo" name="platform/external/tremolo" />
@@ -252,7 +253,6 @@
<project path="external/oauth" name="platform/external/oauth" />
<project path="external/opencv" name="platform/external/opencv" />
<project path="external/openfst" name="platform/external/openfst" />
- <project path="external/openssh" name="platform/external/openssh" />
<project path="external/ppp" name="platform/external/ppp" />
<project path="external/proguard" name="platform/external/proguard" />
<project path="external/protobuf" name="platform/external/protobuf" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index f23ab68..feede26 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -96,6 +96,7 @@
<project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1"/>
<project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
<project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
<!-- Linaro modifications: need to be restored -->
<project path="external/llvm" name="platform/external/llvm" revision="refs/tags/android-4.1.1_r4"/>
<!-- Linaro modifications: Use -fno-strict-aliasing -->
@@ -243,7 +244,6 @@
<project path="external/oauth" name="platform/external/oauth" />
<project path="external/opencv" name="platform/external/opencv" />
<project path="external/openfst" name="platform/external/openfst" />
- <project path="external/openssh" name="platform/external/openssh" />
<project path="external/ppp" name="platform/external/ppp" />
<project path="external/proguard" name="platform/external/proguard" />
<project path="external/protobuf" name="platform/external/protobuf" />
diff --git a/staging-origen.xml b/staging-origen.xml
index 631ee9d..a0caef0 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -123,6 +123,7 @@
<project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
<project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" />
<project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
@@ -252,7 +253,6 @@
<project path="external/oauth" name="platform/external/oauth" />
<project path="external/opencv" name="platform/external/opencv" />
<project path="external/openfst" name="platform/external/openfst" />
- <project path="external/openssh" name="platform/external/openssh" />
<project path="external/ppp" name="platform/external/ppp" />
<project path="external/proguard" name="platform/external/proguard" />
<project path="external/protobuf" name="platform/external/protobuf" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 88a1743..6456c09 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -118,6 +118,7 @@
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
<project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
<project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
<project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
<project path="external/llvm" name="platform/external/llvm" />
@@ -250,7 +251,6 @@
<project path="external/oauth" name="platform/external/oauth" />
<project path="external/opencv" name="platform/external/opencv" />
<project path="external/openfst" name="platform/external/openfst" />
- <project path="external/openssh" name="platform/external/openssh" />
<project path="external/ppp" name="platform/external/ppp" />
<project path="external/proguard" name="platform/external/proguard" />
<project path="external/protobuf" name="platform/external/protobuf" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 24b5dd6..2a2bffc 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -131,6 +131,7 @@
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
<project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
<project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
<project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
<project path="external/llvm" name="platform/external/llvm" />
@@ -262,7 +263,6 @@
<project path="external/oauth" name="platform/external/oauth" />
<project path="external/opencv" name="platform/external/opencv" />
<project path="external/openfst" name="platform/external/openfst" />
- <project path="external/openssh" name="platform/external/openssh" />
<project path="external/ppp" name="platform/external/ppp" />
<project path="external/proguard" name="platform/external/proguard" />
<project path="external/protobuf" name="platform/external/protobuf" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index 45a04d5..9768d05 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -131,6 +131,7 @@
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
<project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
<project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
<project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
<project path="external/llvm" name="platform/external/llvm" />
@@ -261,7 +262,6 @@
<project path="external/oauth" name="platform/external/oauth" />
<project path="external/opencv" name="platform/external/opencv" />
<project path="external/openfst" name="platform/external/openfst" />
- <project path="external/openssh" name="platform/external/openssh" />
<project path="external/ppp" name="platform/external/ppp" />
<project path="external/proguard" name="platform/external/proguard" />
<project path="external/protobuf" name="platform/external/protobuf" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 6030722..977da97 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -122,6 +122,7 @@
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
<project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
<project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
<project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
<project path="external/llvm" name="platform/external/llvm" />
@@ -253,7 +254,6 @@
<project path="external/oauth" name="platform/external/oauth" />
<project path="external/opencv" name="platform/external/opencv" />
<project path="external/openfst" name="platform/external/openfst" />
- <project path="external/openssh" name="platform/external/openssh" />
<project path="external/ppp" name="platform/external/ppp" />
<project path="external/proguard" name="platform/external/proguard" />
<project path="external/protobuf" name="platform/external/protobuf" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index fcbb982..7235744 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -118,6 +118,7 @@
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
<project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
<project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
<project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
<project path="external/llvm" name="platform/external/llvm" />
@@ -249,7 +250,6 @@
<project path="external/oauth" name="platform/external/oauth" />
<project path="external/opencv" name="platform/external/opencv" />
<project path="external/openfst" name="platform/external/openfst" />
- <project path="external/openssh" name="platform/external/openssh" />
<project path="external/ppp" name="platform/external/ppp" />
<project path="external/proguard" name="platform/external/proguard" />
<project path="external/protobuf" name="platform/external/protobuf" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 54f8726..4ab14c9 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -121,6 +121,7 @@
<project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
<project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" />
<project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
<project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
<project path="external/llvm" name="platform/external/llvm" />
@@ -252,7 +253,6 @@
<project path="external/oauth" name="platform/external/oauth" />
<project path="external/opencv" name="platform/external/opencv" />
<project path="external/openfst" name="platform/external/openfst" />
- <project path="external/openssh" name="platform/external/openssh" />
<project path="external/ppp" name="platform/external/ppp" />
<project path="external/proguard" name="platform/external/proguard" />
<project path="external/protobuf" name="platform/external/protobuf" />