diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-08-27 16:13:31 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-08-27 16:13:31 +0000 |
| commit | 72906f5da46e7f53070fba999457b9affb76e696 (patch) | |
| tree | a8f3a6f376c94ce9763e1afd9c222c81d8cbcfe1 /meta/conf/distro/maemo-1.0.conf | |
| parent | 93a8d0662ed361c76defe75a5cd84f203fdb1af1 (diff) | |
| download | openembedded-core-72906f5da46e7f53070fba999457b9affb76e696.tar.gz openembedded-core-72906f5da46e7f53070fba999457b9affb76e696.tar.bz2 openembedded-core-72906f5da46e7f53070fba999457b9affb76e696.tar.xz openembedded-core-72906f5da46e7f53070fba999457b9affb76e696.zip | |
conf/distro: Sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@652 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf/distro/maemo-1.0.conf')
| -rw-r--r-- | meta/conf/distro/maemo-1.0.conf | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/meta/conf/distro/maemo-1.0.conf b/meta/conf/distro/maemo-1.0.conf index d30ecc908..b8592fdf6 100644 --- a/meta/conf/distro/maemo-1.0.conf +++ b/meta/conf/distro/maemo-1.0.conf @@ -1,4 +1,4 @@ -include conf/distro/familiar.conf +require conf/distro/include/familiar.inc DISTRO = "maemo" DISTRO_NAME = "Maemo Linux" @@ -8,9 +8,7 @@ DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" FEED_URIS += " \ - base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ - updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" - + " #SRCDATE = 20050331 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" @@ -29,12 +27,12 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" -include conf/distro/preferred-gpe-versions.inc +require conf/distro/include/preferred-gpe-versions.inc # # Maemo # -include conf/distro/maemo-preferred.inc +require conf/distro/include/maemo-preferred.inc |