[gnome-builder] flatpak: move position of ostree/flatpak in deps



commit 61e17e8bcf7feb10dcc995bc157b5bdc9b5a2d2c
Author: Christian Hergert <chergert redhat com>
Date:   Mon Nov 6 13:45:37 2017 -0800

    flatpak: move position of ostree/flatpak in deps
    
    These projects change at a fairly fast pace, and nothing else depends on
    them. So let's push them towards the end of the build cycle so that we
    minimally rebuild from cachepoints in ostree.

 build-aux/flatpak/org.gnome.Builder.json |   78 +++++++++++++++---------------
 1 files changed, 39 insertions(+), 39 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index bfe039e..bc2aa78 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -86,45 +86,6 @@
             ]
         },
         {
-            "name": "ostree",
-            "config-opts": [ "--disable-man" ],
-            "cleanup": [ "/bin",
-                         "/etc/grub.d",
-                         "/etc/ostree",
-                         "/share/ostree",
-                         "/libexec" ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/ostreedev/ostree.git";
-                }
-            ]
-        },
-        {
-            "name": "flatpak",
-            "config-opts": [ "--disable-documentation",
-                             "--disable-seccomp",
-                             "--disable-sandboxed-triggers",
-                             "--disable-system-helper",
-                             "--with-system-install-dir=/var/lib/flatpak" ],
-            "cleanup": [ "/etc/profile.d",
-                         "/bin/flatpak",
-                         "/bin/flatpak-builder",
-                         "/libexec",
-                         "/lib/systemd",
-                         "/share/dbus-1/interfaces/org.freedesktop.*",
-                         "/share/dbus-1/services/org.freedesktop.*",
-                         "/share/gdm" ],
-            "post-install": [ "cp /usr/bin/update-mime-database /app/bin",
-                              "cp /usr/bin/update-desktop-database /app/bin" ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/flatpak/flatpak.git";
-                }
-            ]
-        },
-        {
             "name": "polkit",
             "config-opts": [ "--disable-polkitd", "--disable-man-pages", "--disable-introspection" ],
             "rm-configure": true,
@@ -624,6 +585,45 @@
             ]
         },
         {
+            "name": "ostree",
+            "config-opts": [ "--disable-man" ],
+            "cleanup": [ "/bin",
+                         "/etc/grub.d",
+                         "/etc/ostree",
+                         "/share/ostree",
+                         "/libexec" ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/ostreedev/ostree.git";
+                }
+            ]
+        },
+        {
+            "name": "flatpak",
+            "config-opts": [ "--disable-documentation",
+                             "--disable-seccomp",
+                             "--disable-sandboxed-triggers",
+                             "--disable-system-helper",
+                             "--with-system-install-dir=/var/lib/flatpak" ],
+            "cleanup": [ "/etc/profile.d",
+                         "/bin/flatpak",
+                         "/bin/flatpak-builder",
+                         "/libexec",
+                         "/lib/systemd",
+                         "/share/dbus-1/interfaces/org.freedesktop.*",
+                         "/share/dbus-1/services/org.freedesktop.*",
+                         "/share/gdm" ],
+            "post-install": [ "cp /usr/bin/update-mime-database /app/bin",
+                              "cp /usr/bin/update-desktop-database /app/bin" ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/flatpak/flatpak.git";
+                }
+            ]
+        },
+        {
             "name": "gnome-builder",
             "buildsystem": "meson",
             "builddir": true,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]