summaryrefslogtreecommitdiffstats
path: root/meta-moblin/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-moblin/conf')
-rw-r--r--meta-moblin/conf/distro/include/meta-moblin-scm-revisions.inc36
-rw-r--r--meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc87
-rw-r--r--meta-moblin/conf/distro/include/moblin-fixed-revisions.inc38
-rw-r--r--meta-moblin/conf/distro/include/moblin-floating-revisions.inc99
-rw-r--r--meta-moblin/conf/distro/moblin-bleeding.conf2
-rw-r--r--meta-moblin/conf/distro/moblin.conf13
-rw-r--r--meta-moblin/conf/layer.conf11
7 files changed, 0 insertions, 286 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
deleted file mode 100644
index 47a464e519..0000000000
--- a/meta-moblin/conf/distro/include/meta-moblin-scm-revisions.inc
+++ /dev/null
@@ -1,36 +0,0 @@
1SRCREV_pn-anerley ??= "20c6ceffda21595d8894293700006fe3a4cb33ba"
2SRCREV_pn-bickley ??= "3cbd5ef693c117ad5c094ddd1678a1a04d0feae3"
3SRCREV_pn-bisho ??= "53cc5951be36cee818bef3beb5770f10aabdc7f1"
4SRCREV_pn-bognor-regis ??= "c52c7f7013b4b62d7c59d25fc809ce951a5556af"
5SRCREV_pn-carrick ??= "9bd8f987b27d95694b1e63efe198b2dffbd4c5b0"
6SRCREV_pn-clutter-imcontext ??= "2cb6f0ff153db639a489e58e36802e0e928b1968"
7SRCREV_pn-dalston ??= "b4d03283cb8aa2b76014eeb20e78cd13c14012ae"
8SRCREV_pn-gnet = "495"
9SRCREV_pn-hornsey ??= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a"
10SRCREV_pn-json-glib ??= "7411cadc0fdd9ffc2bd7004c9980913ac857a495"
11SRCREV_pn-libccss ??= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd"
12SRCREV_pn-libjana ??= "9ec1da8a534e87a83a6d729b48a41ca7b9cfb7b7"
13SRCREV_pn-librest ??= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47"
14SRCREV_pn-libsocialweb ??= "da8d57ea8dcd348d956715000ded39aa26c7f0f5"
15SRCREV_pn-libsynthesis ??= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
16SRCREV_pn-mobile-broadband-provider-info ?= "35ef359c591cccd99380225fa431855b16a12edc"
17SRCREV_pn-moblin-app-installer ??= "bc65c884d3a1ae37e69431417888126b2a3ea021"
18SRCREV_pn-moblin-gtk-engine ??= "dff58e5f1b6c111a6c06e2385624e40d687ebf4f"
19SRCREV_pn-moblin-icon-theme ??= "36b7ac1e57ea6d95e6432779c4769c14fce24899"
20SRCREV_pn-moblin-menus ??= "1edfdab8234ec0b4bbc83fb706a15e08aa8a957a"
21SRCREV_pn-moblin-proto ??= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
22SRCREV_pn-moblin-user-skel ??= "356851e174085b874adb909e664aca321a047bcb"
23SRCREV_pn-moblin-panel-applications ??= "ba6b5f353203bb02728addb08da3d249f26eedbe"
24SRCREV_pn-moblin-panel-media ??= "4e93c6da0bbae8d1d0a5d3b1410761679aa7b83b"
25SRCREV_pn-moblin-panel-myzone ??= "54d9bee3a40a7700a69582a76aba89e213410046"
26SRCREV_pn-moblin-panel-pasteboard ??= "44411a4516e6ae22767662430fa37ed6a7d27a15"
27SRCREV_pn-moblin-panel-people ??= "0766282d120587919718b3bcb91553af1a1a00da"
28SRCREV_pn-moblin-panel-status ??= "fb10eaf16bbd064c12587ec8c734abe72a9841d3"
29SRCREV_pn-moblin-web-browser ??= "78ddd155cc297811720e4c4835d468ac6c4d9666"
30SRCREV_pn-mojito ??= "cfad50252a4ad60f28b12d21e2fdb35db56984f5"
31SRCREV_pn-mutter-moblin ??= "7a23e0d63cc31c12dab9de517de04b0ecf41b28a"
32SRCREV_pn-mx ??= "94934b5d03a31ce76c4f9eea8dcfb1d94b396906"
33SRCREV_pn-nbtk ??= "635f9b4f1a2897aaa85ec1285e57dc5478517c2f"
34SRCREV_pn-syncevolution ??= "29972357bf6582c318258b7bdf1feb13c0fef824"
35SRCREV_pn-twitter-glib ??= "62b262bf7892b629f7de67498d58f549ffeb704e"
36
diff --git a/meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc
deleted file mode 100644
index 5992ed91ce..0000000000
--- a/meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc
+++ /dev/null
@@ -1,87 +0,0 @@
1#
2# Known good source dates/revisions/tags to use, *only* for where Moblin deviates
3# from Poky (or to lock down SCM based packages):
4#
5PREFERRED_VERSION_eds-dbus ?= "2.20.0"
6PREFERRED_VERSION_dbus ?= "1.2.14"
7PREFERRED_VERSION_dbus-native ?= "1.2.14"
8PREFERRED_VERSION_gtk+ ?= "2.16.4"
9PREFERRED_VERSION_udev ?= "145"
10
11PREFERRED_VERSION_mesa-dri ?= "7.5"
12PREFERRED_VERSION_xf86-video-intel ?= "2.12.0"
13PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.6.0"
14PREFERRED_VERSION_libxcb ?= "1.3"
15PREFERRED_VERSION_xcb-proto ?= "1.5"
16PREFERRED_VERSION_libx11-trim ?= "1.2.1"
17
18PREFERRED_VERSION_libdrm ?= ""
19PREFERRED_VERSION_xf86-input-keyboard ?= ""
20PREFERRED_VERSION_dri2proto ?= ""
21SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
22SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892"
23SRCREV_pn-dri2proto ?= "66c56ab10d917e3f47f93178d7eac6430970d3c4"
24
25SRCREV_pn-anerley ?= "0cb9ac6b82ff6658ae10d603bdfba04ef3df979e"
26SRCREV_pn-bickley ?= "761816f24e2aeb329d4f7270a2af324f85b7be8f"
27SRCREV_pn-bisho ?= "53cc5951be36cee818bef3beb5770f10aabdc7f1"
28SRCREV_pn-bognor-regis ?= "6b6cce0cb90ea47a3cc4ac2804c8b5664530ca80"
29SRCREV_pn-carrick ?= "0451a081309f11dd5e9b6e41778ab878d862cbd0"
30
31
32SRCREV_pn-connman ?= "6af0b24817b8712c755ef24ed0ee4c5e84550657"
33SRCREV_pn-connman-gnome ?= "857b149c7febe9b0ffd9790050a288f018644eda"
34SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
35
36
37# Still tosort:
38
39SRCREV_pn-clutter ?= "e860d939f9d9611dcf5b8c6e70272b6318a4ba94"
401.0.0
41SRCREV_pn-clutter-1.0 ?= "420ed353b53bd624331bd249d7df98d14714b504"
421.0.0
43SRCREV_pn-clutter-box2d ?= "2bcf5b836548dc4909e13b8ae7f60dc64c93d559"
44clutter-box2d-0.9~20090609
45SRCREV_pn-clutter-gst ?= "db9bcf9d6f3a7d0f34747bed0f3ab28d7eb8f6ab"
46gst-0.10~20090729
47SRCREV_pn-clutter-gtk ?= "5dfc07761adf3ab3d1c9ee97b92bc4a65473db36"
480.10.2
49SRCREV_pn-clutter-imcontext ?= "2cb6f0ff153db639a489e58e36802e0e928b1968"
500.1
51SRCREV_pn-clutter-mozembed ?= "5a5329425aec7fe7749e97fd8c430457259f6165"
520.0~20090731
53
54
55SRCREV_pn-dalston ?= "b4d03283cb8aa2b76014eeb20e78cd13c14012ae"
56SRCREV_pn-dates ?= "966969063535da0786b7483c1bcd427df8a0d87d"
57SRCREV_pn-gconnman ?= "3d951640146d08249e0219cbae6a4c2da787a878"
58SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a"
59SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495"
60SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd"
61SRCREV_pn-librest ?= "ff4561e2a8c38f49127f6e3b2ce7c238a29e1571"
62SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
63SRCREV_pn-moblin-gtk-engine ?= "dff58e5f1b6c111a6c06e2385624e40d687ebf4f"
64SRCREV_pn-moblin-icon-theme ?= "36b7ac1e57ea6d95e6432779c4769c14fce24899"
65SRCREV_pn-moblin-menus ?= "1edfdab8234ec0b4bbc83fb706a15e08aa8a957a"
66SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
67SRCREV_pn-moblin-user-skel ?= "356851e174085b874adb909e664aca321a047bcb"
68SRCREV_pn-moblin-panel-applications ?= "ba6b5f353203bb02728addb08da3d249f26eedbe"
69SRCREV_pn-moblin-panel-media ?= "4e93c6da0bbae8d1d0a5d3b1410761679aa7b83b"
70SRCREV_pn-moblin-panel-myzone ?= "54d9bee3a40a7700a69582a76aba89e213410046"
71SRCREV_pn-moblin-panel-pasteboard ?= "44411a4516e6ae22767662430fa37ed6a7d27a15"
72SRCREV_pn-moblin-panel-people ?= "0766282d120587919718b3bcb91553af1a1a00da"
73SRCREV_pn-moblin-panel-status ?= "fb10eaf16bbd064c12587ec8c734abe72a9841d3"
74SRCREV_pn-moblin-web-browser ?= "a3ea71159bef93dc03762195bd5404a51db5e4a6"
75SRCREV_pn-mojito ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5"
76SRCREV_pn-mozilla-headless-services ?= "9091da493c679c546ec7312b653e63f9701d5c8f"
77SRCREV_pn-mutter ?= "c96345dd81176f171c2d15dd9d5c5b20f334f842"
78SRCREV_pn-mutter-moblin ?= "7a23e0d63cc31c12dab9de517de04b0ecf41b28a"
79SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
80SRCREV_pn-nbtk ?= "635f9b4f1a2897aaa85ec1285e57dc5478517c2f"
81SRCREV_pn-mtpfs = "17"
82SRCREV_pn-qemugl ?= "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
83SRCREV_pn-syncevolution ?= "29972357bf6582c318258b7bdf1feb13c0fef824"
84SRCREV_pn-tasks ?= "a3c6109973c2f39190f554b49dacda7ec5231ef4"
85SRCREV_pn-twitter-glib ?= "9dfca7cf38e3dddbda6dc82d0164f65814b8783e"
86
87SRCREVMOZILLAHEADLESS ?= "1a622cb7c384"
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
deleted file mode 100644
index 6cbc8d8aa3..0000000000
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ /dev/null
@@ -1,38 +0,0 @@
1#
2# Known good source dates/revisions/tags to use, *only* for where Moblin deviates
3# from Poky (or to lock down SCM based packages):
4#
5PREFERRED_VERSION_eds-dbus ?= "2.20.0"
6PREFERRED_VERSION_udev ?= "145"
7
8PREFERRED_VERSION_mesa-dri ?= "7.8.2"
9PREFERRED_VERSION_xf86-video-intel ?= "2.12.0"
10PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.7.99.2"
11PREFERRED_VERSION_libxcb ?= "1.3"
12PREFERRED_VERSION_xcb-proto ?= "1.5"
13PREFERRED_VERSION_libx11-trim ?= "1.3"
14
15PREFERRED_VERSION_libdrm ?= "2.4.17"
16PREFERRED_VERSION_xf86-input-keyboard ?= ""
17PREFERRED_VERSION_dri2proto ?= ""
18
19
20PREFERRED_VERSION_anerley ?= "0.1.7"
21PREFERRED_VERSION_bickley ?= "0.4"
22PREFERRED_VERSION_bisho ?= "0.17.1"
23PREFERRED_VERSION_bognor-regis ?= "0.5.0"
24PREFERRED_VERSION_carrick ?= "1.1.13"
25PREFERRED_VERSION_dalston ?= "0.1.12"
26PREFERRED_VERSION_gupnp-av ?= "0.4"
27PREFERRED_VERSION_hornsey ?= "1.0"
28PREFERRED_VERSION_mojito ?= "0.21.7"
29PREFERRED_VERSION_nbtk ?= "1.2.3"
30PREFERRED_VERSION_moblin-panel-applications ?= "0.1.2"
31PREFERRED_VERSION_moblin-panel-media ?= "0.0.7"
32PREFERRED_VERSION_moblin-panel-myzone ?= "0.0.12"
33PREFERRED_VERSION_moblin-panel-pasteboard ?= "0.0.2"
34PREFERRED_VERSION_moblin-panel-people ?= "0.0.9"
35PREFERRED_VERSION_moblin-panel-status ?= "0.0.9"
36PREFERRED_VERSION_mutter ?= "2.28.1"
37PREFERRED_VERSION_mutter-moblin ?= "0.43.8"
38
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
deleted file mode 100644
index 1634c03886..0000000000
--- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
+++ /dev/null
@@ -1,99 +0,0 @@
1SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd"
2SRCREV_pn-clutter-gtk ?= "5dfc07761adf3ab3d1c9ee97b92bc4a65473db36"
3SRCREV_pn-clutter-gst ?= "24c84abf0cdd24b6f4696c5a920673a55218cfd4"
4SRCREV_pn-bisho ?= "7b97cf8a9e2ef228be71e549e622df5d59869b39"
5
6SRCREV_pn-ashford ?= "${AUTOREV}"
7SRCREV_pn-anerley ?= "${AUTOREV}"
8PREFERRED_VERSION_anerley ?= "0.1.7+git%"
9SRCREV_pn-bickley ?= "${AUTOREV}"
10PREFERRED_VERSION_bickley ?= "0.4+git%"
11SRCREV_pn-bisho ?= "${AUTOREV}"
12PREFERRED_VERSION_bisho ?= "0.17.1+git%"
13SRCREV_pn-bognor-regis ?= "${AUTOREV}"
14PREFERRED_VERSION_bognor-regis ?= "0.5.0+git%"
15SRCREV_pn-carrick ?= "${AUTOREV}"
16PREFERRED_VERSION_carrick ?= "1.2.0+git%"
17SRCREV_pn-clutter ?= "${AUTOREV}"
18SRCREV_pn-clutter-1.0 ?= "${AUTOREV}"
19SRCREV_pn-clutter-gtk ?= "${AUTOREV}"
20SRCREV_pn-clutter-gst ?= "${AUTOREV}"
21SRCREV_pn-clutter-imcontext ?= "${AUTOREV}"
22SRCREV_pn-clutter-mozembed ?= "${AUTOREV}"
23SRCREV_pn-connman ?= "${AUTOREV}"
24SRCREV_pn-connman-gnome ?= "${AUTOREV}"
25SRCREV_pn-contacts ?= "${AUTOREV}"
26SRCREV_pn-dalston ?= "${AUTOREV}"
27PREFERRED_VERSION_dalston ?= "0.1.12+git%"
28SRCREV_pn-dates ?= "${AUTOREV}"
29SRCREV_pn-eds-dbus ?= "${AUTOREV}"
30SRCREV_pn-gconnman ?= "${AUTOREV}"
31PREFERRED_VERSION_gupnp-av ?= "0.5.2"
32SRCREV_pn-hornsey ?= "${AUTOREV}"
33PREFERRED_VERSION_hornsey ?= "1.0+git%"
34SRCREV_pn-json-glib ?= "${AUTOREV}"
35SRCREV_pn-libccss ?= "${AUTOREV}"
36SRCREV_pn-libjana ?= "${AUTOREV}"
37SRCREV_pn-librest ?= "${AUTOREV}"
38SRCREV_pn-libsocialweb ?= "${AUTOREV}"
39PREFERRED_VERSION_libsocialweb ?= "0.0+git%"
40SRCREV_pn-libsynthesis ?= "${AUTOREV}"
41SRCREV_pn-linux-moblin ?= "${AUTOREV}"
42SRCREV_pn-mobile-broadband-provider-info ?= "${AUTOREV}"
43SRCREV_pn-moblin-app-installer ?= "${AUTOREV}"
44SRCREV_pn-moblin-gtk-engine ?= "${AUTOREV}"
45SRCREV_pn-moblin-menus ?= "${AUTOREV}"
46SRCREV_pn-moblin-web-browser ?= "${AUTOREV}"
47SRCREV_pn-moblin-icon-theme ?= "${AUTOREV}"
48SRCREV_pn-moblin-user-skel ?= "${AUTOREV}"
49SRCREV_pn-moblin-panel-applications ?= "${AUTOREV}"
50PREFERRED_VERSION_moblin-panel-applications ?= "0.1.2+git%"
51SRCREV_pn-moblin-panel-media ?= "${AUTOREV}"
52PREFERRED_VERSION_moblin-panel-media ?= "0.0.7+git%"
53SRCREV_pn-moblin-panel-myzone ?= "${AUTOREV}"
54PREFERRED_VERSION_moblin-panel-myzone ?= "0.0.12+git%"
55SRCREV_pn-moblin-panel-pasteboard ?= "${AUTOREV}"
56PREFERRED_VERSION_moblin-panel-pasteboard ?= "0.0.2+git%"
57SRCREV_pn-moblin-panel-people ?= "${AUTOREV}"
58PREFERRED_VERSION_moblin-panel-people ?= "0.0.9+git%"
59SRCREV_pn-moblin-panel-status ?= "${AUTOREV}"
60PREFERRED_VERSION_moblin-panel-status ?= "0.0.9+git%"
61SRCREV_pn-mojito ?= "${AUTOREV}"
62PREFERRED_VERSION_mojito ?= "0.21.7+git%"
63SRCREV_pn-mozilla-headless ?= "${AUTOREV}"
64SRCREV_pn-mozilla-headless-services ?= "${AUTOREV}"
65SRCREV_pn-mutter ?= "${AUTOREV}"
66PREFERRED_VERSION_mutter ?= "2.28.1+git%"
67SRCREV_pn-mutter-moblin ?= "${AUTOREV}"
68PREFERRED_VERSION_mutter-moblin ?= "0.43.8+git%"
69SRCREV_pn-nbtk ?= "${AUTOREV}"
70PREFERRED_VERSION_nbtk ?= "1.2.3+git%"
71SRCREV_pn-mx ?= "${AUTOREV}"
72SRCREV_pn-qemugl ?= "${AUTOREV}"
73SRCREV_pn-sample-media ?= "${AUTOREV}"
74SRCREV_pn-syncevolution ?= "${AUTOREV}"
75SRCREV_pn-tasks ?= "${AUTOREV}"
76SRCREV_pn-twitter-glib ?= "${AUTOREV}"
77SRCREV_pn-xf86-video-gma500 ?= "${AUTOREV}"
78
79SRCREV_pn-libdrm ?= "${AUTOREV}"
80PREFERRED_VERSION_libdrm ?= "2.4.15+git%"
81SRCREV_pn-mesa-dri ?= "${AUTOREV}"
82PREFERRED_VERSION_mesa-dri ?= "7.5+git%"
83SRCREV_pn-xf86-video-intel ?= "${AUTOREV}"
84PREFERRED_VERSION_xf86-video-intel ?= "2.10.0+git%"
85SRCREV_pn-xserver-xf86-dri-lite ?= "${AUTOREV}"
86PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.6.0+git%"
87SRCREV_pn-xf86-input-keyboard ?= "${AUTOREV}"
88PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.2+git%"
89SRCREV_pn-dri2proto ?= "${AUTOREV}"
90PREFERRED_VERSION_dri2proto ?= "1.99.3+git%"
91SRCREV_pn-libx11-trim ?= "${AUTOREV}"
92PREFERRED_VERSION_libx11-trim ?= "1.2.1+git%"
93
94PREFERRED_VERSION_libxcb ?= "1.3"
95PREFERRED_VERSION_xcb-proto ?= "1.5"
96
97MOBLINBROWSERBRANCH = "mx"
98# Set to no browser in images for now to allow image builds
99MOBLINBROWSER = ""
diff --git a/meta-moblin/conf/distro/moblin-bleeding.conf b/meta-moblin/conf/distro/moblin-bleeding.conf
deleted file mode 100644
index 822958258e..0000000000
--- a/meta-moblin/conf/distro/moblin-bleeding.conf
+++ /dev/null
@@ -1,2 +0,0 @@
1require conf/distro/include/moblin-floating-revisions.inc
2require conf/distro/moblin.conf
diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf
deleted file mode 100644
index a0d5af7393..0000000000
--- a/meta-moblin/conf/distro/moblin.conf
+++ /dev/null
@@ -1,13 +0,0 @@
1require conf/distro/poky.conf
2
3DISTRO = "moblin"
4DISTRO_NAME = "Moblin (Poky Powered)"
5DISTRO_VERSION = "1.99+snapshot-${DATE}"
6
7require conf/distro/include/moblin-fixed-revisions.inc
8
9POKY_EXTRA_RDEPENDS = "task-moblin-boot"
10
11TOOLCHAIN_TARGET_SDKTASK ?= "task-moblin-standalone-sdk-target"
12#No debug info for now " task-moblin-standalone-sdk-target-dbg"
13
diff --git a/meta-moblin/conf/layer.conf b/meta-moblin/conf/layer.conf
deleted file mode 100644
index b5daea69ed..0000000000
--- a/meta-moblin/conf/layer.conf
+++ /dev/null
@@ -1,11 +0,0 @@
1# We have a conf and classes directory, add to BBPATH
2BBPATH := "${BBPATH}:${LAYERDIR}"
3
4# We have a packages directory, add to BBFILES
5BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
6
7BBFILE_COLLECTIONS += "moblin"
8BBFILE_PATTERN_moblin := "^${LAYERDIR}/"
9BBFILE_PRIORITY_moblin = "5"
10
11require conf/distro/include/meta-moblin-scm-revisions.inc