From be0e5268d207e539c42b00cfac0054ee29064f51 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Thu, 8 Apr 2010 13:34:52 +0200 Subject: imote2.conf: Change flash size to 30 Mbyte We have a32 Mbyte flash chip but better leave some space for jffs2. --- conf/machine/imote2.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/imote2.conf b/conf/machine/imote2.conf index 33e5a65799..24da0d0678 100644 --- a/conf/machine/imote2.conf +++ b/conf/machine/imote2.conf @@ -17,6 +17,6 @@ SERIAL_CONSOLE = "115200 ttyS2" require conf/machine/include/tune-xscale.inc -ROOT_FLASH_SIZE ?= "32" +ROOT_FLASH_SIZE ?= "30" MACHINE_FEATURES = "kernel26 usbgadget alsa iwmmxt" -- cgit v1.2.3 From 1ba1263ed073931900ce91bed7b305b4f9db3b5c Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Thu, 8 Apr 2010 13:31:29 +0200 Subject: angstrom-2008-preferred-versions.inc: Bump python version to 2.6.4 This is done to match the python-native version. Without this we seem to get trouble with some header mismatch or similar: ./libpython2.6.so: undefined reference to `_PyParser_Grammar' Signed-off-by: Stefan Schmidt Acked-by: Koen Kooi --- conf/distro/include/angstrom-2008-preferred-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index dcab24b18a..79d1fd1d11 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -36,7 +36,7 @@ PREFERRED_VERSION_pango-native = "1.24.4" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" -PREFERRED_VERSION_python = "2.6.2" +PREFERRED_VERSION_python = "2.6.4" PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}" -- cgit v1.2.3 From 198179be171f1fdb809bccf02c83520cb978ad33 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Thu, 8 Apr 2010 09:13:54 -0500 Subject: SlugOS: preferred-slugos-versions.inc - fix kernel SRCREV selection This makes the PREFERRED_VERSION selection for the SlugOS kernel work again after a recent "pretty-ification" change for SRCREV handling. Note that this is a sub-optimal solution, but it is required to correct build failures for SlugOS. A long-term solution needs to either put the SRCREV back to where it was (a semi-global config file), or it needs to change the way the ixp4xx kernels are selected. More specifically, the problems this fixes for SlugOS still exist in the ixp4xx machine definition file. --- conf/distro/include/preferred-slugos-versions.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index 6ea8c90a8f..23424a2b1a 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -10,7 +10,8 @@ # # This *must* be removed after initial testing is completed. MJW 08-Dec-2008 # -PREFERRED_VERSION_linux-ixp4xx = "2.6.27.8+svnr${SRCREV}" +SRCREV_pn-linux-ixp4xx ?= "1089" +PREFERRED_VERSION_linux-ixp4xx = "2.6.27.8+svnr${SRCREV_pn-linux-ixp4xx}" # #===============================================================================# #===============================================================================# -- cgit v1.2.3 From 444d86f372b599d0d72c0c8e56ee3cb923ee0515 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 8 Apr 2010 17:05:55 -0700 Subject: Using NotHandled/Handled in event handlers is deprecated Signed-off-by: Chris Larson --- conf/collections.inc | 2 -- 1 file changed, 2 deletions(-) (limited to 'conf') diff --git a/conf/collections.inc b/conf/collections.inc index 0572568f06..a69ffed687 100644 --- a/conf/collections.inc +++ b/conf/collections.inc @@ -178,6 +178,4 @@ python collections_eh () { if getName(e) == "ConfigParsed": collections_setup(e.data) - - return NotHandled } -- cgit v1.2.3