summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf3
-rw-r--r--conf/distro/angstrom-2006.9.conf14
-rw-r--r--conf/distro/preferred-x-versions-pre-X11R7.inc44
-rw-r--r--conf/machine/include/handheld-common.conf2
-rw-r--r--conf/machine/include/zaurus-clamshell-2.4.conf2
-rw-r--r--conf/machine/include/zaurus-clamshell-2.6.conf3
-rw-r--r--conf/machine/qemuarm.conf2
7 files changed, 58 insertions, 12 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 71dc101f0f..6afd6ca2cd 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -298,7 +298,7 @@ export palmqtdir = "/opt/QtPalmtop"
GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge"
-GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source"
+GPE_MIRROR = "http://handhelds.org/pub/projects/gpe/source"
XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
XORG_MIRROR = "http://xorg.freedesktop.org/releases"
GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
@@ -306,6 +306,7 @@ FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs"
FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs"
GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles"
+APACHE_MIRROR = "http://www.apache.org/dist"
# You can use the mirror of your country to get faster downloads by putting
# export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool"
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index ccaee57d6d..be0f5e93fe 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -52,13 +52,13 @@ PREFERRED_VERSION_gcc-cross-initial ?= "4.0.2"
#use EABI toolchain
-#PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-20051214"
-#PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-20051214"
-#PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4+csl-arm-20051214"
-#PREFERRED_VERSION_binutils ?= "2.16.91.0.4"
-#PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.4"
-#PREFERRED_VERSION_glibc ?= "2.3.5+cvs20051214"
-#PREFERRED_VERSION_glibc-intermediate ?= "2.3.5+cvs20051214"
+#PREFERRED_VERSION_gcc ?= "4.1.0"
+#PREFERRED_VERSION_gcc-cross ?= "4.1.0"
+#PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0"
+#PREFERRED_VERSION_binutils ?= "2.16.91.0.6"
+#PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.6"
+#PREFERRED_VERSION_glibc ?= "2.3.6+cvs20060314"
+#PREFERRED_VERSION_glibc-intermediate ?= "2.3.6+cvs20060314"
PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
diff --git a/conf/distro/preferred-x-versions-pre-X11R7.inc b/conf/distro/preferred-x-versions-pre-X11R7.inc
new file mode 100644
index 0000000000..b8cd34a3fb
--- /dev/null
+++ b/conf/distro/preferred-x-versions-pre-X11R7.inc
@@ -0,0 +1,44 @@
+#
+# Specify to build old/old CVS versions of X libraries and apps
+#
+
+PREFERRED_VERSION_xproto = "0.0+cvs${SRCDATE}"
+
+PREFERRED_VERSION_diet-x11 = "6.2.1+cvs${SRCDATE}"
+PREFERRED_VERSION_libice = "6.3.3"
+PREFERRED_VERSION_libsm = "6.0.3"
+PREFERRED_VERSION_libx11 = "6.2.1+cvs${SRCDATE}"
+PREFERRED_VERSION_libxau = "1.0.1"
+PREFERRED_VERSION_libxaw = "7.0.2"
+PREFERRED_VERSION_libxcomposite = "1.0.1"
+PREFERRED_VERSION_libxcursor = "1.1.2"
+PREFERRED_VERSION_libxdamage = "1.0.1"
+PREFERRED_VERSION_libxdmcp = "0.1.3"
+PREFERRED_VERSION_libxext = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxfixes = "2.0.1"
+PREFERRED_VERSION_libxfont = "1.4.2"
+PREFERRED_VERSION_libxft = "2.1.6"
+PREFERRED_VERSION_libxi = "6.0.1"
+PREFERRED_VERSION_libxinerama = "1.0.2+cvs20050505"
+PREFERRED_VERSION_libxkbfile = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxmu = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxp = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxpm = "3.5.1"
+PREFERRED_VERSION_libxrandr = "1.0.2"
+PREFERRED_VERSION_libxrender = "0.8.4"
+PREFERRED_VERSION_libxres = "1.0.1"
+PREFERRED_VERSION_libxss = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxt = "0.1.5"
+PREFERRED_VERSION_libxtst = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxv = "2.2.2+cvs20040918"
+PREFERRED_VERSION_libxxf86dga = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxxf86vm = "0.0+cvs${SRCDATE}"
+
+PREFERRED_VERSION_xcalibrate = "0.0+cvs20060312"
+PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207"
+
+PREFERRED_VERSION_xdpyinfo = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_xev = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_xhost = "0.0+cvs20040413"
+PREFERRED_VERSION_xmodmap = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_xrandr = "0.0+cvs${SRCDATE}"
diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf
index 57afe89ce7..fbecc6e25c 100644
--- a/conf/machine/include/handheld-common.conf
+++ b/conf/machine/include/handheld-common.conf
@@ -20,6 +20,6 @@ PCMCIA_MANAGER ?= "pcmcia-cs"
# Configuration bits for "generic handheld"
BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
INHERIT += "linux_modules"
diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf
index c8be696358..184258c8b6 100644
--- a/conf/machine/include/zaurus-clamshell-2.4.conf
+++ b/conf/machine/include/zaurus-clamshell-2.4.conf
@@ -11,7 +11,7 @@ PREFERRED_VERSION_orinoco-modules = "0.13e"
BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \
-wpa-supplicant ppp ppp-dialin openswan"
+wpa-supplicant-nossl ppp ppp-dialin openswan"
# Misc Modules
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers"
diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf
index aa840586a6..d3882b7f65 100644
--- a/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -2,10 +2,11 @@
# Don't forget to include zaurus-clamshell.conf as well
PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+PREFERRED_VERSION_wpa_supplicant = "0.4.7"
BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
+ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
# Ethernet modules
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index 6c857b6bb9..2238f6673e 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
pcmciautils apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
+ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
# Ethernet modules
#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"