Move default SCM versions into separate meta directory specific files to improve maintainability

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
author: Richard Purdie <rpurdie@linux.intel.com> 2010-03-22 23:35:48 +0000
committer: Richard Purdie <rpurdie@linux.intel.com> 2010-03-22 23:35:48 +0000
commit: d158569aa9564a863bd8851b6488121a4810b81c (patch)
tree: c71cf20ffaaf7405dd19a3ed5486b76bc9f34ec3 /meta-moblin/conf
parent: 90040ce7b5bcba842f3d1eca92a2dc150fd296fd (diff)
download: poky-d158569aa9564a863bd8851b6488121a4810b81c.tar.gz
3 files changed, 2 insertions, 58 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index a0ba8f0ae3..a96bd47ac0 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -40,60 +40,3 @@ PREFERRED_VERSION_moblin-panel-status ?= "0.0.9"
 PREFERRED_VERSION_mutter ?= "2.28.1"
 PREFERRED_VERSION_mutter-moblin ?= "0.43.8"
-SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
-SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892"
-SRCREV_pn-dri2proto ?= "66c56ab10d917e3f47f93178d7eac6430970d3c4"
-SRCREV_pn-anerley ?= "20c6ceffda21595d8894293700006fe3a4cb33ba"
-SRCREV_pn-bickley ?= "3cbd5ef693c117ad5c094ddd1678a1a04d0feae3"
-SRCREV_pn-bisho ?= "53cc5951be36cee818bef3beb5770f10aabdc7f1"
-SRCREV_pn-bognor-regis ?= "c52c7f7013b4b62d7c59d25fc809ce951a5556af"
-SRCREV_pn-carrick ?= "9bd8f987b27d95694b1e63efe198b2dffbd4c5b0"
-SRCREV_pn-clutter ?= "e957e277b8a4893ce8c99e94402036d42a8b3748"
-SRCREV_pn-clutter-1.0 ?= "ce5025d0a2b701541ca9343686f9dac858905da4"
-SRCREV_pn-clutter-box2d ?= "2bcf5b836548dc4909e13b8ae7f60dc64c93d559"
-SRCREV_pn-clutter-gst-0.10 ?= "8a087fabc888a6a4a939760c392109dbb610adbf"
-SRCREV_pn-clutter-gtk-0.10 ?= "b92329c4c1288019e2dea6567e2b5e98eb0a9992"
-SRCREV_pn-clutter-imcontext ?= "2cb6f0ff153db639a489e58e36802e0e928b1968"
-SRCREV_pn-clutter-mozembed ?= "738d017beb5579b2ff6e4d992d4889b61c974751"
-SRCREV_pn-connman ?= "fd401dcd103a309e22c00d66f5c91375bfc9cce4"
-SRCREV_pn-connman-gnome ?= "4e38b3885654ee9256416e985b7fc615d18462b9"
-SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
-SRCREV_pn-dalston ?= "b4d03283cb8aa2b76014eeb20e78cd13c14012ae"
-SRCREV_pn-dates ?= "966969063535da0786b7483c1bcd427df8a0d87d"
-SRCREV_pn-eds-dbus ?= "ed729af002b935f7ab8542f4177919859dfc22c2"
-SRCREV_pn-gconnman ?= "3d951640146d08249e0219cbae6a4c2da787a878"
-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-mozilla-headless ?= "177d8b8bda61"
-SRCREV_pn-mozilla-headless-services ?= "c679b95dd8c2807b70186d233b3833861a499315"
-SRCREV_pn-mutter ?= "c96345dd81176f171c2d15dd9d5c5b20f334f842"
-SRCREV_pn-mutter-moblin ?= "7a23e0d63cc31c12dab9de517de04b0ecf41b28a"
-SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-SRCREV_pn-nbtk ?= "635f9b4f1a2897aaa85ec1285e57dc5478517c2f"
-SRCREV_pn-mx ?= "94934b5d03a31ce76c4f9eea8dcfb1d94b396906"
-SRCREV_pn-mtpfs = "17"
-SRCREV_pn-qemugl ?= "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
-SRCREV_pn-syncevolution ?= "29972357bf6582c318258b7bdf1feb13c0fef824"
-SRCREV_pn-tasks ?= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
-SRCREV_pn-twitter-glib ?= "62b262bf7892b629f7de67498d58f549ffeb704e"
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
index 584270316e..1634c03886 100644
--- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
@@ -66,7 +66,6 @@ SRCREV_pn-mutter ?= "${AUTOREV}"
 PREFERRED_VERSION_mutter ?= "2.28.1+git%"
 SRCREV_pn-mutter-moblin ?= "${AUTOREV}"
 PREFERRED_VERSION_mutter-moblin ?= "0.43.8+git%"
-SRCREV_pn-mux ?= "${AUTOREV}"
 SRCREV_pn-nbtk ?= "${AUTOREV}"
 PREFERRED_VERSION_nbtk ?= "1.2.3+git%"
 SRCREV_pn-mx ?= "${AUTOREV}"
diff --git a/meta-moblin/conf/layer.conf b/meta-moblin/conf/layer.conf
index ce5b0ac5e8..7bea5753e7 100644
--- a/meta-moblin/conf/layer.conf
+++ b/meta-moblin/conf/layer.conf
@@ -7,3 +7,5 @@ BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
 BBFILE_COLLECTIONS += "moblin"
 BBFILE_PATTERN_moblin := "^${OEROOT}/meta-moblin/"
 BBFILE_PRIORITY_moblin = "5"
+require conf/distro/include/default-scm-revisions.inc
author	Richard Purdie <rpurdie@linux.intel.com>	2010-03-22 23:35:48 +0000
committer	Richard Purdie <rpurdie@linux.intel.com>	2010-03-22 23:35:48 +0000
commit	d158569aa9564a863bd8851b6488121a4810b81c (patch)
tree	c71cf20ffaaf7405dd19a3ed5486b76bc9f34ec3 /meta-moblin/conf
parent	90040ce7b5bcba842f3d1eca92a2dc150fd296fd (diff)
download	poky-d158569aa9564a863bd8851b6488121a4810b81c.tar.gz

diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc index a0ba8f0ae3..a96bd47ac0 100644 --- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc +++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -40,60 +40,3 @@ PREFERRED_VERSION_moblin-panel-status ?= "0.0.9"
40	PREFERRED_VERSION_mutter ?= "2.28.1"	40	PREFERRED_VERSION_mutter ?= "2.28.1"
41	PREFERRED_VERSION_mutter-moblin ?= "0.43.8"	41	PREFERRED_VERSION_mutter-moblin ?= "0.43.8"
42		42
43	SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
44	SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892"
45	SRCREV_pn-dri2proto ?= "66c56ab10d917e3f47f93178d7eac6430970d3c4"
46
47	SRCREV_pn-anerley ?= "20c6ceffda21595d8894293700006fe3a4cb33ba"
48	SRCREV_pn-bickley ?= "3cbd5ef693c117ad5c094ddd1678a1a04d0feae3"
49	SRCREV_pn-bisho ?= "53cc5951be36cee818bef3beb5770f10aabdc7f1"
50	SRCREV_pn-bognor-regis ?= "c52c7f7013b4b62d7c59d25fc809ce951a5556af"
51	SRCREV_pn-carrick ?= "9bd8f987b27d95694b1e63efe198b2dffbd4c5b0"
52	SRCREV_pn-clutter ?= "e957e277b8a4893ce8c99e94402036d42a8b3748"
53	SRCREV_pn-clutter-1.0 ?= "ce5025d0a2b701541ca9343686f9dac858905da4"
54	SRCREV_pn-clutter-box2d ?= "2bcf5b836548dc4909e13b8ae7f60dc64c93d559"
55	SRCREV_pn-clutter-gst-0.10 ?= "8a087fabc888a6a4a939760c392109dbb610adbf"
56	SRCREV_pn-clutter-gtk-0.10 ?= "b92329c4c1288019e2dea6567e2b5e98eb0a9992"
57	SRCREV_pn-clutter-imcontext ?= "2cb6f0ff153db639a489e58e36802e0e928b1968"
58	SRCREV_pn-clutter-mozembed ?= "738d017beb5579b2ff6e4d992d4889b61c974751"
59	SRCREV_pn-connman ?= "fd401dcd103a309e22c00d66f5c91375bfc9cce4"
60	SRCREV_pn-connman-gnome ?= "4e38b3885654ee9256416e985b7fc615d18462b9"
61	SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
62	SRCREV_pn-dalston ?= "b4d03283cb8aa2b76014eeb20e78cd13c14012ae"
63	SRCREV_pn-dates ?= "966969063535da0786b7483c1bcd427df8a0d87d"
64	SRCREV_pn-eds-dbus ?= "ed729af002b935f7ab8542f4177919859dfc22c2"
65	SRCREV_pn-gconnman ?= "3d951640146d08249e0219cbae6a4c2da787a878"
66	SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a"
67	SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495"
68	SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd"
69	SRCREV_pn-libjana ?= "9ec1da8a534e87a83a6d729b48a41ca7b9cfb7b7"
70	SRCREV_pn-librest ?= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47"
71	SRCREV_pn-libsocialweb ?= "da8d57ea8dcd348d956715000ded39aa26c7f0f5"
72	SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
73	SRCREV_pn-mobile-broadband-provider-info ?= "35ef359c591cccd99380225fa431855b16a12edc"
74	SRCREV_pn-moblin-app-installer ?= "bc65c884d3a1ae37e69431417888126b2a3ea021"
75	SRCREV_pn-moblin-gtk-engine ?= "dff58e5f1b6c111a6c06e2385624e40d687ebf4f"
76	SRCREV_pn-moblin-icon-theme ?= "36b7ac1e57ea6d95e6432779c4769c14fce24899"
77	SRCREV_pn-moblin-menus ?= "1edfdab8234ec0b4bbc83fb706a15e08aa8a957a"
78	SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
79	SRCREV_pn-moblin-user-skel ?= "356851e174085b874adb909e664aca321a047bcb"
80	SRCREV_pn-moblin-panel-applications ?= "ba6b5f353203bb02728addb08da3d249f26eedbe"
81	SRCREV_pn-moblin-panel-media ?= "4e93c6da0bbae8d1d0a5d3b1410761679aa7b83b"
82	SRCREV_pn-moblin-panel-myzone ?= "54d9bee3a40a7700a69582a76aba89e213410046"
83	SRCREV_pn-moblin-panel-pasteboard ?= "44411a4516e6ae22767662430fa37ed6a7d27a15"
84	SRCREV_pn-moblin-panel-people ?= "0766282d120587919718b3bcb91553af1a1a00da"
85	SRCREV_pn-moblin-panel-status ?= "fb10eaf16bbd064c12587ec8c734abe72a9841d3"
86	SRCREV_pn-moblin-web-browser ?= "78ddd155cc297811720e4c4835d468ac6c4d9666"
87	SRCREV_pn-mojito ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5"
88	SRCREV_pn-mozilla-headless ?= "177d8b8bda61"
89	SRCREV_pn-mozilla-headless-services ?= "c679b95dd8c2807b70186d233b3833861a499315"
90	SRCREV_pn-mutter ?= "c96345dd81176f171c2d15dd9d5c5b20f334f842"
91	SRCREV_pn-mutter-moblin ?= "7a23e0d63cc31c12dab9de517de04b0ecf41b28a"
92	SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
93	SRCREV_pn-nbtk ?= "635f9b4f1a2897aaa85ec1285e57dc5478517c2f"
94	SRCREV_pn-mx ?= "94934b5d03a31ce76c4f9eea8dcfb1d94b396906"
95	SRCREV_pn-mtpfs = "17"
96	SRCREV_pn-qemugl ?= "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
97	SRCREV_pn-syncevolution ?= "29972357bf6582c318258b7bdf1feb13c0fef824"
98	SRCREV_pn-tasks ?= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
99	SRCREV_pn-twitter-glib ?= "62b262bf7892b629f7de67498d58f549ffeb704e"


diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc index 584270316e..1634c03886 100644 --- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc +++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
@@ -66,7 +66,6 @@ SRCREV_pn-mutter ?= "${AUTOREV}"
66	PREFERRED_VERSION_mutter ?= "2.28.1+git%"	66	PREFERRED_VERSION_mutter ?= "2.28.1+git%"
67	SRCREV_pn-mutter-moblin ?= "${AUTOREV}"	67	SRCREV_pn-mutter-moblin ?= "${AUTOREV}"
68	PREFERRED_VERSION_mutter-moblin ?= "0.43.8+git%"	68	PREFERRED_VERSION_mutter-moblin ?= "0.43.8+git%"
69	SRCREV_pn-mux ?= "${AUTOREV}"
70	SRCREV_pn-nbtk ?= "${AUTOREV}"	69	SRCREV_pn-nbtk ?= "${AUTOREV}"
71	PREFERRED_VERSION_nbtk ?= "1.2.3+git%"	70	PREFERRED_VERSION_nbtk ?= "1.2.3+git%"
72	SRCREV_pn-mx ?= "${AUTOREV}"	71	SRCREV_pn-mx ?= "${AUTOREV}"


diff --git a/meta-moblin/conf/layer.conf b/meta-moblin/conf/layer.conf index ce5b0ac5e8..7bea5753e7 100644 --- a/meta-moblin/conf/layer.conf +++ b/meta-moblin/conf/layer.conf
@@ -7,3 +7,5 @@ BBFILES := "${BBFILES} ${LAYERDIR}/packages//.bb"
7	BBFILE_COLLECTIONS += "moblin"	7	BBFILE_COLLECTIONS += "moblin"
8	BBFILE_PATTERN_moblin := "^${OEROOT}/meta-moblin/"	8	BBFILE_PATTERN_moblin := "^${OEROOT}/meta-moblin/"
9	BBFILE_PRIORITY_moblin = "5"	9	BBFILE_PRIORITY_moblin = "5"
		10
		11	require conf/distro/include/default-scm-revisions.inc