layer.conf: Fix filename conflict

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

2 files changed, 136 insertions, 1 deletions

diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
new file mode 100644
index 0000000000..f4912ffd7f
--- /dev/null
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -0,0 +1,135 @@
+SRCREV_pn-aaina ?= "4b267533ce16656cba4104fc39dc12709c1bdddf"
+SRCDATE_abiword ?= "20070130"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+SRCREV_pn-clipboard-manager ?= "14994"
+SRCREV_pn-clutter ?= "e957e277b8a4893ce8c99e94402036d42a8b3748"
+SRCREV_pn-clutter-0.6 ?= "62e852a51e29dd42c84d6b34fe23b80b2542be59"
+SRCREV_pn-clutter-0.8 ?= "3ba37ff115ed3fbe6c94195775941091a3ac2b30"
+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-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-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
+SRCREV_pn-dates ?= "f8a6271eb45c4ec912466923c045fc960a4d894a"
+SRCREV_pn-dbus-wait ?= "402"
+SRCREV_pn-dri2proto ?= "66c56ab10d917e3f47f93178d7eac6430970d3c4"
+SRCREV_pn-eds-dbus ?= "ed729af002b935f7ab8542f4177919859dfc22c2"
+SRCREV_pn-eee-acpi-scripts ?= "df785afdacedf869b20fb88a793c13b539819270"
+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-gobject-introspection = "efa7266bcf78478ce62e8dd778a4f0417bfd4d15"
+SRCREV_pn-gobject-introspection-native = "efa7266bcf78478ce62e8dd778a4f0417bfd4d15"
+SRCREV_pn-gypsy ?= "147"
+SRCREV_pn-inputproto ?= "7203036522ba9d4b224d282d6afc2d0b947711ee"
+SRCREV_pn-inputproto-native ?= "7203036522ba9d4b224d282d6afc2d0b947711ee"
+SRCREV_pn-inputproto-nativesdk ?= "7203036522ba9d4b224d282d6afc2d0b947711ee"
+SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
+SRCREV_pn-libfakekey ?= "2031"
+SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
+SRCREV_pn-libgsmd ?= "4335"
+SRCREV_pn-libmatchbox ?= "1531"
+SRCREV_pn-libowl ?= "408"
+SRCREV_pn-libowl-av = "398"
+SRCREV_pn-librsvg ?= "1193"
+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-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+SRCREV_pn-libxcb ?= "625ed596cae6dd8175aeb6cb6f26784928042f22"
+SRCREV_pn-libxcb-nativesdk ?= "625ed596cae6dd8175aeb6cb6f26784928042f22"
+SRCREV_pn-libxext ?= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d"
+SRCREV_pn-libxext-nativesdk ?= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d"
+SRCREV_pn-libxi ?= "d0326fe8cdbb08d4f52d79fd3fd4e1b2a0951d5e"
+SRCREV_pn-linux-openmoko ?= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78"
+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-mesa-dri ?= "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
+SRCREV_pn-mesa-xlib ?= "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
+SRCDATE_minimo ?= "20070510"
+SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
+SRCREV_pn-mozilla-headless ?= "177d8b8bda61"
+SRCREV_pn-mozilla-headless-services ?= "c679b95dd8c2807b70186d233b3833861a499315"
+SRCREV_pn-mutter ?= "c96345dd81176f171c2d15dd9d5c5b20f334f842"
+SRCREV_pn-networkmanager-applet ?= "263"
+SRCREV_pn-networkmanager ?= "2984"
+SRCREV_pn-ofono = "14544d5996836f628613c2ce544380ee6fc8f514"
+SRCREV_pn-oh-puzzles ?= "23"
+SRCREV_pn-ohm = "edfe25d49d67884bf004de7ae0724c162bb5e65e"
+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-owl-video = "394"
+SRCREV_pn-pkgconfig ?= "66d49f1375fec838bcd301bb4ca2ef76cee0e47c"
+SRCREV_pn-psplash ?= "422"
+QEMUSRCREV = "9eab386edbf8cf002a731f8204a156f243a47a57"
+SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
+SRCREV_pn-qemu-nativesdk ?= "${QEMUSRCREV}"
+SRCREV_pn-qemu ?= "${QEMUSRCREV}"
+SRCREV_pn-qemugl = "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
+SRCREV_pn-qemugl-nativesdk = "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
+SRCREV_pn-screenshot ?= "288"
+SRCREV_pn-table ?= "4b267533ce16656cba4104fc39dc12709c1bdddf"
+SRCREV_pn-tasks ?= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
+SRCREV_pn-tidy ?= "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
+SRCREV_pn-settings-daemon ?= "2059"
+SRCREV_pn-ubootchart ?= "10"
+SRCREV_pn-webkit-gtk ?= "31859"
+SRCREV_pn-web-webkit ?= "109"
+SRCREV_pn-web ?= "97"
+SRCREV_pn-xcb-proto ?= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
+SRCREV_pn-xcb-proto-native ?= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
+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-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
+SRCREV_pn-xserver-xf86-dri-lite ?= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
+SRCREV_pn-xserver-xf86-dri2-lite ?= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
+SRCREV_pn-xvideo-tests ?= "272"
+SRCDATE_yaffs2-utils-native = "20071107"
+SRCDATE_yaffs2-utils = "20071107"
+SRCREV_pn-zaurusd ?= "358"
+
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 8d4370a0ae..8ba991774c 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -8,5 +8,5 @@ BBFILE_COLLECTIONS += "normal"
 BBFILE_PATTERN_normal := "^${LAYERDIR}/meta/"
 BBFILE_PRIORITY_normal = "5"
 
-require conf/distro/include/default-scm-revisions.inc
+require conf/distro/include/poky-default-revisions.inc