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 | |
parent | 05ff3147c40087edece71449e375cdf588d7a29b (diff) | |
download | poky-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.tar.gz |
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')
-rw-r--r-- | openembedded/conf/distro/familiar-unstable.conf | 18 | ||||
-rw-r--r-- | openembedded/conf/distro/familiar.conf | 9 | ||||
-rw-r--r-- | openembedded/conf/distro/maemo-1.0.conf | 2 | ||||
-rw-r--r-- | openembedded/conf/distro/openzaurus-unstable.conf | 2 | ||||
-rw-r--r-- | openembedded/conf/distro/poky.conf | 12 |
5 files changed, 27 insertions, 16 deletions
diff --git a/openembedded/conf/distro/familiar-unstable.conf b/openembedded/conf/distro/familiar-unstable.conf index 1d40bbac56..ab367378af 100644 --- a/openembedded/conf/distro/familiar-unstable.conf +++ b/openembedded/conf/distro/familiar-unstable.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | DISTRO = "familiar" | 1 | DISTRO = "familiar" |
2 | DISTRO_NAME = "Familiar Linux" | 2 | DISTRO_NAME = "Familiar Linux" |
3 | DISTRO_VERSION = "unstable-${DATE}" | 3 | DISTRO_VERSION = "unstable-${DATE}" |
4 | MAINTAINER = "Koen Kooi <koen@handhelds.org>" | ||
5 | # Do not touch this file before notifying familiar-dev@handhelds.org | 4 | # Do not touch this file before notifying familiar-dev@handhelds.org |
6 | 5 | ||
7 | include conf/distro/familiar.conf | 6 | include conf/distro/familiar.conf |
@@ -13,8 +12,12 @@ DISTRO_TYPE = "debug" | |||
13 | 12 | ||
14 | 13 | ||
15 | FEED_URIS += " \ | 14 | FEED_URIS += " \ |
16 | base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ | 15 | base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ |
17 | updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" | 16 | ${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \ |
17 | updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates \ | ||
18 | locale-en##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/en \ | ||
19 | locale-fr##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/fr \ | ||
20 | locale-de##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/de" | ||
18 | 21 | ||
19 | #SRCDATE = 20050331 | 22 | #SRCDATE = 20050331 |
20 | #SRCDATE = "now" | 23 | #SRCDATE = "now" |
@@ -25,7 +28,6 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" | |||
25 | 28 | ||
26 | PREFERRED_PROVIDER_virtual/libiconv=glibc | 29 | PREFERRED_PROVIDER_virtual/libiconv=glibc |
27 | PREFERRED_PROVIDER_virtual/libintl=glibc | 30 | PREFERRED_PROVIDER_virtual/libintl=glibc |
28 | PREFERRED_PROVIDER_x11=diet-x11 | ||
29 | 31 | ||
30 | PREFERRED_VERSION_hostap-modules ?= "0.3.9" | 32 | PREFERRED_VERSION_hostap-modules ?= "0.3.9" |
31 | 33 | ||
@@ -46,6 +48,12 @@ PREFERRED_VERSION_gcc-cross ?= "3.4.4" | |||
46 | PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" | 48 | PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" |
47 | 49 | ||
48 | # | 50 | # |
51 | # PIN the familiar build to a version | ||
52 | # | ||
53 | PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" | ||
54 | PREFERRED_VERSION_binutils ?= "2.15.94.0.1" | ||
55 | |||
56 | # | ||
49 | # Opie | 57 | # Opie |
50 | # | 58 | # |
51 | 59 | ||
@@ -61,7 +69,7 @@ PREFERRED_VERSION_qte = "2.3.10" | |||
61 | 69 | ||
62 | PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" | 70 | PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" |
63 | PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" | 71 | PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" |
64 | PREFERRED_PROVIDER_x11 = "diet-x11" | 72 | PREFERRED_PROVIDER_libx11 = "diet-x11" |
65 | 73 | ||
66 | include conf/distro/preferred-gpe-versions-2.8.inc | 74 | include conf/distro/preferred-gpe-versions-2.8.inc |
67 | 75 | ||
diff --git a/openembedded/conf/distro/familiar.conf b/openembedded/conf/distro/familiar.conf index 99e501589f..da5caa7998 100644 --- a/openembedded/conf/distro/familiar.conf +++ b/openembedded/conf/distro/familiar.conf | |||
@@ -2,14 +2,17 @@ | |||
2 | #@NAME: Familiar Linux | 2 | #@NAME: Familiar Linux |
3 | #@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org) | 3 | #@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org) |
4 | 4 | ||
5 | MAINTAINER ?= "Familiar Developers <familiar-dev@handhelds.org>" | ||
6 | |||
5 | INHERIT += "package_ipk debian" | 7 | INHERIT += "package_ipk debian" |
6 | TARGET_OS = "linux" | 8 | TARGET_OS = "linux" |
7 | 9 | ||
8 | PARALLEL_INSTALL_MODULES = "1" | 10 | BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" |
9 | UDEV_DEVFS_RULES = "1" | ||
10 | IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" | 11 | IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" |
11 | 12 | ||
12 | BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" | 13 | ENABLE_BINARY_LOCALE_GENERATION ?= "1" |
14 | PARALLEL_INSTALL_MODULES = "1" | ||
15 | UDEV_DEVFS_RULES = "1" | ||
13 | 16 | ||
14 | DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" | 17 | DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" |
15 | 18 | ||
diff --git a/openembedded/conf/distro/maemo-1.0.conf b/openembedded/conf/distro/maemo-1.0.conf index f83e4b1d96..d30ecc9084 100644 --- a/openembedded/conf/distro/maemo-1.0.conf +++ b/openembedded/conf/distro/maemo-1.0.conf | |||
@@ -29,7 +29,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" | |||
29 | 29 | ||
30 | PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" | 30 | PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" |
31 | PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" | 31 | PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" |
32 | PREFERRED_PROVIDER_x11 = "diet-x11" | 32 | PREFERRED_PROVIDER_libx11 = "diet-x11" |
33 | 33 | ||
34 | include conf/distro/preferred-gpe-versions.inc | 34 | include conf/distro/preferred-gpe-versions.inc |
35 | 35 | ||
diff --git a/openembedded/conf/distro/openzaurus-unstable.conf b/openembedded/conf/distro/openzaurus-unstable.conf index f424b16696..1143f1d940 100644 --- a/openembedded/conf/distro/openzaurus-unstable.conf +++ b/openembedded/conf/distro/openzaurus-unstable.conf | |||
@@ -57,7 +57,7 @@ PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" | |||
57 | # GPE | 57 | # GPE |
58 | # | 58 | # |
59 | PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" | 59 | PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" |
60 | PREFERRED_PROVIDER_x11 = "diet-x11" | 60 | PREFERRED_PROVIDER_libx11 = "diet-x11" |
61 | include conf/distro/preferred-gpe-versions-2.8.inc | 61 | include conf/distro/preferred-gpe-versions-2.8.inc |
62 | 62 | ||
63 | # | 63 | # |
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf index ab115ac292..d734b64cdd 100644 --- a/openembedded/conf/distro/poky.conf +++ b/openembedded/conf/distro/poky.conf | |||
@@ -55,7 +55,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" | |||
55 | PREFERRED_PROVIDER_virtual/libiconv ?= glibc | 55 | PREFERRED_PROVIDER_virtual/libiconv ?= glibc |
56 | PREFERRED_PROVIDER_virtual/libintl ?= glibc | 56 | PREFERRED_PROVIDER_virtual/libintl ?= glibc |
57 | PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive | 57 | PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive |
58 | PREFERRED_PROVIDER_x11 ?= "diet-x11" | 58 | PREFERRED_PROVIDER_libx11 ?= "diet-x11" |
59 | PREFERRED_PROVIDER_gconf ?= gconf-dbus | 59 | PREFERRED_PROVIDER_gconf ?= gconf-dbus |
60 | PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus | 60 | PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus |
61 | 61 | ||
@@ -89,7 +89,7 @@ SRCDATE_matchbox-themes-extra ?= "20051101" | |||
89 | SRCDATE_matchbox-wm ?= "20060120" | 89 | SRCDATE_matchbox-wm ?= "20060120" |
90 | SRCDATE_libmatchbox ?= "20060120" | 90 | SRCDATE_libmatchbox ?= "20060120" |
91 | SRCDATE_tslib ?= "20051101" | 91 | SRCDATE_tslib ?= "20051101" |
92 | SRCDATE_xext ?= "20051101" | 92 | SRCDATE_libxext ?= "20051101" |
93 | SRCDATE_renderext ?= "20051101" | 93 | SRCDATE_renderext ?= "20051101" |
94 | SRCDATE_libxrender ?= "20051101" | 94 | SRCDATE_libxrender ?= "20051101" |
95 | SRCDATE_fixesext ?= "20051101" | 95 | SRCDATE_fixesext ?= "20051101" |
@@ -99,10 +99,10 @@ SRCDATE_xcalibrateext ?= "20051101" | |||
99 | SRCDATE_recordext ?= "20051101" | 99 | SRCDATE_recordext ?= "20051101" |
100 | SRCDATE_libfakekey ?= "20051101" | 100 | SRCDATE_libfakekey ?= "20051101" |
101 | SRCDATE_xmodmap ?= "20051101" | 101 | SRCDATE_xmodmap ?= "20051101" |
102 | SRCDATE_xrandr ?= "20051101" | 102 | SRCDATE_libxrandr ?= "20051101" |
103 | SRCDATE_xtst ?= "20051101" | 103 | SRCDATE_libxtst ?= "20051101" |
104 | SRCDATE_xcalibrate ?= "20051101" | 104 | SRCDATE_libxcalibrate ?= "20051101" |
105 | SRCDATE_xmu ?= "20051115" | 105 | SRCDATE_libxmu ?= "20051115" |
106 | SRCDATE_xdpyinfo ?= "20051115" | 106 | SRCDATE_xdpyinfo ?= "20051115" |
107 | SRCDATE_xauth ?= "20060120" | 107 | SRCDATE_xauth ?= "20060120" |
108 | 108 | ||