diff options
| author | Mike Westerhof <mwester@dls.net> | 2006-04-11 03:19:51 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-11 03:19:51 +0000 |
| commit | 0c21d985cd31b9c3f14aed86c0632e160d5a3549 (patch) | |
| tree | 84ee3cdd290cea4a659bd4a36c967a0f346d536b /conf/distro | |
| parent | 2b1e71a99eb85c82e4f5fbe16ad7d99ca250072a (diff) | |
| parent | 734c5296cdfc25ec221233f49455e1280a64a595 (diff) | |
merge of 39e43f0486c5d18bb8979c53687235b3f04855de
and 738b5da14d9fd2be6600c5eb848647017fac3413
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 18 | ||||
| -rw-r--r-- | conf/distro/preferred-e-versions.inc | 4 | ||||
| -rw-r--r-- | conf/distro/slugos-packages.conf | 1 |
3 files changed, 11 insertions, 12 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 4159d99962..6ca56971ab 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -49,14 +49,14 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" #use EABI toolchain -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_linux-libc-headers ?= "2.6.15.99" -PREFERRED_VERSION_glibc ?= "2.4" -PREFERRED_VERSION_glibc-intermediate ?= "2.4" +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_linux-libc-headers = "2.6.15.99" +PREFERRED_VERSION_glibc = "2.4" +PREFERRED_VERSION_glibc-intermediate = "2.4" @@ -74,7 +74,6 @@ PREFERRED_PROVIDER_hostap-conf = "hostap-conf" PCMCIA_MANAGER_c7x0 = "pcmciautils" PCMCIA_MANAGER_akita = "pcmciautils" PCMCIA_MANAGER_spitz = "pcmciautils" -PCMCIA_MANAGER_borzoi = "pcmciautils" PCMCIA_MANAGER_nokia770 = "pcmciautils" PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" @@ -90,6 +89,5 @@ GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" #GPE_EXTRA_INSTALL_append_tosa = " libgtkinput" #GPE_EXTRA_INSTALL_append_akita = " libgtkinput" #GPE_EXTRA_INSTALL_append_spitz = " libgtkinput" -#GPE_EXTRA_INSTALL_append_borzoi = " libgtkinput" diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc index c8f246ff69..5126876278 100644 --- a/conf/distro/preferred-e-versions.inc +++ b/conf/distro/preferred-e-versions.inc @@ -30,6 +30,6 @@ PREFERRED_PROVIDER_virtual/evas = "evas-x11" PREFERRED_PROVIDER_virtual/ecore = "ecore-x11" PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" -PREFERRED_VERSION_gnome-vfs-dbus = "svn" +#PREFERRED_VERSION_gnome-vfs-dbus = "svn" -PREFERRED_VERSION_gcc = "3.4.4" +#PREFERRED_VERSION_gcc = "3.4.4" diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf index 1e578c48ba..b89d5728f7 100644 --- a/conf/distro/slugos-packages.conf +++ b/conf/distro/slugos-packages.conf @@ -1,6 +1,7 @@ BBFILES := "\ ${PKGDIR}/packages/alsa/*.bb \ ${PKGDIR}/packages/apr/*.bb \ +${PKGDIR}/packages/asterisk/*.bb \ ${PKGDIR}/packages/atftp/*.bb \ ${PKGDIR}/packages/audiofile/*.bb \ ${PKGDIR}/packages/aumix/*.bb \ |