3 files changed, 25 insertions, 6 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 78dc0f2082..a4072a35bd 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -118,9 +118,9 @@ sha256=0875e553a17fe65e920ad810a67aa6faca582c53476d8dc75880a6b3da625d0b
 md5=835e850fddba8d8214d39ddd0646c3e8
 sha256=f83af60d53ab4319e5d71a4459cc10464ffd683efabacd6bd773bb807f8771fa
 
-[http://media.djangoproject.com/releases/0.96/Django-0.96.1.tar.gz]
-md5=10aa32e58969c4efeb00ef42ba192b17
-sha256=4874134e9fc6bd08eb7e451e42038394668895c26b7cc867d4c3fdaf9d711085
+[http://media.djangoproject.com/releases/1.0/Django-1.0.tar.gz]
+md5=84d0490e4126f31d1c23f640e1e86f2f
+sha256=4c780b9e2906944ce02a9325b15f480d2bd4c0b12137f752aa4800c0f8563acf
 
 [http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-2.0a.tar.gz]
 md5=3bf4d8d285591a5b7f31170f9b87aba0
@@ -4166,6 +4166,10 @@ sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a
 md5=4afa0290cc3a41ac8822666f1110de98
 sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5
 
+[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2]
+md5=5dfac5da961ecd5f227c3175859a486d
+sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
+
 [ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2]
 md5=5dfac5da961ecd5f227c3175859a486d
 sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
@@ -4902,6 +4906,10 @@ sha256=1c70e916c691c7c31ea3c8f2abeedae6c7dfda754e02b373287ceb5b46bfbb0e
 md5=f8721af6f4e90ff48bd7cb4c96a5a94c
 sha256=c2977b18d1166c62e3f04373feefc0e2af704da3cb98e32612be4a55fd77a3f9
 
+[http://ftp.5z.com/pub/gob/old/gob2-2.0.14.tar.gz]
+md5=f8721af6f4e90ff48bd7cb4c96a5a94c
+sha256=c2977b18d1166c62e3f04373feefc0e2af704da3cb98e32612be4a55fd77a3f9
+
 [http://releases.0x539.de/gobby/gobby-0.4.1.tar.gz]
 md5=a2c79bdda652a2d74fec104235d27bc0
 sha256=aad2ed23638f5a6aa655dc13395228cefc4c28e46b05eb05ac12481fac36aba3
@@ -5750,6 +5758,10 @@ sha256=e07c495a18679b79c7c6f6f475689a33ab2a8ee5af4783e915f08134d1f546d2
 md5=f7c9cf2e4b9967d3af167d7c9fadaae4
 sha256=d864fbd0bf6dea24e4f71736da9902a1cae86d0a1a893b5fe17118927257ec3e
 
+[ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz]
+md5=cd3f3eb54446be6003156158d51f4884
+sha256=4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
+
 [ftp://ftp.gnu.org/gnu/gsl/gsl-1.4.tar.gz]
 md5=7513e13525c073dc07e02cc4354294e2
 sha256=850b4512fa5e4bbb964c67c215fe8ce64fe6f7e6b704180a783d8c2a04169ccb
@@ -9294,6 +9306,10 @@ sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36
 md5=6646be5e31e58188e8f47c6ce64faa4c
 sha256=4d0d6a5302222757fb36ee21d8f8e1b3de849c2de658ab1105272f32ff78767d
 
+[http://downloads.sourceforge.net/pupnp/libupnp-1.6.5.tar.bz2]
+md5=2b0370e7c405a5bc80880085e6d7d827
+sha256=95b11e2db04c2e714c2f4fb05d9d31351d3388dababd4e1dd5300f4b0d5e8767
+
 [http://downloads.sourceforge.net/libusb/libusb-0.1.10a.tar.gz]
 md5=c6062b29acd2cef414bcc34e0decbdd1
 sha256=2f0ed0261074beaa6e060f9539c54017a3f3b4d2b272311e6cf60ba09c4aeadc
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index a66b1e4ac7..48cbb49d2c 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -57,6 +57,9 @@ 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"
+
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
 PREFERRED_PROVIDER_qemu-native = "qemu-native"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index bfac652d55..e81765d19e 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -43,7 +43,7 @@ SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
-SRCREV_pn-frameworkd ?= "5a292ced8330ace191d66fc1b655e921fa442fdf"
+SRCREV_pn-frameworkd ?= "a816e0412c687bf8e59e3505cce877f02e51f84d"
 SRCREV_pn-fso-gpsd ?= "fd1cd578d6ba9fa13aadceb59a9b46345108583b"
 SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2"
 SRCREV_pn-fstests ?= "204"
@@ -91,7 +91,7 @@ SRCREV_pn-matchbox-keyboard ?= "1910"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
-SRCREV_pn-mickeydbus ?= "19de58bbe1c80a547be35f86d315ac78a75cea2a"
+SRCREV_pn-mickeydbus ?= "a63379b41241e6529e027e7ae812628a8f1f9f0b"
 SRCREV_pn-mickeyterm ?= "19de58bbe1c80a547be35f86d315ac78a75cea2a"
 SRCREV_pn-moko-gtk-engine ?= "3612"
 SRCREV_pn-mpd-alsa ?= "6952"
@@ -191,7 +191,7 @@ SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "4067470ea4d569bae7b4161ca998645a0c9b96e7"
-SRCREV_pn-zhone ?= "2cccdc592d10c15509d974dfbba493e95a776530"
+SRCREV_pn-zhone ?= "28e01227063ab76b9144e7a443319add6b195864"
 
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.