diff options
| author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2010-04-09 09:15:31 +0200 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2010-04-09 09:15:31 +0200 |
| commit | 7464bb793d6a15c3888a946489fdfb24a23e3824 (patch) | |
| tree | feffa43743228e2a68a312ea28231a13b4c5d081 /conf | |
| parent | a90b30cad07ef1563230b2bdb22a0bf1e35b7a04 (diff) | |
| parent | ae50bef3b536b886c689ef87428b6db671fece0c (diff) | |
Merge branch 'org.openembedded.dev' of ssh+git://git@git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/collections.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/preferred-slugos-versions.inc | 3 | ||||
| -rw-r--r-- | conf/machine/imote2.conf | 2 |
4 files changed, 4 insertions, 5 deletions
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 } 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}" 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}" # #===============================================================================# #===============================================================================# 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" |