diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1-oabi.conf | 2 | ||||
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 5 | ||||
| -rw-r--r-- | conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc | 6 | ||||
| -rw-r--r-- | conf/machine/compulab-pxa270.conf | 6 |
4 files changed, 8 insertions, 11 deletions
diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf index 4007f203ad..c88aa06697 100644 --- a/conf/distro/angstrom-2007.1-oabi.conf +++ b/conf/distro/angstrom-2007.1-oabi.conf @@ -3,6 +3,8 @@ require conf/distro/angstrom-2007.1.conf #this is a special version of angstrom for armv4 based machines that can't do EABI #see http://wiki.debian.org/ArmEabiPort for details on that +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate" + #only glibc based builds are supported ATM TARGET_OS = "linux" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index b1d67e0405..ab59d392b8 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -93,12 +93,13 @@ require conf/distro/include/preferred-gpe-versions-2.8.inc PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" +PREFERRED_PROVIDER_esound ?= "pulseaudio" PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.2.1" #fix screen corruption issues -PREFERRED_VERSION_cairo = "1.3.10" +PREFERRED_VERSION_cairo = "1.3.12" #work around a segfault in gcc for armv4t PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3" @@ -225,7 +226,7 @@ EXTRA_STUFF ?= "" # Angstrom want to ship some extra stuff. This should be moved into task-base eventually -DISTRO_EXTRA_RDEPENDS = "\ +DISTRO_EXTRA_RDEPENDS += "\ update-modules module-init-tools modutils-initscripts \ sysvinit initscripts sysvinit-pidof \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ diff --git a/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc b/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc deleted file mode 100644 index 7898f7b349..0000000000 --- a/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc +++ /dev/null @@ -1,6 +0,0 @@ -# Opie -#use 1337 mt version of opie to have a webbrowser -PALMTOP_USE_MULTITHREADED_QT = "yes" -QTE_VERSION = "2.3.10" -OPIE_VERSION = "1.2.2" -require conf/distro/include/preferred-opie-versions.inc diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf index 95be1624f0..d8d9264699 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/compulab-pxa270.conf @@ -4,7 +4,7 @@ #OLDEST_KERNEL = "2.6.16" TARGET_ARCH = "arm" PREFERRED_VERSION_compulab-pxa270 = "2.6.16" -GUI_MACHINE_CLASS = "bigscreen" +GUI_MACHINE_CLASS ?= "bigscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" PACKAGE_EXTRA_ARCHS = "armv4 armv5te" @@ -12,10 +12,10 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te" require conf/machine/include/tune-xscale.conf # used by sysvinit_2 -SERIAL_CONSOLE = "38400 ttySA0" +SERIAL_CONSOLE ?= "38400 ttySA0" # used by opie-collections.inc -ROOT_FLASH_SIZE = "32" +ROOT_FLASH_SIZE ?= "32" EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000" |