Merge pull request #14 from anyc/master

Small fixes and improvements

classes/mkboot.bbclass

@@ -11,8 +11,10 @@ do_compile_append() {
     cd ${B}
     cp ${WORKDIR}/img_info .
     sed -i "s@%%KERNEL%%@${B}/${KERNEL_OUTPUT}@" img_info
+    sed -i "s@%%KERNEL_SIZE%%@$(stat --printf="%s" ${B}/${KERNEL_OUTPUT})@" img_info
     sed -i "s@%%RAMDISK%%@${DEPLOY_DIR_IMAGE}/initramfs-android-image-${MACHINE}.cpio.gz@" img_info
-    mkboot . boot.img
+    sed -i "s@%%RAMDISK_SIZE%%@$(stat --printf="%s" ${DEPLOY_DIR_IMAGE}/initramfs-android-image-${MACHINE}.cpio.gz)@" img_info
+    mkboot . boot.img || { echo "mkboot failed"; exit 1; }
 }
 
 do_deploy_append() {

recipes-nemomobile/timed/tzdata-timed_git.bb

@@ -11,6 +11,12 @@ PV = "+git${SRCREV}"
 S = "${WORKDIR}/git"
 B = "${S}"
 
+do_configure_append() {
+	if [ ! -x /usr/sbin/zic ] && [ -x /usr/bin/zic ]; then
+		sed -i "s,/usr/sbin/zic,/usr/bin/zic," "${S}/scripts/zone-generate.sh" "${S}/scripts/zone-list.sh"
+	fi
+}
+
 do_install() {
     export INSTALL_ROOT=${D}
     oe_runmake install

recipes-support/fuse/fuse_%.bbappend

@@ -3,4 +3,6 @@ do_install_append() {
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         rm -r ${D}${sysconfdir}/modules-load.d
     fi
+
+    echo "user_allow_other" >> ${D}${sysconfdir}/fuse.conf
 }