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

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

6 files changed, 41 insertions, 302 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
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 1737fc1559..d7e5fd5deb 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -1,142 +1,18 @@
 # Known good source dates/revisions/tags to use:
 #
 
-SRCDATE_abiword ?= "20070130"
-SRCDATE_gtk-theme-torturer ?= "20060821"
-SRCDATE_ipkg-link-1 ?= "20050930"
-SRCDATE_ipkg-link ?= "20050930"
-SRCDATE_ipkg-utils-native ?= "20050930"
-SRCDATE_ipkg-utils ?= "20050930"
-SRCDATE_libmatchbox ?= "20070417"
-SRCDATE_maemo-mapper-nohildon ?= "20061114"
-SRCDATE_matchbox-panel-manager ?= "20060612"
-SRCDATE_minimo ?= "20070510"
-SRCDATE_xcalibrateext ?= "20051101"
-SRCDATE_xcalibrate ?= "20060312"
-SRCDATE_yaffs2-utils-native = "20071107"
-SRCDATE_yaffs2-utils = "20071107"
 
-PV_pn-calibrateproto ?= "0.0-poky1-${SRCREV}"
-SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
-SRCREV_pn-clipboard-manager ?= "14994"
-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-clutter-0.6 ?= "62e852a51e29dd42c84d6b34fe23b80b2542be59"
-SRCREV_pn-clutter-0.8 ?= "3ba37ff115ed3fbe6c94195775941091a3ac2b30"
-SRCREV_pn-clutter-cairo-0.6 ?= "4dc4ef712ddc890d828a1cb65a69a835285af548"
-SRCREV_pn-clutter-cairo-0.8 ?= "e27e507dedddec3f279a2902ecee0da1011c78eb"
-SRCREV_pn-clutter-cairo ?= "7b45e0de2d4b9f1cd47486e5de71a1a26e8fdf27"
-SRCREV_pn-clutter-gst-0.6 ?= "1c3dc539057dbcd6dd75f2cb5b4ba39b741892bd"
-SRCREV_pn-clutter-gst-0.8 ?= "7a60a435fb0930d911e26158928ab53bda090f3e"
-SRCREV_pn-clutter-gst-0.10 ?= "8a087fabc888a6a4a939760c392109dbb610adbf"
-SRCREV_pn-clutter-gst-1.0 ?= "d48c6fc67b48304f90e51b520631c1ecc10410af"
-SRCREV_pn-clutter-helix ?= "b4514a7bae2a059f4e63de64245238a246ed10bd"
-SRCREV_pn-clutter-gtk-0.6 ?= "2ba362a1a223c2b28541030a80aa11191615340a"
-SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd"
-SRCREV_pn-clutter-gtk-0.10 ?= "b92329c4c1288019e2dea6567e2b5e98eb0a9992"
-SRCREV_pn-clutter-gtk-1.0 ?= "e8d828ba1d87937baa571e68fdff22f3e2d79ca8"
-SRCREV_pn-clutter-mozembed ?= "738d017beb5579b2ff6e4d992d4889b61c974751"
-SRCREV_pn-connman ?= "36e877dece72577a3ae6197eafd505d0e6e0c1d2"
-SRCREV_pn-connman-gnome ?= "b589f4f89bff20d54682cc6b49efa86feac8adb4"
-SRCREV_pn-dialer ?= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93"
-SRCREV_pn-eee-acpi-scripts ?= "df785afdacedf869b20fb88a793c13b539819270"
-SRCREV_pn-dbus-wait ?= "402"
-SRCREV_pn-eds-dbus ?= "ed729af002b935f7ab8542f4177919859dfc22c2"
-SRCREV_pn-evince ?= "2437"
-SRCREV_pn-exmap-console ?= "405"
-SRCREV_pn-fstests ?= "266"
-SRCREV_pn-gaku ?= "375"
-SRCREV_pn-gconf-dbus ?= "693"
-SRCREV_pn-gconf-dbus-native ?= "693"
-SRCREV_pn-gtkhtml2 ?= "1144"
-SRCREV_pn-gtk-sato-engine ?= "90"
-SRCREV_pn-gtk-theme-torturer ?= "99962ae39bb5aadb31929b25c58e1a053f9c9545"
-SRCREV_pn-gtk-theme-darkilouche ?= "b4ce102a303d1176107a9d9d28c14f7da78feedd"
-SRCREV_pn-gypsy ?= "147"
-SRCREV_pn-libfakekey ?= "2031"
-SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
-SRCREV_pn-libgsmd ?= "4335"
-SRCREV_pn-libowl ?= "408"
-SRCREV_pn-libsyncml ?= "241"
-PV_pn-libxcalibrate ?= "0.0-poky1-${SRCREV}"
-SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
-SRCREV_pn-libxosd ?= "627"
-SRCREV_pn-matchbox-applet-light ?= "1548"
-SRCREV_pn-matchbox-common ?= "1561"
-SRCREV_pn-matchbox-config-gtk ?= "1614"
-SRCREV_pn-matchbox-desktop-sato ?= "76"
-SRCREV_pn-matchbox-desktop ?= "2096"
-SRCREV_pn-matchbox-keyboard ?= "1910"
-SRCREV_pn-matchbox-panel-2 ?= "2088"
-SRCREV_pn-matchbox-panel ?= "1364"
-SRCREV_pn-matchbox-stroke ?= "1524"
-SRCREV_pn-matchbox-terminal ?= "1816"
-SRCREV_pn-matchbox-theme-sato-2 ?= "94"
-SRCREV_pn-matchbox-theme-sato ?= "90"
-SRCREV_pn-matchbox-themes-extra ?= "1524"
-SRCREV_pn-matchbox-wm-2 ?= "2083"
-SRCREV_pn-matchbox-wm ?= "1524"
-SRCREV_pn-oh-puzzles ?= "23"
-SRCREV_pn-opkg-native ?= "518"
-SRCREV_pn-opkg-nativesdk ?= "518"
-SRCREV_pn-opkg ?= "518"
-SRCREV_pn-opkg-utils-native ?= "4534"
-SRCREV_pn-opkg-utils ?= "4534"
-SRCREV_pn-oprofileui ?= "194"
-SRCREV_pn-osc-native ?= "9096"
-SRCREV_pn-pkgconfig ?= "66d49f1375fec838bcd301bb4ca2ef76cee0e47c"
-SRCREV_pn-libowl-av = "398"
-SRCREV_pn-owl-video = "394"
-SRCREV_pn-psplash ?= "422"
-#QEMUSRCREV = "6477"
-QEMUSRCREV = "9eab386edbf8cf002a731f8204a156f243a47a57"
-#QEMUSRCREV = "1bec86a0bcaac7fa07f3081b3e26b9c7e1ec072c"
-SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
-SRCREV_pn-qemu-nativesdk ?= "${QEMUSRCREV}"
-SRCREV_pn-qemu ?= "${QEMUSRCREV}"
-SRCREV_pn-screenshot ?= "288"
-SRCREV_pn-tidy ?= "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
-SRCREV_pn-settings-daemon ?= "2059"
-SRCREV_pn-vincent ?= "246"
-SRCREV_pn-webkit-gtk ?= "31859"
-SRCREV_pn-web-webkit ?= "109"
-SRCREV_pn-web ?= "97"
-SRCREV_pn-xvideo-tests ?= "272"
-SRCREV_pn-zaurusd ?= "358"
-
-# Previously floating revisions
-SRCREV_pn-aaina ?= "4b267533ce16656cba4104fc39dc12709c1bdddf"
-SRCREV_pn-libmatchbox ?= "1531"
-SRCREV_pn-libopensync-plugin-evo2-sync ?= "2394"
-SRCREV_pn-libopensync-plugin-file-sync ?= "2392"
-SRCREV_pn-libopensync ?= "2430"
-SRCREV_pn-libsync ?= "208"
-SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
-SRCREV_pn-msynctool ?= "314"
-SRCREV_pn-networkmanager-applet ?= "263"
-SRCREV_pn-networkmanager ?= "2984"
-SRCREV_pn-table ?= "4b267533ce16656cba4104fc39dc12709c1bdddf"
-SRCREV_pn-ubootchart ?= "10"
-
-SRCREV_pn-dates ?= "f8a6271eb45c4ec912466923c045fc960a4d894a"
-SRCREV_pn-tasks ?= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
-SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
+#meta-openmoko
 SRCREV_pn-dfu-util-native ?= "3139"
 SRCREV_pn-dfu-util ?= "3139"
-SRCREV_pn-libgsmd ?= "4335"
+SRCREV_pn-dialer ?= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93"
+SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
+SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
 SRCREV_pn-libmokogsmd2 ?= "4334"
 SRCREV_pn-libmokojournal2 ?= "3473"
 SRCREV_pn-libmokopanelui2 ?= "3349"
 SRCREV_pn-libmokoui2 ?= "4342"
-SRCREV_pn-linux-openmoko ?= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78"
 SRCREV_pn-moko-gtk-engine ?= "3612"
-SRCREV_pn-neod = "3409"
-SRCREV_pn-ohm = "edfe25d49d67884bf004de7ae0724c162bb5e65e"
 SRCREV_pn-openmoko-alsa-scenarios ?= "4406"
 SRCREV_pn-openmoko-appearance ?= "3262"
 SRCREV_pn-openmoko-appmanager2 ?= "3442"
@@ -161,123 +37,15 @@ SRCREV_pn-openmoko-theme-standard2 ?= "4338"
 SRCREV_pn-openmoko-today2-folders ?= "3704"
 SRCREV_pn-openmoko-today2 ?= "4168"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
-SRCREV_pn-uboot-openmoko_patches ?= "3400"
-SRCREV_pn-uboot-openmoko_upstream ?= "1ce55151c85d068f70317a8d65c61058b891afb4"
 SRCREV_pn-usbpath-native = "3172"
 SRCREV_pn-usbpath = "3172"
-SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
-SRCREV_pn-xserver-xf86-dri-lite ?= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
-SRCREV_pn-xserver-xf86-dri2-lite ?= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
-SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
-SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
-SRCREV_pn-dri2proto ?= "8cab3f0e6f551220bd11074779f4ccec1e948e00"
-SRCREV_pn-inputproto ?= "7203036522ba9d4b224d282d6afc2d0b947711ee"
-SRCREV_pn-inputproto-native ?= "7203036522ba9d4b224d282d6afc2d0b947711ee"
-SRCREV_pn-inputproto-nativesdk ?= "7203036522ba9d4b224d282d6afc2d0b947711ee"
-SRCREV_pn-libxi ?= "d0326fe8cdbb08d4f52d79fd3fd4e1b2a0951d5e"
-SRCREV_pn-libx11 ?= "d23aad31338e7d869d878d5aa1b6b91d20287005"
-SRCREV_pn-libx11-diet ?= "d23aad31338e7d869d878d5aa1b6b91d20287005"
-SRCREV_pn-libx11-native ?= "d23aad31338e7d869d878d5aa1b6b91d20287005"
-SRCREV_pn-libx11-nativesdk ?= "d23aad31338e7d869d878d5aa1b6b91d20287005"
-SRCREV_pn-libx11-trim ?= "d23aad31338e7d869d878d5aa1b6b91d20287005"
-SRCREV_pn-libxext ?= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d"
-SRCREV_pn-libxext-nativesdk ?= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d"
-SRCREV_pn-libxcb ?= "625ed596cae6dd8175aeb6cb6f26784928042f22"
-SRCREV_pn-libxcb-nativesdk ?= "625ed596cae6dd8175aeb6cb6f26784928042f22"
-SRCREV_pn-xcb-proto ?= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
-SRCREV_pn-xcb-proto-native ?= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
-SRCREV_pn-libxext ?= "49563f5d76637e2ca28fe0b91ce3114271c0955d"
-SRCREV_pn-xf86-video-intel ?= "87ea531c5dc5b39809395b277c330854aaaaf019"
-SRCREV_pn-xf86-video-intel-dri2 = "3dd7f0f9423bb891bc99cd3b77dc3d57e057a7ef"
-SRCREV_pn-xf86-video-omapfb = "2ae9a57ebc3236cd0aec6534067b91a5c6916a3a"
-SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892"
-SRCREV_pn-xf86-input-mouse ?= "ea5cfe804e112f320f14ad896c7802d53551d3e6"
-SRCREV_pn-xf86-input-synaptics ?= "934bc0012f948c52aadc8eda912f7728fb7394a2"
-SRCREV_pn-mesa-dri ?= "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
-SRCREV_pn-mesa-xlib ?= "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
-SRCREV_pn-libdrm ?= "b7d54b1dba8eba24da1b9cdd2116a26b98365b81"
-SRCREV_pn-gnet = "495"
-SRCREV_pn-librsvg ?= "1193"
-SRCREV_pn-qemugl = "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
-SRCREV_pn-qemugl-nativesdk = "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
-SRCREV_pn-gobject-introspection = "efa7266bcf78478ce62e8dd778a4f0417bfd4d15"
-#c54f10f4caef35b42229c48951ee647ef05ab557"
-SRCREV_pn-gobject-introspection-native = "efa7266bcf78478ce62e8dd778a4f0417bfd4d15"
-SRCREV_pn-ofono = "14544d5996836f628613c2ce544380ee6fc8f514"
-
-SRCREVMOZILLAHEADLESS ?= "f4348fd85697"
-
-#
-# meta-moblin package SRCREVs and PREFERRED_VERSIONS
-#
-SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
-SRCREV_pn-xf86-video-psb ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab"
 
-PREFERRED_VERSION_anerley ?= "0.1.7"
-PREFERRED_VERSION_bickley ?= "0.4"
-PREFERRED_VERSION_bisho ?= "0.17.1"
-PREFERRED_VERSION_bognor-regis ?= "0.5.0"
-PREFERRED_VERSION_carrick ?= "1.1.13"
-PREFERRED_VERSION_dalston ?= "0.1.12"
-PREFERRED_VERSION_gupnp-av ?= "0.4"
-PREFERRED_VERSION_hornsey ?= "1.0"
-PREFERRED_VERSION_mojito ?= "0.21.7"
-PREFERRED_VERSION_nbtk ?= "1.2.3"
-PREFERRED_VERSION_moblin-panel-applications ?= "0.1.2"
-PREFERRED_VERSION_moblin-panel-media ?= "0.0.7"
-PREFERRED_VERSION_moblin-panel-myzone ?= "0.0.12"
-PREFERRED_VERSION_moblin-panel-pasteboard ?= "0.0.2"
-PREFERRED_VERSION_moblin-panel-people ?= "0.0.9"
-PREFERRED_VERSION_moblin-panel-status ?= "0.0.9"
-PREFERRED_VERSION_mutter ?= "2.28.1"
-PREFERRED_VERSION_mutter-moblin ?= "0.43.8"
-
-
-SRCREV_pn-anerley ?= "20c6ceffda21595d8894293700006fe3a4cb33ba"
-SRCREV_pn-bickley ?= "3cbd5ef693c117ad5c094ddd1678a1a04d0feae3"
-SRCREV_pn-bisho ?= "53cc5951be36cee818bef3beb5770f10aabdc7f1"
-SRCREV_pn-bognor-regis ?= "c52c7f7013b4b62d7c59d25fc809ce951a5556af"
-SRCREV_pn-carrick ?= "9bd8f987b27d95694b1e63efe198b2dffbd4c5b0"
-SRCREV_pn-connman ?= "fd401dcd103a309e22c00d66f5c91375bfc9cce4"
-SRCREV_pn-connman-gnome ?= "4e38b3885654ee9256416e985b7fc615d18462b9"
-SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
-SRCREV_pn-dalston ?= "b4d03283cb8aa2b76014eeb20e78cd13c14012ae"
-SRCREV_pn-dates ?= "966969063535da0786b7483c1bcd427df8a0d87d"
-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 ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5"
-SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
-SRCREV_pn-mobile-broadband-provider-info ?= "35ef359c591cccd99380225fa431855b16a12edc"
-SRCREV_pn-moblin-app-installer ?= "7f7d50079c8bcc63874fd60a61f23d849e025445"
-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"
+#meta-extras
+SRCREV_pn-evince ?= "2437"
+SRCDATE_maemo-mapper-nohildon ?= "20061114"
+SRCREV_pn-libxosd ?= "627"
+SRCREV_pn-matchbox-applet-light ?= "1548"
+SRCREV_pn-matchbox-common ?= "1561"
 
 # Preferred Versions:
 #
@@ -306,3 +74,30 @@ PREFERRED_VERSION_elfutils ?= "0.89"
 PREFERRED_VERSION_hal ?= "0.5.13"
 PREFERRED_VERSION_hal-info ?= "20090414"
 PREFERRED_VERSION_udev ?= "141"
+
+
+#
+# meta-moblin package PREFERRED_VERSIONS
+#
+
+SRCREV_pn-xf86-video-psb ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab"
+
+PREFERRED_VERSION_anerley ?= "0.1.7"
+PREFERRED_VERSION_bickley ?= "0.4"
+PREFERRED_VERSION_bisho ?= "0.17.1"
+PREFERRED_VERSION_bognor-regis ?= "0.5.0"
+PREFERRED_VERSION_carrick ?= "1.1.13"
+PREFERRED_VERSION_dalston ?= "0.1.12"
+PREFERRED_VERSION_gupnp-av ?= "0.4"
+PREFERRED_VERSION_hornsey ?= "1.0"
+PREFERRED_VERSION_mojito ?= "0.21.7"
+PREFERRED_VERSION_nbtk ?= "1.2.3"
+PREFERRED_VERSION_moblin-panel-applications ?= "0.1.2"
+PREFERRED_VERSION_moblin-panel-media ?= "0.0.7"
+PREFERRED_VERSION_moblin-panel-myzone ?= "0.0.12"
+PREFERRED_VERSION_moblin-panel-pasteboard ?= "0.0.2"
+PREFERRED_VERSION_moblin-panel-people ?= "0.0.9"
+PREFERRED_VERSION_moblin-panel-status ?= "0.0.9"
+PREFERRED_VERSION_mutter ?= "2.28.1"
+PREFERRED_VERSION_mutter-moblin ?= "0.43.8"
+
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 567964f1ef..8d4370a0ae 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -4,8 +4,9 @@ BBPATH := "${BBPATH}${LAYERDIR}"
 # We have a packages directory, add to BBFILES
 BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
 
-BBFILE_COLLECTIONS += "normal""
+BBFILE_COLLECTIONS += "normal"
 BBFILE_PATTERN_normal := "^${LAYERDIR}/meta/"
 BBFILE_PRIORITY_normal = "5"
 
+require conf/distro/include/default-scm-revisions.inc
 
diff --git a/meta/packages/mozilla-headless/mozilla-headless_hg.bb b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
index c61f8de8e1..e3280e63ba 100644
--- a/meta/packages/mozilla-headless/mozilla-headless_hg.bb
+++ b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
@@ -1,5 +1,4 @@
 
-FIXEDREV = "${SRCREVMOZILLAHEADLESS}"
 #file://0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch;patch=1 \
 SRC_URI = "hg://hg.mozilla.org/incubator;protocol=http;module=offscreen \
            file://configurefix-1a622cb7c384.patch;patch=1;rev=1a622cb7c384 \