11 files changed, 88 insertions, 29 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 0095cc969d..b97dbabc7e 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5290,6 +5290,10 @@ sha256=eb20cb028176e52432a2b877b2e292100dc41b384e829bc9e6d4823075ed8188
 md5=dd627a121e43835bead3ffef5b1a72fd
 sha256=f435e14e1f54dc8792f4e655463d07f2bdbe6d8a8581bd62f5167334ab18bb87
 
+[http://www.gentoo.com/di/di-4.17.tar.gz]
+md5=be55b3a1693b318effa3db8d1c0243c1
+sha256=46e124670fb2b63cb7500a8b36b7856c15858cb35658263ddad4933935d5e210
+
 [ftp://ftp.gnome.org/pub/gnome/sources/dia/0.95/dia-0.95-pre3.tar.gz]
 md5=642f7e7d4c71dc144b60f51f9d65de62
 sha256=902da1b1e9d90dfda8aa1864846db8ad12386e7521fc9f8b18c8ba220dd0123a
@@ -8226,6 +8230,10 @@ sha256=666ba1186b2697c3a99ee943775fbc7a7aa18f3c8cc3d335a2581dea62f812bf
 md5=2dc76415b22d805cfacfcd5fb98f185c
 sha256=2801ff7d595039292850d4f7d87b3f7c950e92dbcb39facfe62c6fb184640e1f
 
+[http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.28/gconfmm-2.28.0.tar.bz2]
+md5=dad2999d8bbf88cf581fa512041d735e
+sha256=3daa3719f773cfc9fcee84766f60eab4579209978425221997120662bd621a52
+
 [http://www.boutell.com/gd/http/gd-2.0.21.tar.gz]
 md5=3134158635f5048dba99281c6b712a54
 sha256=c3b8b7b57019927dad40870c379eecfa6389443f7e2096aa0157a0224d400da1
@@ -10618,6 +10626,10 @@ sha256=c9ef8c2f61bbe9978b38341ca2bf09786416ddd82d4708066a26a0483341ca72
 md5=bcc5621e09802e114c7f72a6f6172230
 sha256=68cd94664882fdab5fa781b4b8fabe1ac49db7d97bdf3aa917563439afa9b9b6
 
+[http://downloads.sourceforge.net/gphoto/gphoto2-2.4.7.tar.bz2]
+md5=a0bd7629040735f16e510b63edf386dd
+sha256=16e21ab5387220ad885e1d27f936f3add4081d15a1039577002682be521b2c03
+
 [http://downloads.sourceforge.net/lxde/gpicview-0.1.5.tar.gz]
 md5=5c484ea089f5a6455265e1e1f472240e
 sha256=7663e1849f3b1f2225a3310f907f86068d7ac5c8957d68fc4a684059b49211ca
@@ -15154,6 +15166,10 @@ sha256=f319655b272186ad76ab73317b7e8c5e3b87d51c1265ce676f02e8c312745226
 md5=8aff5ac4ca72cba17de633078cf1612e
 sha256=2582362ae318b62c31832edfcaf401397fcc98fd307347ee15babff94770784d
 
+[http://downloads.sourceforge.net/gphoto/libgphoto2-2.4.7.tar.bz2]
+md5=3c1f1b1e56214e83b97e2bc7aadba4c5
+sha256=9e7613f21ac3dd7cf1decbab5c47c1e9a16d39c32062d7f8632adb4fc8d0271f
+
 [http://kent.dl.sourceforge.net/sourceforge/gtkpod/libgpod-0.6.0.tar.gz]
 md5=b44d8aee3f6610370b6faf61770c5f3c
 sha256=a2c8c998588361d8aaa4c662a38f50db164b8b4fce4e7bc49ac445a9ac87f80f
@@ -15678,6 +15694,10 @@ sha256=920fa2a0924d66884825d36a2e843de069cfdf1af01945d05da25999bbd6396c
 md5=eaf7dc6ebbff30975de7527a80831585
 sha256=bae29e79fbc50bbedf1235852094b71c8c910a1ef0cd42fe4163b7b545630b65
 
+[http://downloads.xiph.org/releases/ogg/libogg-1.1.4.tar.gz]
+md5=10200ec22543841d9d1c23e0aed4e5e9
+sha256=9354c183fd88417c2860778b60b7896c9487d8f6e58b9fec3fdbf971142ce103
+
 [http://www.vorbis.com/files/1.0.1/unix/libogg-1.1.tar.gz]
 md5=461d7097bf47864b872085a94ff94e10
 sha256=01453d561255b5fcb361997904752860e4f8c6b9742f290578a44615fcc94356
@@ -16322,6 +16342,10 @@ sha256=3ae9df56e8fc75ffe26e63a13cae2ce79d079416175fb0baffe0e2de8dc91a6d
 md5=55ee3c6db3e0927e7918309891a8f52b
 sha256=f5c7730ded0273a8615b12b46a32b800bbcb9e861e3a18aa92b1c062981a2fef
 
+[http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2]
+md5=292ab65cedd5021d6b7ddd117e07cd8e
+sha256=b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc
+
 [http://downloads.sourceforge.net/tilp/libticables-3.9.2.tar.gz]
 md5=354675bfbd881082a9447efde9935226
 sha256=1c091859f09d5a38c76f0d64a93db46aa2b5d637c8a7370d348f21e7be324c37
@@ -16578,9 +16602,13 @@ sha256=20b3cbdb4b05322d470404a7d2e8cdae1e0ce5372113218ae3cada3b29da70f7
 md5=478646358c49f34aedcce58948793619
 sha256=6eb7040048e35448fe224fa3fd993eb4e49a905c57893886082f1674d43b0e73
 
+[http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.3.tar.gz]
+md5=5aa77f55c0e0aab8eb8ed982335daac8
+sha256=c679d1e5e45a3ec8aceb5e71de8e3712630b7a6dec6952886c17435a65955947
+
 [http://downloads.sourceforge.net/libwbxml/libwbxml-0.10.7.tar.gz]
-md5=ef3e66df3c4223ce5ce0a70ded5c5221
-sha256=24112231e70c21f90348cefeea362de36aa7bace4088355efcbf4efe0dd242d0
+md5=5aa77f55c0e0aab8eb8ed982335daac8
+sha256=c679d1e5e45a3ec8aceb5e71de8e3712630b7a6dec6952886c17435a65955947
 
 [http://downloads.sourceforge.net/libwiimote/libwiimote-0.4.tgz]
 md5=0d8d61dc989d8ad83e1005a26136d388
@@ -20710,6 +20738,10 @@ sha256=bf26ebe42c12c81e5c32ceca80ff226a01c8d80d4db2a4cc3463d5bf241b095e
 md5=129f8623dc4f70188a015e3cbd7eae82
 sha256=74188aff5f2e5b77515a8cf3979199a598d58da8e4f573462b59cbf94cf1c99d
 
+[http://0pointer.de/lennart/projects/paprefs/paprefs-0.9.9.tar.gz]
+md5=0592ccb28c8f601a8fe3607b64e9f5bc
+sha256=1237939f0cea478ecd51452e817e08877e914c919239fcb63aa2471a389769a9
+
 [ftp://ftp.gnu.org/gnu/parted/parted-1.6.23.tar.gz]
 md5=7e46a32def60ea355c193d9225691742
 sha256=5144f413dcce1a0b94263ebf3730f2a2afe6a9557bf261f9d6f48c890423f4c8
@@ -23974,6 +24006,10 @@ sha256=5cd5d9c06281a4f81d85d9a9f9b0410045d4a764a855f06f574183b528c15d1a
 md5=30a82ad466bae223875e66ee14b94904
 sha256=5cd5d9c06281a4f81d85d9a9f9b0410045d4a764a855f06f574183b528c15d1a
 
+[http://downloads.sourceforge.net/scummvm/scummvm-1.0.0.tar.bz2]
+md5=11b911937e0fc73c94a7bdc374ab617c
+sha256=920932b9d0cfca019f35c2451d93d94ca3b9f981f0b82c418bfbc864fb8c00ec
+
 [ftp://ftp.debian.org/debian/pool/main/s/scw/scw_0.4.3.orig.tar.gz]
 md5=4c9fb66fa496cf32542e92f32f821818
 sha256=fca3763b05f064728c9ff248fa0766808d1ceae561b88ad202811924e4ccdb45
@@ -27614,6 +27650,10 @@ sha256=f95a9a9e477128aae536669dedd79f4e7b4d469072565695289e4bbb5b36dd63
 md5=1f2670865d43a23a9abc596dde999aca
 sha256=8c89dbf36304b99363a7f090d695447653102b4528ca2aa367a2abe5cff1746d
 
+[http://downloads.sourceforge.net/xclip/xclip-0.12.tar.gz]
+md5=f7e19d3e976fecdc1ea36cd39e39900d
+sha256=b7c7fad059ba446df5692d175c2a1d3816e542549661224806db369a0d716c45
+
 [http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.0.1.tar.bz2]
 md5=2c6ecedb10dc51adbb64c95f22fd99c2
 sha256=3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 0e1f39a7a6..c9fc16365b 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -23,7 +23,7 @@
 #DISTRO_VERSION = "2009.X"
 DISTRO_VERSION = "2009.X-test-${DATE}"
 DISTRO_REVISION = "3"
-DISTRO_PR = ".4"
+DISTRO_PR = ".5"
 
 OLDEST_KERNEL ?= "2.6.16"
 
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index ba8cdac1f5..70f8f9019b 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -2,9 +2,11 @@
 SRCREV_pn-dbus-hlid = "${AUTOREV}"
 SRCREV_pn-frameworkd = "${AUTOREV}"
 SRCREV_pn-frameworkd-devel = "${AUTOREV}"
+SRCREV_pn-fsodatad = "${AUTOREV}"
 SRCREV_pn-fsodeviced = "${AUTOREV}"
 SRCREV_pn-fsogsmd = "${AUTOREV}"
-SRCREV_pn-fsogpsd = "${AUTOREV}"
+SRCREV_pn-fsolocationd = "${AUTOREV}"
+SRCREV_pn-fsomusicd = "${AUTOREV}"
 SRCREV_pn-fsonetworkd = "${AUTOREV}"
 SRCREV_pn-fsotimed = "${AUTOREV}"
 SRCREV_pn-fsousaged = "${AUTOREV}"
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 5970f2da14..f4ddf2fa25 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -1,22 +1,29 @@
 # Upgraded
 # use newer version then preferred by default
-PREFERRED_VERSION_boost ?= "1.40.0"
-PREFERRED_VERSION_dbus ?= "1.3.0"
+PREFERRED_VERSION_boost = "1.40.0"
+PREFERRED_VERSION_dbus = "1.3.0"
 PREFERRED_VERSION_autoconf = "2.63"
 PREFERRED_VERSION_autoconf-native = "2.63"
-PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2"
-PREFERRED_VERSION_mtd-utils-native ?= "1.2.0+git"
-PREFERRED_VERSION_strace ?= "4.5.15"
+PREFERRED_VERSION_libmikmod = "3.2.0-beta2"
+PREFERRED_VERSION_mtd-utils-native = "1.2.0+git"
+PREFERRED_VERSION_strace = "4.5.15"
 
 # We need this for jamvm
-PREFERRED_VERSION_classpath ?= "0.98"
-PREFERRED_VERSION_classpath-native ?= "0.98"
+PREFERRED_VERSION_classpath = "0.98"
+PREFERRED_VERSION_classpath-native = "0.98"
 
 # we need new headers for libc, now OLDEST_KERNEL_linux-gnueabi = "2.6.24"
-PREFERRED_VERSION_linux-libc-headers = "2.6.29"
+# and 2.6.31 for fsodeviced
+PREFERRED_VERSION_linux-libc-headers = "2.6.31"
 
 # override EFL_SRCREV from sane-srcrevs.inc
-EFL_SRCREV ?= "43898"
+# now is EFL_SRCREV newer in sane-srcrevs.inc
+# EFL_SRCREV ?= "43898"
+
+# specifically set an openssh version
+# NOTE: whenever changing the version here make sure
+#       to check we won't loose our specific config !!!
+PREFERRED_VERSION_openssh = "5.2p1"
 
 # upgrades used in Angstrom
 PREFERRED_VERSION_gtk+          = "2.18.3"
@@ -32,4 +39,4 @@ UDEV_GE_141 = "1"
 
 # Downgraded
 # python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py
-PREFERRED_VERSION_python-pygtk ?= "2.10.4"
+PREFERRED_VERSION_python-pygtk = "2.10.4"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index bc9dfc6a45..f99b44945c 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -3,9 +3,11 @@
 # FSO Projects -- Cornucopia
 FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226"
 SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodeviced ?= "690dc75efcc8e4dbcb53e361d48c54e104955921"
+SRCREV_pn-fsodatad ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2"
+SRCREV_pn-fsodeviced ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2"
 SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsomusicd ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2"
 SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsousaged ?= "fe2ec3260b73233c414de584aa1b4a5e49c24a0d"
@@ -17,7 +19,7 @@ SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
 # FSO Projects -- Misc
 SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb"
 SRCREV_pn-frameworkd ?= "d48bd43c430322b26744e31829f9c76e9b725819"
-SRCREV_pn-frameworkd-config-shr_FSO_REV = ${SRCREV_pn-frameworkd}
+SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd}
 SRCREV_pn-fso-abyss ?= "7f271311e2e0b63235139859169bd248920ade30"
 SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d"
 SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3dee57ca73..44db698ecf 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -80,7 +80,7 @@ SRCREV_pn-ffalarms ?= "67"
 SRCREV_pn-flashrom ?= "3682"
 SRCREV_pn-fltk2 ?= "6671"
 SRCREV_pn-frameworkd-config-shr ?= "cb4159e653d770da8e8f9fc9a65135839533d4c5"
-SRCREV_pn-frameworkd-config-shr_SHR_REV = ${SRCREV_pn-frameworkd-config-shr}
+SRCREV_pn-frameworkd-config-shr_SHR_REV ?= ${SRCREV_pn-frameworkd-config-shr}
 SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b"
 SRCREV_pn-fsoraw ?= "20"
 SRCREV_pn-fstests ?= "204"
@@ -162,7 +162,7 @@ SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1089"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
-SRCREV_pn-linux-openmoko-2.6.28 ?= "8aa6cdde17381dd8865d10ba15ee62c092ec2ba5"
+SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
 SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9"
 SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12"
 SRCREV_pn-linux-openmoko-shr-devel ?= "b90406de472c1aa5371ab593a2bb79136d5de658"
@@ -198,8 +198,10 @@ SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
 SRCREV_pn-navit ?= "1096"
 SRCREV_pn-neod ?= "4617"
+SRCREV_pn-neomis ?= "2"
 SRCREV_pn-net-snmp ?= "17367"
 SRCREV_pn-netsurf ?= "3859"
+SRCREV_pn-numberx ?= "3"
 SRCREV_pn-numptyphysics ?= "109"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-ohm ?= "edfe25d49d67884bf004de7ae0724c162bb5e65e"
@@ -256,9 +258,9 @@ SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
 SRCREV_pn-opimd-utils ?= "0e7007fff120c8cc4c579c0c7e57883798e6d23e"
-SRCREV_pn-opkg ?= "363"
-SRCREV_pn-opkg-native ?= "240"
-SRCREV_pn-opkg-sdk ?= "363"
+SRCREV_pn-opkg ?= "402"
+SRCREV_pn-opkg-native ?= "402"
+SRCREV_pn-opkg-sdk ?= "402"
 SRCREV_pn-opkg-utils ?= "4578"
 SRCREV_pn-opkg-utils-native ?= "4595"
 SRCREV_pn-oprofileui ?= "173"
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index 99cab2bcbb..7ab7b35d20 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -62,12 +62,11 @@ PREFERRED_VERSION_glibc = "2.3.3"
 PREFERRED_VERSION_glibc-initial = "2.3.2"
 PREFERRED_VERSION_shorewall = "2.0.9-monolithic"
 PREFERRED_VERSION_ppp-dsl = "0.1-monolithic"
-PREFERRED_VERSION_mtd-utils = "1.0.0+git"
+PREFERRED_VERSION_mtd-utils = "1.1.0"
 PREFERRED_VERSION_kismet = "2005-01-R1"
-PREFERRED_VERSION_automake-native = "1.10"
+PREFERRED_VERSION_automake-native = "1.10.2"
 PREFERRED_VERSION_pkgconfig-native = "0.23"
 PREFERRED_VERSION_netperf = "2.3"
-PREFERRED_PROVIDER_hotplug = "linux-hotplug"
 
 PREFERRED_VERSION_gcc-cross-initial = "3.3.4"
 PREFERRED_VERSION_gcc-cross-intermediate = "3.3.4"
@@ -83,3 +82,8 @@ PREFERRED_VERSION_prism54-firmware = "1.0.3.0"
 PREFERRED_VERSION_udev = "100"
 PREFERRED_VERSION_madwifi-modules = "0.9.3"
 PREFERRED_VERSION_madwifi-tools = "0.9.3"
+PREFERRED_VERSION_e2fsprogs-libs = "1.41.8"
+PREFERRED_VERSION_dbus = "1.2.1"
+
+PREFERRED_PROVIDER_hotplug = "linux-hotplug"
+PREFERRED_PROVIDER_opkg = "opkg-nogpg"
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 5b0b29a175..2a33427e30 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -29,6 +29,8 @@ DISTRO_PR = ".4"
 DISTRO_TYPE = "debug"
 DISTRO = "shr"
 
+DISTRO_SSH_DAEMON = "openssh"
+
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
 ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index baae3ff327..ceafa800b2 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r11"
+MACHINE_KERNEL_PR = "r12"
 
 TARGET_ARCH = "arm"
 
@@ -15,7 +15,7 @@ UBOOT_MACHINE = "davinci_dvevm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-#EXTRA_IMAGEDEPENDS += "u-boot ubl"
+EXTRA_IMAGEDEPENDS += "u-boot"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index f91607cf76..2d48c8b7d6 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,7 @@ USE_DEVFS = "0"
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
 
-MACHINE_KERNEL_PR = "r12"
+MACHINE_KERNEL_PR = "r13"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index d47320e59d..5fc96ec4ed 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -51,7 +51,7 @@ USE_VT = "0"
 # used by some images
 ROOT_FLASH_SIZE = "256"
 
-IMAGE_FSTYPES += "tar.gz jffs2 ubifs"
+IMAGE_FSTYPES += "tar.gz jffs2 ubifs ubi"
 
 # extra jffs2 tweaks
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \