From e886b2f3b85431bfd19dbea29722e66f75c33b76 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 31 Oct 2007 14:46:07 +0000 Subject: angstrom 2008: prefer 2.6.23 for libc headers --- conf/distro/angstrom-2008.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/distro/angstrom-2008.1.conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 98e1c6e22b..93b666c896 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -64,7 +64,7 @@ PREFERRED_VERSION_gcc-cross = "4.2.1" PREFERRED_VERSION_gcc-cross-initial = "4.1.2" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against -PREFERRED_VERSION_linux-libc-headers = "2.6.22" +PREFERRED_VERSION_linux-libc-headers = "2.6.23" #Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing. PREFERRED_VERSION_glibc = "2.6.1" -- cgit v1.2.3 From 60d98f25ec00aa5f3e1c44893486411cbe54f89e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 2 Nov 2007 11:59:18 +0000 Subject: conf files: remove preferred-openmoko-versions.inc (they're included in sane-srcdates.inc), catch up with distro configurations --- conf/distro/angstrom-2008.1.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'conf/distro/angstrom-2008.1.conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 93b666c896..3afdd8054a 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -92,7 +92,6 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc require conf/distro/include/preferred-xorg-versions-X11R7.3.inc -require conf/distro/include/preferred-openmoko-versions.inc # Virtuals: -- cgit v1.2.3 From e21525d7e61c88f740d23ca7e0083f2a829f0c77 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 8 Nov 2007 16:11:52 +0000 Subject: angstrom 2008: use uclibc 0.9.29 --- conf/distro/angstrom-2008.1.conf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'conf/distro/angstrom-2008.1.conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 3afdd8054a..bd5969a068 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -70,6 +70,9 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.23" PREFERRED_VERSION_glibc = "2.6.1" PREFERRED_VERSION_glibc-intermediate = "2.6.1" PREFERRED_VERSION_glibc-initial = "2.6.1" +PREFERRED_VERSION_uclibc ?= "0.9.29" +PREFERRED_VERSION_uclibc-initial ?= "0.9.29" + #Prefer a newer GTK+ and friends PREFERRED_VERSION_gtk+ = "2.12.0" -- cgit v1.2.3 From ce69c8942d550d4d9f37d1b1b46d1cd71bb6fc53 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sun, 18 Nov 2007 09:15:44 +0000 Subject: angstrom-2008.1.conf: sync with 2007.1, avahi and openssh-sftp-server in RRECOMMENDS --- conf/distro/angstrom-2008.1.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'conf/distro/angstrom-2008.1.conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index bd5969a068..34c94d1bd9 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -61,7 +61,7 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh17" PREFERRED_VERSION_gcc = "4.2.1" PREFERRED_VERSION_gcc-cross = "4.2.1" -PREFERRED_VERSION_gcc-cross-initial = "4.1.2" +PREFERRED_VERSION_gcc-cross-initial = "4.1.2" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against PREFERRED_VERSION_linux-libc-headers = "2.6.23" @@ -177,8 +177,6 @@ DISTRO_EXTRA_RDEPENDS += "\ angstrom-version \ ipkg ipkg-collateral \ util-linux-mount util-linux-umount \ - avahi-daemon \ - avahi-autoipd \ ${DEBUG_APPS} \ " @@ -186,4 +184,7 @@ DISTRO_EXTRA_RRECOMMENDS += " \ kernel-module-vfat \ kernel-module-ext2 \ kernel-module-af-packet \ + avahi-daemon \ + avahi-autoipd \ + openssh-sftp-server \ " -- cgit v1.2.3 From edcd626223abbc75613209245834273e8c921e5b Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sun, 18 Nov 2007 09:17:29 +0000 Subject: angstrom-2008.1.conf: sync with 2007.1, use linux-handhelds-2.6 version 2.6.21-hh18 --- conf/distro/angstrom-2008.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/distro/angstrom-2008.1.conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 34c94d1bd9..b91db90826 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -57,7 +57,7 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh17" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh18" PREFERRED_VERSION_gcc = "4.2.1" PREFERRED_VERSION_gcc-cross = "4.2.1" -- cgit v1.2.3 From 1966d4693dafbbfb49ec4eb8600145070a0d63b2 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sun, 18 Nov 2007 09:21:08 +0000 Subject: angstrom-2008.1.conf: use gcc 4.2.2 --- conf/distro/angstrom-2008.1.conf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'conf/distro/angstrom-2008.1.conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index b91db90826..b5105755f0 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -59,10 +59,6 @@ PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh18" -PREFERRED_VERSION_gcc = "4.2.1" -PREFERRED_VERSION_gcc-cross = "4.2.1" -PREFERRED_VERSION_gcc-cross-initial = "4.1.2" - #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against PREFERRED_VERSION_linux-libc-headers = "2.6.23" @@ -91,6 +87,11 @@ PREFERRED_PROVIDER_avahi = "avahi" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" +PREFERRED_VERSION_gcc ?= "4.2.2" +PREFERRED_VERSION_gcc-cross ?= "4.2.2" +PREFERRED_VERSION_gcc-cross-sdk ?= "4.2.2" +PREFERRED_VERSION_gcc-cross-initial ?= "4.2.2" + #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc -- cgit v1.2.3 From ca232b759e5b42183969f926454d493ee072dad1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 19 Nov 2007 15:17:08 +0000 Subject: angstrom: only ship strace and procps for debug builds, this is a first step into removing angstrom frobbing task-base stuff (should be left to images to decide on this stuff) --- conf/distro/angstrom-2008.1.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf/distro/angstrom-2008.1.conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index bd5969a068..2fdd886539 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -20,7 +20,7 @@ require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc #Images built can have to modes: -# 'debug': empty rootpassword, strace and gdb included +# 'debug': empty rootpassword, strace included # 'release' no root password, no strace and gdb by default DISTRO_TYPE ?= "debug" #DISTRO_TYPE = "release" @@ -167,7 +167,7 @@ require conf/distro/include/angstrom${ARM_ABI}.inc # We want to ship extra debug utils in the rootfs when doing a debug build DEBUG_APPS ?= "" -DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}' +DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}' # Angstrom want to ship some extra stuff. This should be moved into task-base eventually # contains ipkg specific stuff as well :( -- cgit v1.2.3 From a3c3eef913c2e5a074a031e13312dda24d12aeef Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 1 Dec 2007 12:19:33 +0000 Subject: angstrom: add vars for feed config package --- conf/distro/angstrom-2008.1.conf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'conf/distro/angstrom-2008.1.conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 9614581ffc..0159c7dd0b 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -44,6 +44,10 @@ FEED_URIS += " \ gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" +# set feed path variables +FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/" + + #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback CVS_TARBALL_STASH ?= "\ http://www.angstrom-distribution.org/unstable/sources/ \ -- cgit v1.2.3 From d9bec7fce7e68c7d277276185cea9bfb50e7af1c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 4 Dec 2007 09:12:10 +0000 Subject: angstrom: Define some extra PREFERRED_PROVIDERs to ensure external-toolchain isn't touched --- conf/distro/angstrom-2008.1.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf/distro/angstrom-2008.1.conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 0159c7dd0b..bc03465bd5 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -103,6 +103,7 @@ require conf/distro/include/preferred-xorg-versions-X11R7.3.inc # Virtuals: +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" @@ -132,6 +133,7 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_esound ?= "pulseaudio" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" -- cgit v1.2.3 From cf541c8388d3f543bdf7673ad242338ad3bd2061 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 8 Dec 2007 14:25:53 +0000 Subject: various files: update my email address and website address --- conf/distro/angstrom-2008.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/distro/angstrom-2008.1.conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index bc03465bd5..145c463751 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -2,7 +2,7 @@ #@TYPE: Distribution #@NAME: Angstrom #@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices -#@MAINTAINER: Koen Kooi +#@MAINTAINER: Koen Kooi #@MAINTAINER: Michael 'Mickey' Lauer #@-------------------------------------------------------------------- -- cgit v1.2.3