2 files changed, 77 insertions, 13 deletions

diff --git a/README b/README
index db88066..c1321a3 100644
--- a/README
+++ b/README
@@ -36,7 +36,12 @@ Contents:
     2.E. Set overclocking options
 3. Extra apps
     3.A. omxplayer
-4. Contribution
+4. Source code and mirrors
+5. Contribution
+    5.A. Mailing List
+    5.B. Gerrit Review Server
+    5.C. Trello Board
+6. Maintainers
 
 
 
@@ -109,9 +114,11 @@ How to use it:
 2.A. Optional - compressed deployed files:
 ==========================================
 1. Overwrite IMAGE_FSTYPES in local.conf
-        IMAGE_FSTYPES = "tar.bz2 ext3.xz rpi-sdimg.xz
+        IMAGE_FSTYPES = "tar.bz2 ext3.xz"
 2. Overwrite SDIMG_ROOTFS_TYPE in local.conf
         SDIMG_ROOTFS_TYPE = "ext3.xz"
+3. Overwrite SDIMG_COMPRESSION in local.conf
+        SDIMG_COMPRESSION = "xz"
 *Accommodate the values above to your own needs (ex: ext3 / ext4).
 
 2.B. Optional - GPU memory:
@@ -163,27 +170,64 @@ adding to you local.conf:
 LICENSE_FLAGS_WHITELIST = "commercial"
 
 
-4. Contributing
+4. Source code and mirrors
+==========================
+
+Main repo:
+    git://git.yoctoproject.org/meta-raspberrypi
+    http://git.yoctoproject.org/git/meta-raspberrypi
+
+Github mirror:
+    https://github.com/djwillis/meta-raspberrypi
+
+Gerrit review repo:
+    https://review.gherzan.ro:8443/meta-raspberrypi
+
+
+5. Contributing
 ===============
 
+5.A. Mailing list
+=================
 To contribute to this layer you should send the patches for review to the
 mailing list.
 
 Mailing list:
-
     https://lists.yoctoproject.org/listinfo/yocto
 
-Source code:
+To send changes to mailing list use something like:
+    git send-email --to yocto@yoctoproject.org \
+    --subject-prefix='meta-raspberrypi][PATCH'
 
-    git://git.yoctoproject.org/meta-raspberrypi
-    http://git.yoctoproject.org/git/meta-raspberrypi
-    https://github.com/djwillis/meta-raspberrypi
+OPTIONALLY push changes to gerrit (help maintainers merge and review patches
+easier in this way).
+    git push ssh://<username>@review.gherzan.ro:29418/meta-raspberrypi
+    <local-branch>:refs/for/master
+    See 5.B. Gerrit Review Server.
 
-When sending patches, please use something like:
+5.B. Gerrit Review Server
+=========================
+We have a gerrit server configured at review.gherzan.ro. Changes made in gerrit
+are merged in git.yoctoproject.org/meta-raspberrypi.
 
-git send-email --to yocto@yoctoproject.org \
---subject-prefix='meta-raspberrypi][PATCH'
+You can setup a gerrit account in less than 2 minutes:
+A) Login / Register on https://review.gherzan.ro:8443.
+B) Add your PUBLIC key in Settings/SSH Public Keys.
+C) Add remote in your local repo:
+    git remote add gherzan ssh://<username>@review.gherzan.ro:29418/meta-raspberrypi
+D) Push changes to gerrit using:
+    git push gherzan <local-branch>:refs/for/master
 
+Please check your spam folder for gerrit messages. Sometimes they end up there.
+
+5.C. Trello Board
+=================
+A public Trello board is set to manage tasks and bugs. Join us there:
+    https://trello.com/b/QsYeVjVe/meta-raspberrypi
+
+
+6. Maintainers
+==============
 
-Layer maintainers: John Willis <John.Willis at distant-earth.com>
-                   Andrei Gherzan <andrei at gherzan.ro>
+    John Willis <John.Willis at distant-earth.com>
+    Andrei Gherzan <andrei at gherzan.ro>
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index a2fcd52..3ee4e94 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -50,6 +50,13 @@ IMAGE_DEPENDS_rpi-sdimg = " \
 # SD card image name
 SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg"
 
+# Compression method to apply to SDIMG after it has been created. Supported
+# compression formats are "gzip", "bzip2" or "xz". The original .rpi-sdimg file
+# is kept and a new compressed file is created if one of these compression
+# formats is chosen. If SDIMG_COMPRESSION is set to any other value it is
+# silently ignored.
+#SDIMG_COMPRESSION ?= ""
+
 # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS.
 FATPAYLOAD ?= ""
 
@@ -107,6 +114,19 @@ IMAGE_CMD_rpi-sdimg () {
         else
                 dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
         fi
+
+        # Optionally apply compression
+        case "${SDIMG_COMPRESSION}" in
+        "gzip")
+                gzip -k9 "${SDIMG}"
+                ;;
+        "bzip2")
+                bzip2 -k9 "${SDIMG}"
+                ;;
+        "xz")
+                xz -k "${SDIMG}"
+                ;;
+        esac
 }
 
 ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; "