diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-03-25 23:31:04 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-03-25 23:31:04 +0000 |
| commit | c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d (patch) | |
| tree | 9173fb365bf861e2337693179c270f81193f41b5 /openembedded/conf/distro/familiar-unstable.conf | |
| parent | 05ff3147c40087edece71449e375cdf588d7a29b (diff) | |
| download | openembedded-core-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.tar.gz openembedded-core-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.tar.bz2 openembedded-core-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.tar.xz openembedded-core-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.zip | |
Update xlibs to follow restructuring in OE (in preparation for X11R7)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@341 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf/distro/familiar-unstable.conf')
| -rw-r--r-- | openembedded/conf/distro/familiar-unstable.conf | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/openembedded/conf/distro/familiar-unstable.conf b/openembedded/conf/distro/familiar-unstable.conf index 1d40bbac5..ab367378a 100644 --- a/openembedded/conf/distro/familiar-unstable.conf +++ b/openembedded/conf/distro/familiar-unstable.conf @@ -1,7 +1,6 @@ DISTRO = "familiar" DISTRO_NAME = "Familiar Linux" DISTRO_VERSION = "unstable-${DATE}" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" # Do not touch this file before notifying familiar-dev@handhelds.org include conf/distro/familiar.conf @@ -13,8 +12,12 @@ DISTRO_TYPE = "debug" FEED_URIS += " \ - base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ - updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" + base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ + ${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \ + updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates \ + locale-en##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/en \ + locale-fr##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/fr \ + locale-de##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/de" #SRCDATE = 20050331 #SRCDATE = "now" @@ -25,7 +28,6 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDER_virtual/libiconv=glibc PREFERRED_PROVIDER_virtual/libintl=glibc -PREFERRED_PROVIDER_x11=diet-x11 PREFERRED_VERSION_hostap-modules ?= "0.3.9" @@ -46,6 +48,12 @@ PREFERRED_VERSION_gcc-cross ?= "3.4.4" PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" # +# PIN the familiar build to a version +# +PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" +PREFERRED_VERSION_binutils ?= "2.15.94.0.1" + +# # Opie # @@ -61,7 +69,7 @@ PREFERRED_VERSION_qte = "2.3.10" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_x11 = "diet-x11" +PREFERRED_PROVIDER_libx11 = "diet-x11" include conf/distro/preferred-gpe-versions-2.8.inc |