layer.conf: Fix filename conflict

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

2 files changed, 37 insertions, 1 deletions

diff --git a/meta-moblin/conf/distro/include/meta-moblin-scm-revisions.inc b/meta-moblin/conf/distro/include/meta-moblin-scm-revisions.inc
new file mode 100644
index 0000000000..47a464e519
--- /dev/null
+++ b/meta-moblin/conf/distro/include/meta-moblin-scm-revisions.inc
@@ -0,0 +1,36 @@
+SRCREV_pn-anerley ??= "20c6ceffda21595d8894293700006fe3a4cb33ba"
+SRCREV_pn-bickley ??= "3cbd5ef693c117ad5c094ddd1678a1a04d0feae3"
+SRCREV_pn-bisho ??= "53cc5951be36cee818bef3beb5770f10aabdc7f1"
+SRCREV_pn-bognor-regis ??= "c52c7f7013b4b62d7c59d25fc809ce951a5556af"
+SRCREV_pn-carrick ??= "9bd8f987b27d95694b1e63efe198b2dffbd4c5b0"
+SRCREV_pn-clutter-imcontext ??= "2cb6f0ff153db639a489e58e36802e0e928b1968"
+SRCREV_pn-dalston ??= "b4d03283cb8aa2b76014eeb20e78cd13c14012ae"
+SRCREV_pn-gnet = "495"
+SRCREV_pn-hornsey ??= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a"
+SRCREV_pn-json-glib ??= "7411cadc0fdd9ffc2bd7004c9980913ac857a495"
+SRCREV_pn-libccss ??= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd"
+SRCREV_pn-libjana ??= "9ec1da8a534e87a83a6d729b48a41ca7b9cfb7b7"
+SRCREV_pn-librest ??= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47"
+SRCREV_pn-libsocialweb ??= "da8d57ea8dcd348d956715000ded39aa26c7f0f5"
+SRCREV_pn-libsynthesis ??= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
+SRCREV_pn-mobile-broadband-provider-info ?= "35ef359c591cccd99380225fa431855b16a12edc"
+SRCREV_pn-moblin-app-installer ??= "bc65c884d3a1ae37e69431417888126b2a3ea021"
+SRCREV_pn-moblin-gtk-engine ??= "dff58e5f1b6c111a6c06e2385624e40d687ebf4f"
+SRCREV_pn-moblin-icon-theme ??= "36b7ac1e57ea6d95e6432779c4769c14fce24899"
+SRCREV_pn-moblin-menus ??= "1edfdab8234ec0b4bbc83fb706a15e08aa8a957a"
+SRCREV_pn-moblin-proto ??= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
+SRCREV_pn-moblin-user-skel ??= "356851e174085b874adb909e664aca321a047bcb"
+SRCREV_pn-moblin-panel-applications ??= "ba6b5f353203bb02728addb08da3d249f26eedbe"
+SRCREV_pn-moblin-panel-media ??= "4e93c6da0bbae8d1d0a5d3b1410761679aa7b83b"
+SRCREV_pn-moblin-panel-myzone ??= "54d9bee3a40a7700a69582a76aba89e213410046"
+SRCREV_pn-moblin-panel-pasteboard ??= "44411a4516e6ae22767662430fa37ed6a7d27a15"
+SRCREV_pn-moblin-panel-people ??= "0766282d120587919718b3bcb91553af1a1a00da"
+SRCREV_pn-moblin-panel-status ??= "fb10eaf16bbd064c12587ec8c734abe72a9841d3"
+SRCREV_pn-moblin-web-browser ??= "78ddd155cc297811720e4c4835d468ac6c4d9666"
+SRCREV_pn-mojito ??= "cfad50252a4ad60f28b12d21e2fdb35db56984f5"
+SRCREV_pn-mutter-moblin ??= "7a23e0d63cc31c12dab9de517de04b0ecf41b28a"
+SRCREV_pn-mx ??= "94934b5d03a31ce76c4f9eea8dcfb1d94b396906"
+SRCREV_pn-nbtk ??= "635f9b4f1a2897aaa85ec1285e57dc5478517c2f"
+SRCREV_pn-syncevolution ??= "29972357bf6582c318258b7bdf1feb13c0fef824"
+SRCREV_pn-twitter-glib ??= "62b262bf7892b629f7de67498d58f549ffeb704e"
+
diff --git a/meta-moblin/conf/layer.conf b/meta-moblin/conf/layer.conf
index 7bea5753e7..39d30e9b51 100644
--- a/meta-moblin/conf/layer.conf
+++ b/meta-moblin/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILE_COLLECTIONS += "moblin"
 BBFILE_PATTERN_moblin := "^${OEROOT}/meta-moblin/"
 BBFILE_PRIORITY_moblin = "5"
 
-require conf/distro/include/default-scm-revisions.inc
+require conf/distro/include/meta-moblin-scm-revisions.inc