Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

7 files changed, 34 insertions, 7 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index d48903a818..a93de76c50 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1650,6 +1650,14 @@ sha256=0d77c73a3c151a7da647dd924f32151e5ee4574530568fd65067882f79cd5a44
 md5=b64a8ae8592b4d32ac9baebf0b915c1e
 sha256=456d2bf4550a37c70e829b3029acf3cb81f931908d35f1dbade7ec54f4cdb146
 
+[ftp://ftp.debian.org/debian/pool/main/a/atftp/atftp_0.7-7.diff.gz]
+md5=03ccc8d178ee956feb46ab970e982e94
+sha256=71e8890e709ee77756368b8508f65c6c9bf8c6ed5e1501726ef30e1dc105d4f5
+
+[ftp://ftp.debian.org/debian/pool/main/a/atftp/atftp_0.7.dfsg-3.diff.gz]
+md5=fa5ea0d162c41c197af48d717df1389f
+sha256=2bbf2b8fdf6e12dabb0cc751a973d9040f7ed9123cf87a7f794044f3429b0de0
+
 [ftp://ftp.debian.org/debian/pool/main/a/atftp/atftp_0.7.dfsg-6.diff.gz]
 md5=b5d570affb1412e8e90b9dd24554ad96
 sha256=9aa41c8c88ecb1163b7ac69824ac390d6eaaa30ed31a0624486e43f414ec6b7a
@@ -2938,6 +2946,10 @@ sha256=2dec31ba4a176c921a653c0949a53c2d3497e047737724350897fd2534db18fe
 md5=0ec2460a4484d5f5595d8faca61bc9c5
 sha256=e823bfcce52916727cb23d6d549a64347c45c364b3c628d6a352c407fce8f4b4
 
+[http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz]
+md5=b304bbe8ab63373924a744eac9ebc652
+sha256=005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df
+
 [http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz]
 md5=7218e778b5970a86c958e597f952f193
 sha256=1b79fae1aedc692f87d1344410f5c6b666961afccdc78bc5c4c257c450dfa008
@@ -20186,6 +20198,10 @@ sha256=65083a94bce9e539c4d9141b4e765415872e01bf17ec4be906d2e304aa8c3e7f
 md5=629dfea34e4087eb4683f834060abb63
 sha256=8dcfa54b58a6aaf4853fc27752c25d6c2592c485952b2fad25a9bea4b52bed33
 
+[http://heanet.dl.sourceforge.net/tcl/tcl8.4.11-src.tar.gz]
+md5=629dfea34e4087eb4683f834060abb63
+sha256=8dcfa54b58a6aaf4853fc27752c25d6c2592c485952b2fad25a9bea4b52bed33
+
 [http://downloads.sourceforge.net/tcl/tcl8.4.19-src.tar.gz]
 md5=ade2c033a7b545ee108f3fdfeb629fcf
 sha256=1c244722fb409e8774c5d45d6a0b21edc3e4541fd016a40afdf53c94a69a3db9
@@ -21778,6 +21794,10 @@ sha256=e3f8a224af7a8df4defc2c0b3567e1a697486443a2e073fa56122c4a4e439d65
 md5=0683a56108ca6d0c4329c7b9a5b7fbde
 sha256=e3f8a224af7a8df4defc2c0b3567e1a697486443a2e073fa56122c4a4e439d65
 
+[http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20090127-2245.tar.bz2]
+md5=25fcaa86a53333d416d5e837fb47ba7d
+sha256=18b38aff8e019f35bfee810831535685e69dcf91283e50bc62efa82e3a8dbc21
+
 [http://archive.apache.org/dist/xml/xalan-j/xalan-j_2_7_1-src.tar.gz]
 md5=fc805051f0fe505c7a4b1b5c8db9b9e3
 sha256=fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 74e531dc0e..60f2e55149 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -90,7 +90,8 @@ require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc
 # We don't want to keep OABI compat
 ARM_KEEP_OABI = "0"
 # Do keep OABI compat for om-gta01 to keep the gllin binary working
-ARM_KEEP_OABI_pn-linux-openmoko_om-gta01 = "1"
+ARM_KEEP_OABI_pn-linux-openmoko-2.6.24_om-gta01 = "1"
+ARM_KEEP_OABI_pn-linux-openmoko-2.6.28_om-gta01 = "1"
 
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 59968f508f..08279e8f98 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -12,7 +12,6 @@ SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
 SRCREV_pn-libmokojournal2 ?= "${AUTOREV}"
 SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}"
 SRCREV_pn-libmokoui2 ?= "${AUTOREV}"
-SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
 SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-multitap-pad ?= "${AUTOREV}"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 4bba014b7e..8bcb65542d 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -175,7 +175,7 @@ PREFERRED_VERSION_comprec ?= "0.02"
 PREFERRED_VERSION_confuse ?= "2.5"
 PREFERRED_VERSION_confuse-native ?= "2.5"
 PREFERRED_VERSION_connect ?= "0.1"
-PREFERRED_VERSION_connman ?= "0.4"
+PREFERRED_VERSION_connman ?= "0.8"
 PREFERRED_VERSION_conserver ?= "8.1.14"
 PREFERRED_VERSION_console-tools ?= "0.3.2"
 PREFERRED_VERSION_contacts ?= "0.7"
@@ -1501,7 +1501,7 @@ PREFERRED_VERSION_python24-native ?= "2.4.0"
 PREFERRED_VERSION_python24-pyqt2 ?= "3.13"
 PREFERRED_VERSION_python24-pyqwt2 ?= "3.10"
 PREFERRED_VERSION_python24-sip ?= "4.1.1"
-PREFERRED_VERSION_python ?= "2.5.2"
+PREFERRED_VERSION_python ?= "2.6.1"
 PREFERRED_VERSION_python-ao ?= "0.82"
 PREFERRED_VERSION_python-constraint ?= "1.1"
 PREFERRED_VERSION_python-dbus ?= "0.83.0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3aaa13276d..1177ad50a1 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -202,8 +202,8 @@ SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu ?= "${QEMUSRCREV}"
 SRCREV_pn-qi ?= "ed52486b43dca91891305b9e832c8366a2742798"
-SRCREV_pn-remoko ?= "115"
-SRCREV_pn-remoko-server ?= "115"
+SRCREV_pn-remoko ?= "121"
+SRCREV_pn-remoko-server ?= "121"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-serial-forward ?= "4214"
 SRCREV_pn-settings-daemon ?= "2006"
diff --git a/conf/machine/boc01.conf b/conf/machine/boc01.conf
index a7db1b19e9..7c8182a22b 100644
--- a/conf/machine/boc01.conf
+++ b/conf/machine/boc01.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Bolloré telecom CPE v01
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppce300c3"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux"
 
diff --git a/conf/machine/stb225.conf b/conf/machine/stb225.conf
new file mode 100644
index 0000000000..97370e1fe8
--- /dev/null
+++ b/conf/machine/stb225.conf
@@ -0,0 +1,8 @@
+# PNX8335 STB225 board
+TARGET_ARCH = "mipsel"
+TARGET_CC_ARCH="-march=mips32"
+MACHINE_FEATURES = "kernel26"
+IMAGE_FSTYPES="tar.gz"
+PREFERRED_PROVIDER_virtual/kernel="linux"
+KERNEL_IMAGETYPE="vmlinux"
+KERNEL_OUTPUT="${KERNEL_IMAGETYPE}"