diff options
| author | Joshua Lock <josh@linux.intel.com> | 2008-11-03 10:46:09 +0000 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2008-11-03 10:46:09 +0000 |
| commit | 582b71a90cf3c636987fdd0894f7d3d5aa2b3c83 (patch) | |
| tree | 80dbe0044b1dc384585772e7b6c8dd767f293550 | |
| parent | 76a7b78b40e3b58587652f607509b04e888c72b5 (diff) | |
| download | poky-582b71a90cf3c636987fdd0894f7d3d5aa2b3c83.tar.gz | |
moblin-fixed-revisions: Added and preferred over poky-fixed-revisions
Add moblin-fixed-revisions to meta-moblin for where Moblin requires fixed revisions different from those in the Poky distro.
| -rw-r--r-- | meta-moblin/conf/distro/include/moblin-fixed-revisions.inc | 5 | ||||
| -rw-r--r-- | meta-moblin/conf/distro/moblin.conf | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc new file mode 100644 index 0000000000..d8a7b899d3 --- /dev/null +++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | # | ||
| 2 | # Known good source dates/revisions/tags to use, for where Moblin deviates | ||
| 3 | # from Poky: | ||
| 4 | # | ||
| 5 | |||
diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf index ab86f15083..274fc96008 100644 --- a/meta-moblin/conf/distro/moblin.conf +++ b/meta-moblin/conf/distro/moblin.conf | |||
| @@ -87,6 +87,7 @@ PREFERRED_PROVIDER_gconf ?= "gconf-dbus" | |||
| 87 | PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" | 87 | PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" |
| 88 | PREFERRED_PROVIDER_opkg ?= "opkg" | 88 | PREFERRED_PROVIDER_opkg ?= "opkg" |
| 89 | 89 | ||
| 90 | require conf/distro/include/moblin-fixed-revisions.inc | ||
| 90 | require conf/distro/include/poky-fixed-revisions.inc | 91 | require conf/distro/include/poky-fixed-revisions.inc |
| 91 | require conf/distro/include/preferred-xorg-versions.inc | 92 | require conf/distro/include/preferred-xorg-versions.inc |
| 92 | 93 | ||
