From f813d82397427befaa5d52c147f83139c6bacfcb Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Fri, 4 May 2012 20:56:24 +0200
Subject: manifest: (All) Use Linaro branch of dnsmasq

Adds aliasing fixes

Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
---
 default.xml                   | 2 +-
 fsl-iMX6.xml                  | 2 +-
 landing-panda.xml             | 2 +-
 landing-snowball.xml          | 2 +-
 staging-iMX53.xml             | 2 +-
 staging-iMX6.xml              | 2 +-
 staging-origen.xml            | 2 +-
 staging-panda.xml             | 2 +-
 staging-vexpress-rtsm-isw.xml | 2 +-
 staging-vexpress-rtsm.xml     | 2 +-
 staging-vexpress.xml          | 2 +-
 tracking-origen.xml           | 2 +-
 tracking-panda.xml            | 2 +-
 tracking-snowball.xml         | 2 +-
 tracking-vexpress.xml         | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/default.xml b/default.xml
index 7536b43..0114293 100644
--- a/default.xml
+++ b/default.xml
@@ -83,6 +83,7 @@
   <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -119,7 +120,6 @@
   <project path="external/collada" name="platform/external/collada" />
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
diff --git a/fsl-iMX6.xml b/fsl-iMX6.xml
index 210eee1..f7ff96f 100644
--- a/fsl-iMX6.xml
+++ b/fsl-iMX6.xml
@@ -90,6 +90,7 @@
   <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -126,7 +127,6 @@
   <project path="external/collada" name="platform/external/collada" />
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
diff --git a/landing-panda.xml b/landing-panda.xml
index cd797bd..b3bf7a3 100644
--- a/landing-panda.xml
+++ b/landing-panda.xml
@@ -90,6 +90,7 @@
   <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -128,7 +129,6 @@
   <project path="external/collada" name="platform/external/collada" />
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 7819dab..50a37d9 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -92,6 +92,7 @@
   <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -128,7 +129,6 @@
   <project path="external/collada" name="platform/external/collada" />
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
diff --git a/staging-iMX53.xml b/staging-iMX53.xml
index 294b877..6ad8aa7 100644
--- a/staging-iMX53.xml
+++ b/staging-iMX53.xml
@@ -88,6 +88,7 @@
   <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -124,7 +125,6 @@
   <project path="external/collada" name="platform/external/collada" />
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
diff --git a/staging-iMX6.xml b/staging-iMX6.xml
index 0f31745..ad78423 100644
--- a/staging-iMX6.xml
+++ b/staging-iMX6.xml
@@ -90,6 +90,7 @@
   <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -126,7 +127,6 @@
   <project path="external/collada" name="platform/external/collada" />
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
diff --git a/staging-origen.xml b/staging-origen.xml
index 7e1048c..36302c5 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -93,6 +93,7 @@
   <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -129,7 +130,6 @@
   <project path="external/collada" name="platform/external/collada" />
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 58c68ff..d262b0e 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -87,6 +87,7 @@
   <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -123,7 +124,6 @@
   <project path="external/collada" name="platform/external/collada" />
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index fd3fb2c..a0ac238 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -94,6 +94,7 @@
   <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -130,7 +131,6 @@
   <project path="external/collada" name="platform/external/collada" />
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index 60c40aa..1a45fa9 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -93,6 +93,7 @@
   <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -129,7 +130,6 @@
   <project path="external/collada" name="platform/external/collada" />
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index adc54aa..a57dfab 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -89,6 +89,7 @@
   <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -125,7 +126,6 @@
   <project path="external/collada" name="platform/external/collada" />
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
diff --git a/tracking-origen.xml b/tracking-origen.xml
index 8614eb5..2749116 100644
--- a/tracking-origen.xml
+++ b/tracking-origen.xml
@@ -93,6 +93,7 @@
   <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -129,7 +130,6 @@
   <project path="external/collada" name="platform/external/collada" />
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 8f9c07e..5057a80 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -87,6 +87,7 @@
   <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -123,7 +124,6 @@
   <project path="external/collada" name="platform/external/collada" />
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
diff --git a/tracking-snowball.xml b/tracking-snowball.xml
index ea74298..4bf0255 100644
--- a/tracking-snowball.xml
+++ b/tracking-snowball.xml
@@ -92,6 +92,7 @@
   <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -128,7 +129,6 @@
   <project path="external/collada" name="platform/external/collada" />
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 1b7b1f6..0a537cf 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -89,6 +89,7 @@
   <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -125,7 +126,6 @@
   <project path="external/collada" name="platform/external/collada" />
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
-- 
cgit v1.2.3