From 73c9713cacf49f300e034bbb6b47df17caf29d4f Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Mon, 4 Feb 2008 20:14:18 +0000 Subject: linux-davinci : Update defconfig. Add patch to support NAND flash. --- conf/machine/davinci-sffsdr.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf index ecff6fae13..faf86c5ed0 100644 --- a/conf/machine/davinci-sffsdr.conf +++ b/conf/machine/davinci-sffsdr.conf @@ -19,7 +19,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" #ROOT_FLASH_SIZE = "29" -MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa" +MACHINE_FEATURES = "kernel26 serial" require conf/machine/include/tune-arm926ejs.inc -- cgit v1.2.3 From 7083b385f61a37eabba234ec5704e4e3e3c8cd26 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 12 Feb 2008 17:46:33 +0000 Subject: bitbake.conf: Set default IMAGE_FSTYPES to "tar.gz". * Per RFC on the ML, as the means to use neutral, well-known format as the default. * Machines which have affinity towards jffs2, can add 'IMAGE_FSTYPES ?= "jffs2"' to their configs. (Many known machines have been updated already). --- conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index ac2d281123..c6ef6012bf 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -541,7 +541,7 @@ require conf/sanity.conf ################################################################## DL_DIR ?= "${TMPDIR}/downloads" -IMAGE_FSTYPES ?= "jffs2" +IMAGE_FSTYPES ?= "tar.gz" PCMCIA_MANAGER ?= "pcmcia-cs" DEFAULT_TASK_PROVIDER ?= "task-base" MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" -- cgit v1.2.3 From b9e4b25300b451df273a4d64aef4530b8ec18fbc Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 12 Feb 2008 17:56:42 +0000 Subject: bitbake.conf, image.bbclass: Add and use USERDISTRO var to preserve original DISTRO value. * Some distros override DISTRO var to hack overrides right, etc. Yet, original value may be needed sometimes. For example, bbimage expects DISTRO to be what user set/passed it, not something else. * TODO: After interim cleanup during preparation of this patch, it turns out that angstrom is the only distro to (ab)use DISTRO overriding. It may make sense to instead get its OVERRIDES value right. --- conf/bitbake.conf | 4 ++++ conf/distro/include/angstrom.inc | 2 ++ 2 files changed, 6 insertions(+) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index c6ef6012bf..27a04a028c 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -529,6 +529,10 @@ OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUIL include conf/site.conf include conf/auto.conf include conf/local.conf +# USERDISTRO should always contain original DISTRO value as set by user +# If a distro config overrides DISTRO for whatever reason (e.g. to get +# overrides like it wants), USERDISTRO must be reassigned with := first +USERDISTRO = "${DISTRO}" include conf/build/${BUILD_SYS}.conf include conf/target/${TARGET_SYS}.conf include conf/machine/${MACHINE}.conf diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index fe216800c3..6ba20c4830 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -2,6 +2,8 @@ #@NAME: Angstrom #@DESCRIPTION: Release independent distribution configuration for Angstrom +# Preserve original DISTRO value +USERDISTRO := "${DISTRO}" DISTRO = "angstrom" DISTRO_NAME = "Angstrom" -- cgit v1.2.3 From 4cefece868c0779bff0aa15b9f5723999f3d39c0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 13 Feb 2008 11:07:20 +0000 Subject: gconf-dbus: update svn version to rev 641, remove cvs version * this makes it work with dbus 1.1.x --- conf/distro/include/sane-srcdates.inc | 1 - conf/distro/include/sane-srcrevs.inc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index aaf7b02a09..43ffa1de9f 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -46,7 +46,6 @@ SRCDATE_rosetta ?= "20060804" SRCDATE_gpesyncd ?= "20070701" # GNOME -SRCDATE_gconf-dbus ?= "20070512" SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index a585fdeca6..4d92f48928 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -23,7 +23,7 @@ SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7650" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-fstests ?= "204" -SRCREV_pn-gconf-dbus ?= "606" +SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gsm0710muxd ?= "73" -- cgit v1.2.3 From d7bb1a5668320a4759b9078e2680215a85fc3751 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 13 Feb 2008 11:20:12 +0000 Subject: preferred-om-2008-versions: switch to bb 1.7.2, udev 118, dbus 1.1.4 --- conf/distro/include/preferred-om-2008-versions.inc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'conf') diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 2c2e0acb03..b0f6d4ec02 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1 +1,5 @@ PREFERRED_VERSION_vte = "0.16.10" +PREFERRED_VERSION_dbus = "1.1.4" +PREFERRED_VERSION_udev = "118" +PREFERRED_VERSION_busybox = "1.7.2" + -- cgit v1.2.3 From 7cfea8f908d750ed32f6d3095c94190975e09df8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 13 Feb 2008 11:42:47 +0000 Subject: preferred-om-2008-versions: update more software, pulseaudio 0.9.9 / gst-pulse 0.9.7 now works --- conf/distro/include/preferred-om-2008-versions.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index b0f6d4ec02..63dd268e7e 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1,5 +1,8 @@ -PREFERRED_VERSION_vte = "0.16.10" PREFERRED_VERSION_dbus = "1.1.4" -PREFERRED_VERSION_udev = "118" PREFERRED_VERSION_busybox = "1.7.2" +PREFERRED_VERSION_gst-pulse = "0.9.7" +PREFERRED_VERSION_libtool = "1.2.14" +PREFERRED_VERSION_pulseaudio = "0.9.9" +PREFERRED_VERSION_udev = "118" +PREFERRED_VERSION_vte = "0.16.10" -- cgit v1.2.3 From 21a3b977fec3d0090dc6c9b819f8f389ad1c3cb7 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 13 Feb 2008 12:13:19 +0000 Subject: Sharp ROM stuff: include latest linux-libc-headers by default. Closes 2199. --- conf/distro/sharprom-compatible.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 92fd42f4f8..3fbe79e354 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -37,7 +37,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" -PREFERRED_PROVIDER_virtual/linux-libc-headers = "sharprom-toolchain-native" +PREFERRED_PROVIDER_virtual/linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native" PREFERRED_VERSION_glibc = "2.2.5" -- cgit v1.2.3 From 9acbf3fcc9d2f92891edb26212afbd7177cfc225 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 13 Feb 2008 13:57:58 +0000 Subject: preferred-om-2008-versions.inc: bump busybox --- conf/distro/include/preferred-om-2008-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 63dd268e7e..5641c8ee39 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1,5 +1,5 @@ PREFERRED_VERSION_dbus = "1.1.4" -PREFERRED_VERSION_busybox = "1.7.2" +PREFERRED_VERSION_busybox = "1.9.1" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_libtool = "1.2.14" PREFERRED_VERSION_pulseaudio = "0.9.9" -- cgit v1.2.3