merge of '038f91aa279cf1b9a1f4f7bd7988f3768ee86ff0'

     and '56dd632a3a9de2d8f4b9d335e96a43648c9cd3bd'

5 files changed, 30 insertions, 12 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b4e526b61b..ce7c9adf7b 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -9690,9 +9690,9 @@ sha256=ab7c305be32708c4ede670e13783b718e6a28e35b5495e6c42c31c35a8b512a6
 md5=18c05d88e22c3b815a43ca8d7152ccdc
 sha256=8dd9dd61a0fe56904f5b76ddedb99bd359abaaf486e0b83b45e3357fecc81063
 
-[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.1.tar.gz]
-md5=bc6f32759db02cf32a83640d74fb9993
-sha256=cfa9b2d0f9b87a7a524abe149e7207adf86c077749c907342df63126a7ec292d
+[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.2.tar.gz]
+md5=54935c6cff42df2f1daada267b701392
+sha256=18f0e2df191219c29b47dc12b4b06b5be7eaeef34b3436156547e5a9f4eb51c1
 
 [http://www2.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz]
 md5=85b6a42a9e17a23c01b2f2ed0ece0563
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index f41c667d25..8a84984a4d 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.4"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "42"
+DISTRO_REVISION = "43"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -139,6 +139,7 @@ PREFERRED_VERSION_freetype = "2.3.3"
 PREFERRED_VERSION_freetype-native = "2.2.1"
 PREFERRED_VERSION_cairo = "1.4.4"
 PREFERRED_VERSION_glib-2.0 = "2.12.12"
+PREFERRED_VERSION_pango = "1.16.4"
 
 # older gtk-webcore releases don't work on ARM/EABI
 # We need to switch to a fixed SRCDATE or release as soon as possible 
diff --git a/conf/documentation.conf b/conf/documentation.conf
index 4782a053ba..b92c14f7f0 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -115,19 +115,19 @@ BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure."
 SEPPUKU_AUTOBUILD[doc] = "This is an autobuild, broken packages are cleaned automatically. Don't define this at all if this is not an autobuild"
 SEPPUKU_USER[doc]     = "The login-name for the bugzilla account"
 SEPPUKU_PASS[doc]     = "The password for this account"
-#SEPPUKU_LOGIN         = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/query.cgi?"
+#SEPPUKU_LOGIN         = "http://bugs.openembedded.org/query.cgi?"
 SEPPUKU_LOGIN[doc]    = "path to the login script of the bugzilla, note the ? at the end"
-#SEPPUKU_QUERY         = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/buglist.cgi"
+#SEPPUKU_QUERY         = "http://bugs.openembedded.org/buglist.cgi"
 SEPPUKU_QUERY[doc]    = "The query script of the bugzilla"
-#SEPPUKU_NEWREPORT     = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Neo1973&"
+#SEPPUKU_NEWREPORT     = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
 SEPPUKU_NEWREPORT[doc]= "This is the url used to create a new bug report, note the defaults for version and priority and more, and the trailing &"
-#SEPPUKU_ADDCOMMENT     = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&longdesclength=2&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Neo1973&target_milestone=Phase+0&"
+#SEPPUKU_ADDCOMMENT     = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&longdesclength=2&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
 SEPPUKU_ADDCOMMENT[doc]= "The url used to reopen bug reports and to add another new comment"
-#SEPPUKU_ATTACHMENT = "http:/bugzilla.openmoko.org/cgi-bin/bugzilla/attachment.cgi"
+#SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi"
 SEPPUKU_ATTACHMENT[doc] = "The url used to create attachments."
 
 
-#SEPPUKU_PRODUCT       = "OpenMoko"
+#SEPPUKU_PRODUCT       = "Openembedded"
 SEPPUKU_PRODUCT[doc]  = "The product inside the bugtracker"
-#SEPPUKU_COMPONENT     = "autobuilds"
+#SEPPUKU_COMPONENT     = "build"
 SEPPUKU_COMPONENT[doc]= "The component inside the bugtracker"
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index f10797bbaf..c479075285 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -9,7 +9,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-gta01"
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone"
 
 MACHINE_EXTRA_RDEPENDS = "alsa-state"
 
diff --git a/conf/machine/wgt634u.conf b/conf/machine/wgt634u.conf
new file mode 100644
index 0000000000..1b4eeafbe3
--- /dev/null
+++ b/conf/machine/wgt634u.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: Netgear wgt634u wireless router  
+#@DESCRIPTION: Machine configuration for the MIPS based wgt634u devices
+
+TARGET_ARCH = "mipsel"
+MACHINE_FEATURES = "kernel26 usbhost wifi ext2"
+
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-brcm"
+
+IMAGE_FSTYPES = "tar.gz squashfs-lzma jffs2"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --squash --eraseblock=0x10000 -n" 
+
+EXTRA_IMAGECMD_squashfs-lzma = "-nopad -root-owned -le"
+
+