From 614093d0517d9d49aa279d8f3fdccdc4c3d2b1c5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 19 Jan 2007 21:03:19 +0000 Subject: angstrom oabi: define PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc --- conf/distro/angstrom-2007.1-oabi.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') 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" -- cgit v1.2.3 From e59d40a736d95003de7482519ec978a8727d039a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 20 Jan 2007 11:43:10 +0000 Subject: angstrom: prefer cairo 1.3.12 --- conf/distro/angstrom-2007.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index b1d67e0405..a08413ef8a 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -98,7 +98,7 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" 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" -- cgit v1.2.3 From dbd24d30de95046e35e172d94725fc01db3dcb4d Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 20 Jan 2007 15:38:28 +0000 Subject: opie-users-are-too-stupid-to-put-this-in-local.conf.inc: Remove superceded file. Instructions for building OPIE with angstrom's config are detailed at http://www.linuxtogo.org/gowiki/OpieWithAngstrom . --- .../include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc (limited to 'conf') 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 -- cgit v1.2.3 From 41f0fbcb6706d59e96dbb58d586aa3bd9fdfc7e1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 20 Jan 2007 15:52:45 +0000 Subject: angstrom 2007.1: make DISTRO_EXTRA_DEPENDS appendable in local.conf --- conf/distro/angstrom-2007.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index a08413ef8a..7ebd89d8d6 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -225,7 +225,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)} \ -- cgit v1.2.3 From c12eb607538255183da321197bd9d1f01817a9d6 Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Sat, 20 Jan 2007 21:41:05 +0000 Subject: compulab-pxa270: cond assign variables to allow being overridden in local.conf --- conf/machine/compulab-pxa270.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'conf') 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" -- cgit v1.2.3 From ebf324cdf5884f20e24cdafdedb24d61c6387ccb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 20 Jan 2007 22:56:38 +0000 Subject: angstrom: add preferred provider for esound --- conf/distro/angstrom-2007.1.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 7ebd89d8d6..ab59d392b8 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -93,6 +93,7 @@ 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" -- cgit v1.2.3