ostree: Update version to v2016.5

Our patches should eventually endup in the upstream repo.

Change-Id: I7680a77e3426887a41c4a377eb1ac8b782847f06
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>

9 files changed, 305 insertions, 282 deletions

diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb
index 4dbafd5..2cfa4f4 100644
--- a/recipes/ostree/ostree.bb
+++ b/recipes/ostree/ostree.bb
@@ -19,7 +19,7 @@
 ##
 ##############################################################################
 
-SUMMARY = "Tool for managing bootable, immutable, versioned filesystem trees."
+SUMMARY = "Shared library with a reference command line tool for managing bootable, immutable, versioned filesystem trees."
 
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
@@ -28,18 +28,21 @@ inherit autotools pkgconfig systemd
 
 SRC_URI = " \
     git://github.com/GNOME/ostree.git \
-    file://0001-Allow-updating-files-on-the-boot-partition.patch \
-    file://0002-u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch \
-    file://0003-Allow-updating-files-in-root-of-boot.patch \
-    file://0004-Mount-boot-partition.patch \
-    file://0005-Do-not-use-grub2-mkconfig.patch \
+    file://Fix-enable_rofiles_fuse-no-build.patch \
+    file://Mount-boot-partition.patch \
+    file://Allow-updating-files-in-the-boot-directory.patch \
+    file://u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch \
+    file://Create-firmware-convenience-symlinks.patch \
     "
 
-SRCREV = "efdb4d8f443768e59529c299290bee8b1f8f93c3"
+SRCREV = "v2016.5"
 
 S = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libgsystem libassuan xz"
+# Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image.
+# The production image do not require bash for proper working.
+RDEPENDS_${PN} += "bash"
 RRECOMMENDS_${PN} += "gnupg"
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
@@ -52,8 +55,10 @@ FILES_${PN} += "${systemd_unitdir}/system/ \
 EXTRA_OECONF = "--with-dracut \
                 --without-selinux \
                 --without-libarchive \
-                --with-grub2=no \
+                --with-builtin-grub2-mkconfig \
+                --enable-rofiles-fuse=no \
                 --enable-gtk-doc-html=no \
+                --enable-man=no \
                 --with-soup \
                 --enable-libsoup-client-certs"
 
diff --git a/recipes/ostree/ostree/0001-Allow-updating-files-on-the-boot-partition.patch b/recipes/ostree/ostree/0001-Allow-updating-files-on-the-boot-partition.patch
deleted file mode 100644
index 0905cc1..0000000
--- a/recipes/ostree/ostree/0001-Allow-updating-files-on-the-boot-partition.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From bbb7a8ce89e3e13672c63fd4f1f19988fdf40014 Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Thu, 5 Nov 2015 17:37:54 +0100
-Subject: [PATCH 1/2] Allow updating files on the boot partition
-
-Until now OSTree copied only vmlinuz and initramfs
-binaries to the boot partition. This patch adds support
-for copying other files from the /boot directory of the
-tree.
-
-How this works:
-
-Ignore subdirectories, only files in root of the boot
-directory are copied. There is overhead of copying files
-to boot partition, therefore the amount of files in the
-boot/ should be kept to the minimum and subdirectories
-shouldn't really be necessary.
-
-Files on the boot partition are updated only with major
-releases, when kernel/initramfs bootcsum changes. Files
-that require frequent updates should not be stored here.
----
- src/libostree/ostree-sysroot-deploy.c | 53 +++++++++++++++++++++++++++++++++++
- 1 file changed, 53 insertions(+)
-
-diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
-index f7afe3d..4d6534d 100644
---- a/src/libostree/ostree-sysroot-deploy.c
-+++ b/src/libostree/ostree-sysroot-deploy.c
-@@ -1340,6 +1340,59 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
-         }
-     }
- 
-+  {
-+    /* Copy other files that are stored in the boot directory. Lets keep this simple:
-+     *
-+     * - Ignore subdirectories, only files in root of the boot directory are copied. There is
-+     *   overhead of copying files to boot partition, therefore the amount of files in the boot/
-+     *   should be kept to the minimum and subdirectories shouldn't really be necessary.
-+     * - Files on the boot partition are updated only with major releases, when kernel/initramfs
-+     *   bootcsum changes. Files that require frequent updates should not be stored here.
-+     */
-+    g_autoptr(GFileEnumerator) dir_enum = NULL;
-+    g_autoptr(GFile) deployments_bootdir = g_file_get_child (deployment_dir, "boot");
-+    dir_enum = g_file_enumerate_children (deployments_bootdir, OSTREE_GIO_FAST_QUERYINFO,
-+                                          G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-+                                          NULL, error);
-+    while (TRUE)
-+      {
-+        GFileInfo *file_info = NULL;
-+        g_autoptr(GFile) source_file = NULL;
-+        g_autoptr(GFile) dest_file = NULL;
-+        g_autoptr(GFile) symlink_target = NULL;
-+        GFileType type;
-+        const char *name;
-+
-+        if (!gs_file_enumerator_iterate (dir_enum, &file_info, NULL, cancellable, error))
-+          goto out;
-+        if (file_info == NULL)
-+          break;
-+
-+        type = g_file_info_get_file_type (file_info);
-+        name = g_file_info_get_name (file_info);
-+        if (type == G_FILE_TYPE_DIRECTORY)
-+          continue;
-+        if (type == G_FILE_TYPE_SYMBOLIC_LINK)
-+          {
-+            symlink_target = g_file_get_child (bootcsumdir, g_file_info_get_symlink_target(file_info));
-+            if (!g_file_query_exists (symlink_target, NULL))
-+              continue;
-+          }
-+        if (g_str_has_prefix (name, "vmlinuz-") || g_str_has_prefix (name, "initramfs-"))
-+          continue;
-+
-+        dest_file = g_file_get_child (bootcsumdir, name);
-+        if (!g_file_query_exists (dest_file, NULL))
-+          {
-+            source_file = g_file_enumerator_get_child (dir_enum, file_info);
-+            if (!gs_file_linkcopy_sync_data (source_file, dest_file,
-+                                             G_FILE_COPY_OVERWRITE | G_FILE_COPY_NOFOLLOW_SYMLINKS | G_FILE_COPY_ALL_METADATA,
-+                                             cancellable, error))
-+              goto out;
-+          }
-+      }
-+  }
-+
-   if (fstatat (deployment_dfd, "usr/lib/os-release", &stbuf, 0) != 0)
-     {
-       if (errno != ENOENT)
--- 
-2.1.4
-
diff --git a/recipes/ostree/ostree/0003-Allow-updating-files-in-root-of-boot.patch b/recipes/ostree/ostree/0003-Allow-updating-files-in-root-of-boot.patch
deleted file mode 100644
index d93da22..0000000
--- a/recipes/ostree/ostree/0003-Allow-updating-files-in-root-of-boot.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From f5a1391e64d4b17ed05fb47f23d5d35affb9f1fd Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Thu, 5 Nov 2015 14:58:56 +0100
-Subject: [PATCH] Allow updating files in root of /boot
-
-It is common for u-boot based systems to search
-top level directory of the boot partiton for
-additional files that are required for booting.
-It can be difficult to change this search logic
-if it is hardcoded somewhere low in the stack or
-in u-boot env that is in read-only memory. To
-allow updating these files you need to add a
-symlink in your ostree sysroot:
-
-cd sysroot/boot
-ln -s loader/my-special-file my-special-file
-
-The bellow code will make sure that loader/my-special-file
-points to the correct target file version.
-
-This does not break the atomic property of update.
----
- src/libostree/ostree-bootloader-uboot.c | 65 +++++++++++++++++++++++++++++++++
- 1 file changed, 65 insertions(+)
-
-diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c
-index be1a40d..779c302 100644
---- a/src/libostree/ostree-bootloader-uboot.c
-+++ b/src/libostree/ostree-bootloader-uboot.c
-@@ -131,6 +131,71 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
-         }
-     }
- 
-+  {
-+       /* It is common for u-boot based systems to search top level directory of the boot
-+        * partiton for additional files that are required for booting. It can be difficult
-+        * to change this search logic if it is hardcoded somewhere low in the stack or in
-+        * u-boot env that is in read-only memory. To allow updating these files you need to
-+        * add a symlink in your ostree sysroot:
-+        *
-+        *    cd sysroot/boot
-+        *    ln -s loader/my-special-file my-special-file
-+        *
-+        * The bellow code will make sure that loader/my-special-file points to the correct
-+        * target file version.
-+        *
-+        */
-+       g_autoptr(GFile) child = NULL;
-+       int loader_fd;
-+       g_autoptr(GFileEnumerator) dir_enum = NULL;
-+       g_autoptr(GFile) real_boot = NULL;
-+       g_autofree char *loader_path = NULL;
-+       char buf[2048];
-+
-+       child = ot_gfile_resolve_path_printf (self->sysroot->path, "boot/loader.%d/", bootversion);
-+       loader_path = g_file_get_path(child);
-+       loader_fd = open (loader_path, O_RDONLY);
-+       if (loader_fd == -1) {
-+         perror("open");
-+         goto out;
-+       }
-+
-+       child = g_file_get_child (self->sysroot->path, "boot");
-+       dir_enum = g_file_enumerate_children (child, OSTREE_GIO_FAST_QUERYINFO,
-+                                             G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-+                                             NULL, error);
-+
-+       while (TRUE) {
-+         const char *symlink_target, *name;
-+         GFileInfo *file_info = NULL;
-+
-+         if (!gs_file_enumerator_iterate (dir_enum, &file_info, NULL, cancellable, error)) {
-+           close(loader_fd);
-+           goto out;
-+         }
-+
-+         if (file_info == NULL)
-+           break;
-+
-+         if (g_file_info_get_is_symlink(file_info)) {
-+             symlink_target = g_file_info_get_symlink_target(file_info);
-+             if (g_str_has_prefix(symlink_target, "loader/")) {
-+                 name = g_file_info_get_name(file_info);
-+                 if (g_strcmp0 (name, "uEnv.txt") == 0)
-+                    continue;
-+
-+                 snprintf(buf, sizeof(buf), "%s/%s", loader_path, name);
-+                 remove(buf);
-+                 snprintf(buf, sizeof(buf), "..%s/%s", boot_path, name);
-+                  if (symlinkat(buf, loader_fd, name) == -1)
-+                    perror("symlinkat");
-+             }
-+         }
-+       }
-+
-+       close(loader_fd);
-+   }
-+
-   ret = TRUE;
- out:
-   return ret;
--- 
-2.1.4
-
diff --git a/recipes/ostree/ostree/0005-Do-not-use-grub2-mkconfig.patch b/recipes/ostree/ostree/0005-Do-not-use-grub2-mkconfig.patch
deleted file mode 100644
index 1414ff7..0000000
--- a/recipes/ostree/ostree/0005-Do-not-use-grub2-mkconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From b613d60319beffc861f5b1faa906d2ee0c685f52 Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Wed, 24 Feb 2016 18:12:27 +0100
-Subject: [PATCH] Do not use grub2-mkconfig.
-
-For details see: https://bugzilla.gnome.org/show_bug.cgi?id=762220
----
- src/libostree/ostree-bootloader-grub2.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/libostree/ostree-bootloader-grub2.c b/src/libostree/ostree-bootloader-grub2.c
-index 1f89914..7cfb0dc 100644
---- a/src/libostree/ostree-bootloader-grub2.c
-+++ b/src/libostree/ostree-bootloader-grub2.c
-@@ -282,6 +282,8 @@ grub2_child_setup (gpointer user_data)
-     }
- }
- 
-+#define OSTREE_NO_GRUB2_MKCONFIG
-+
- static gboolean
- _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
-                                        int                    bootversion,
-@@ -300,6 +302,7 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
-   g_autoptr(GFile) config_path_efi_dir = NULL;
-   g_autofree char *grub2_mkconfig_chroot = NULL;
- 
-+#ifndef OSTREE_NO_GRUB2_MKCONFIG
-   if (ostree_sysroot_get_booted_deployment (self->sysroot) == NULL
-       && g_file_has_parent (self->sysroot->path, NULL))
-     {
-@@ -322,7 +325,7 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
-       tool_deployment_root = ostree_sysroot_get_deployment_directory (self->sysroot, tool_deployment);
-       grub2_mkconfig_chroot = g_file_get_path (tool_deployment_root);
-     }
--
-+#endif
-   if (self->is_efi)
-     {
-       config_path_efi_dir = g_file_get_parent (self->config_path_efi);
-@@ -337,9 +340,16 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
-                                                       bootversion);
-     }
- 
-+#ifdef OSTREE_NO_GRUB2_MKCONFIG
-+  procctx = gs_subprocess_context_newv ("ostree-grub-generator", "-o",
-+                                        gs_file_get_path_cached (new_config_path),
-+                                        NULL);
-+#else
-   procctx = gs_subprocess_context_newv ("grub2-mkconfig", "-o",
-                                         gs_file_get_path_cached (new_config_path),
-                                         NULL);
-+#endif
-+
-   child_env = g_environ_setenv (child_env, "_OSTREE_GRUB2_BOOTVERSION", bootversion_str, TRUE);
-   /* We have to pass our state to the child */
-   if (self->is_efi)
--- 
-2.7.0
-
diff --git a/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch b/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch
new file mode 100644
index 0000000..ffcc77c
--- /dev/null
+++ b/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch
@@ -0,0 +1,99 @@
+From 7f4549c6e94494460be06311c3a4d23ae684ab21 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
+Date: Wed, 20 Apr 2016 13:58:27 +0200
+Subject: [PATCH 1/3] Allow updating files in the /boot directory.
+
+Until now OSTree copied only the vmlinuz and initramfs
+binaries to the boot/ directory (which in some setups
+might be on a separate partition). This patch adds
+support for copying other files from the deployment's
+/boot directory to the real /boot.
+
+How this works:
+
+Ignore subdirectories, only files in root of the boot
+directory are copied. There is overhead of copying files
+to boot/, therefore the amount of files in boot/ should
+be kept to the minimum and subdirectories shouldn't
+really be necessary.
+
+Files in the boot/ directory are updated only with major
+releases, when kernel/initramfs bootcsum changes. Files
+that require frequent updates should not be stored here.
+---
+ src/libostree/ostree-sysroot-deploy.c | 52 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 52 insertions(+)
+
+diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
+index 8877236..8cf080e 100644
+--- a/src/libostree/ostree-sysroot-deploy.c
++++ b/src/libostree/ostree-sysroot-deploy.c
+@@ -1295,6 +1295,7 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
+   g_autofree char *version_key = NULL;
+   g_autofree char *ostree_kernel_arg = NULL;
+   g_autofree char *options_key = NULL;
++  g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
+   GString *title_key;
+   __attribute__((cleanup(_ostree_kernel_args_cleanup))) OstreeKernelArgs *kargs = NULL;
+   const char *val;
+@@ -1361,6 +1362,57 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
+         }
+     }
+ 
++
++  /* Copy other files that are stored in deployment's /usr/lib/ostree-boot. Lets keep this simple:
++   *
++   * - Ignore subdirectories. Only files in root of the /usr/lib/ostree-boot directory are copied.
++   *   There is an overhead of copying files to boot/, therefore the amount of files in a deployment's
++   *   usr/lib/ostree-boot should be kept to the minimum and subdirectories shouldn't really
++   *   be necessary.
++   *
++   * - Files in /boot are updated only with major releases, when kernel/initramfs
++   *   bootcsum changes. Files that require frequent updates should not be stored here.
++   */
++  if (!glnx_dirfd_iterator_init_take_fd (dup (tree_boot_dfd), &dfd_iter, error))
++    goto out;
++
++  while (TRUE)
++    {
++      struct dirent *dent;
++
++      if (!glnx_dirfd_iterator_next_dent (&dfd_iter, &dent, cancellable, error))
++        goto out;
++
++      if (dent == NULL)
++        break;
++
++      if (fstatat (dfd_iter.fd, dent->d_name, &stbuf, 0) != 0)
++        {
++          if (errno == ENOENT)
++              continue;
++          glnx_set_error_from_errno (error);
++          goto out;
++        }
++
++      if (g_str_has_prefix (dent->d_name, "vmlinuz-") || g_str_has_prefix (dent->d_name, "initramfs-")
++              || !S_ISREG(stbuf.st_mode))
++        continue;
++
++      if (fstatat (bootcsum_dfd, dent->d_name, &stbuf, 0) != 0)
++        {
++          if (errno != ENOENT)
++            {
++              glnx_set_prefix_error_from_errno (error, "fstat %s", dent->d_name);
++              goto out;
++            }
++          if (!glnx_file_copy_at (tree_boot_dfd, dent->d_name, &stbuf,
++                                  bootcsum_dfd, dent->d_name, 0,
++                                  cancellable, error))
++            goto out;
++        }
++    }
++
++
+   if (fstatat (deployment_dfd, "usr/lib/os-release", &stbuf, 0) != 0)
+     {
+       if (errno != ENOENT)
+-- 
+2.7.4
+
diff --git a/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch b/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch
new file mode 100644
index 0000000..960367c
--- /dev/null
+++ b/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch
@@ -0,0 +1,130 @@
+From 310ddd84dc353d93a2cc118725b459dba643cf0b Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
+Date: Thu, 21 Apr 2016 16:54:05 +0200
+Subject: [PATCH 3/3] Create firmware convenience symlinks.
+
+Later this could be moved into utils or a similar
+location, if other boot loader backends will need
+this functionality.
+---
+ src/libostree/ostree-bootloader-uboot.c | 97 ++++++++++++++++++++++++++++++++-
+ 1 file changed, 96 insertions(+), 1 deletion(-)
+
+diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c
+index 9bcde9c..be5e8c5 100644
+--- a/src/libostree/ostree-bootloader-uboot.c
++++ b/src/libostree/ostree-bootloader-uboot.c
+@@ -66,6 +66,100 @@ _ostree_bootloader_uboot_get_name (OstreeBootloader *bootloader)
+   return "U-Boot";
+ }
+ 
++/* It is common for firmware to search / on the boot partition for additional
++ * files that are required for booting. It can be difficult to change this search
++ * logic if it is hardcoded somewhere low in the stack or is in a read-only memory.
++ * This issue can be solved from the OS installer, by creating a symlink in the
++ * following way:
++ *
++ *    cd sysroot/boot
++ *    ln -s loader/second-stage-bootloader second-stage-bootloader
++ *
++ * This function will make sure that loader/second-stage-bootloader points to the
++ * correct target file version. This function does nothing if boot/ does not contain
++ * symlink files pointing into loader/.
++ */
++static gboolean
++create_firmware_convenience_symlinks (OstreeBootloaderUboot     *self,
++                                      char                  *bootcsum_dir,
++                                      int                    bootversion,
++                                      GCancellable          *cancellable,
++                                      GError               **error)
++{
++  gboolean ret = FALSE;
++  glnx_fd_close int loader_dfd = -1;
++  glnx_fd_close int boot_dfd = -1;
++  g_autofree char *loader_dir = NULL;
++  g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
++
++  loader_dir = g_strdup_printf ("boot/loader.%d/", bootversion);
++  if (!glnx_opendirat (self->sysroot->sysroot_fd, loader_dir, FALSE, &loader_dfd, error))
++    goto out;
++  if (!glnx_opendirat (self->sysroot->sysroot_fd, "boot", FALSE, &boot_dfd, error))
++    goto out;
++  if (!glnx_dirfd_iterator_init_take_fd (dup (boot_dfd), &dfd_iter, error))
++    goto out;
++
++  while (TRUE) {
++    struct dirent *dent;
++    struct stat stbuf;
++
++    if (!glnx_dirfd_iterator_next_dent (&dfd_iter, &dent, cancellable, error))
++      goto out;
++    if (dent == NULL)
++      break;
++
++    if (fstatat (dfd_iter.fd, dent->d_name, &stbuf, AT_SYMLINK_NOFOLLOW) != 0)
++      {
++        if (errno == ENOENT)
++          continue;
++        g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "fstatat");
++        goto out;
++      }
++
++    if (S_ISLNK(stbuf.st_mode))
++      {
++        char path_buffer[PATH_MAX];
++        g_autofree char *symlink_target = NULL;
++        symlink_target = glnx_readlinkat_malloc (boot_dfd, dent->d_name, cancellable, error);
++
++        if (g_str_has_prefix (symlink_target, "loader/"))
++          {
++            if (g_strcmp0 (dent->d_name, "uEnv.txt") == 0)
++              continue;
++
++            snprintf (path_buffer, sizeof(path_buffer), "%s/%s", bootcsum_dir, dent->d_name);
++            if (faccessat (boot_dfd, path_buffer + 1, F_OK, AT_SYMLINK_NOFOLLOW) == -1)
++              {
++                /* This bootcsum dir does not contain the final target, do nothing. */
++                if (errno == ENOENT)
++                  continue;
++                g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "faccessat");
++                goto out;
++              }
++
++            /* In case 'ostree admin cleanup' was not run after an interrupted deployment */
++            if (unlinkat (loader_dfd, dent->d_name, 0) == -1 && errno != ENOENT)
++            {
++              g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "unlinkat");
++              goto out;
++            }
++            /* Complete the link chain to the current boot file version */
++            snprintf (path_buffer, sizeof(path_buffer), "..%s/%s", bootcsum_dir, dent->d_name);
++            if (symlinkat (path_buffer, loader_dfd, dent->d_name) == -1)
++              {
++                g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "symlinkat");
++                goto out;
++              }
++          }
++      }
++  }
++
++  ret = TRUE;
++out:
++  return ret;
++}
++
+ static gboolean
+ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
+                                         int                    bootversion,
+@@ -130,7 +224,8 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
+         }
+     }
+ 
+-  ret = TRUE;
++  ret = create_firmware_convenience_symlinks (self, bootdir, bootversion, cancellable, error);
++
+ out:
+   return ret;
+ }
+-- 
+2.7.4
+
diff --git a/recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch b/recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch
new file mode 100644
index 0000000..480fc21
--- /dev/null
+++ b/recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch
@@ -0,0 +1,40 @@
+From b54643153cade28523cccee44fdddea2c94e0684 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
+Date: Mon, 25 Apr 2016 13:57:03 +0200
+Subject: [PATCH] Fix --enable_rofiles_fuse=no build
+
+---
+ Makefile.am  | 2 ++
+ configure.ac | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 488d4b6..e49b7c5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -71,7 +71,9 @@ include Makefile-otutil.am
+ include Makefile-libostree.am
+ include Makefile-ostree.am
+ include Makefile-switchroot.am
++if BUILDOPT_FUSE
+ include src/rofiles-fuse/Makefile-inc.am
++endif
+ include Makefile-tests.am
+ include Makefile-boot.am
+ include Makefile-man.am
+diff --git a/configure.ac b/configure.ac
+index dca9f53..6af60e8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -222,7 +222,7 @@ AC_ARG_ENABLE(rofiles-fuse,
+               [AS_HELP_STRING([--enable-rofiles-fuse],
+                               [generate rofiles-fuse helper [default=yes]])],,
+               enable_rofiles_fuse=yes)
+-AS_IF([ test $enable_rofiles_fuse != xno ], [
++AS_IF([ test x$enable_rofiles_fuse != xno ], [
+     PKG_CHECK_MODULES(BUILDOPT_FUSE, $FUSE_DEPENDENCY)
+ ], [enable_rofiles_fuse=no])
+ AM_CONDITIONAL(BUILDOPT_FUSE, test x$enable_rofiles_fuse = xyes)
+-- 
+2.7.4
+
diff --git a/recipes/ostree/ostree/0004-Mount-boot-partition.patch b/recipes/ostree/ostree/Mount-boot-partition.patch
index a81f731..a81f731 100644
--- a/recipes/ostree/ostree/0004-Mount-boot-partition.patch
+++ b/recipes/ostree/ostree/Mount-boot-partition.patch
diff --git a/recipes/ostree/ostree/0002-u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch b/recipes/ostree/ostree/u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch
index 08855de..501f8d4 100644
--- a/recipes/ostree/ostree/0002-u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch
+++ b/recipes/ostree/ostree/u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch
@@ -1,18 +1,24 @@
-From 5ee49772b001b9757d6cb21fcc587d5ddc66cdb7 Mon Sep 17 00:00:00 2001
+From 86184e5a266b087ba222b03141b491241e27e284 Mon Sep 17 00:00:00 2001
 From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Thu, 5 Nov 2015 17:39:16 +0100
-Subject: [PATCH 2/2] u-boot: Merge ostree's and systems uEnv.txt
+Date: Thu, 21 Apr 2016 14:28:38 +0200
+Subject: [PATCH 2/3] u-boot: Merge ostree's and systems uEnv.txt
 
-This allows for simpler u-boot scripts and is
-a proper fix for:
+This allow for simpler u-boot scripts and is a proper
+fix for: https://bugzilla.gnome.org/show_bug.cgi?id=755787
 
-https://bugzilla.gnome.org/show_bug.cgi?id=755787
+With this patch admin can now:
+
+1) Edit /usr/lib/ostree-boot/uEnv.txt
+
+2) Download the update to a target. And during the deploy
+   process OSTree will prepend its env (loader/uEnv.txt)
+   to the system's uEnv.txt
 ---
- src/libostree/ostree-bootloader-uboot.c | 42 ++++++++++++++++++++++++++++++---
- 1 file changed, 39 insertions(+), 3 deletions(-)
+ src/libostree/ostree-bootloader-uboot.c | 41 ++++++++++++++++++++++++++++++---
+ 1 file changed, 38 insertions(+), 3 deletions(-)
 
 diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c
-index f67e9bd..be1a40d 100644
+index f67e9bd..9bcde9c 100644
 --- a/src/libostree/ostree-bootloader-uboot.c
 +++ b/src/libostree/ostree-bootloader-uboot.c
 @@ -29,6 +29,10 @@
@@ -34,9 +40,9 @@ index f67e9bd..be1a40d 100644
    g_autoptr(GPtrArray) boot_loader_configs = NULL;
    OstreeBootconfigParser *config;
    const char *val;
-+  g_autofree char *boot_path = NULL;
++  g_autofree char *bootdir = NULL;
 +  g_autoptr(GFile) uenv_file = NULL;
-+  char uenv_path[2048];
++  char uenv_path[PATH_MAX];
  
    if (!_ostree_sysroot_read_boot_loader_configs (self->sysroot, bootversion, &boot_loader_configs,
                                                   cancellable, error))
@@ -54,26 +60,25 @@ index f67e9bd..be1a40d 100644
      }
    g_ptr_array_add (new_lines, g_strdup_printf ("kernel_image=%s", val));
  
-+  boot_path = strndup (val, strlen (val) - strlen ("/vmlinuz"));
-+  g_ptr_array_add (new_lines, g_strdup_printf ("bootdir=%s", boot_path));
++  bootdir = strndup (val, strrchr(val, '/') - val);
++  g_ptr_array_add (new_lines, g_strdup_printf ("bootdir=%s/", bootdir));
 +
    val = ostree_bootconfig_parser_get (config, "initrd");
    if (val)
      g_ptr_array_add (new_lines, g_strdup_printf ("ramdisk_image=%s", val));
-@@ -97,7 +108,32 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
+@@ -97,7 +108,31 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
    if (val)
      g_ptr_array_add (new_lines, g_strdup_printf ("bootargs=%s", val));
  
 -  return TRUE;
-+  /* Merge with user's uEnv.txt if it exists */
-+  snprintf (uenv_path, sizeof(uenv_path), "boot/%s/uEnv.txt", boot_path);
++  /* Append user's uEnv.txt if it exists */
++  snprintf (uenv_path, sizeof(uenv_path), "boot/%s/uEnv.txt", bootdir);
 +  uenv_file = g_file_get_child (self->sysroot->path, uenv_path);
 +  if (g_file_query_exists (uenv_file, cancellable))
 +    {
 +      g_autoptr(GInputStream) instream = NULL;
 +      g_autoptr(GDataInputStream) datastream = NULL;
 +      gsize len;
-+
 +      instream = (GInputStream*)g_file_read (uenv_file, cancellable, error);
 +      if (!instream)
 +        goto out;
@@ -95,5 +100,5 @@ index f67e9bd..be1a40d 100644
  
  static gboolean
 -- 
-2.1.4
+2.7.4