summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2016-07-01 12:36:47 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-07-01 19:17:50 (GMT)
commitf23ba1208ff3f30e646b9b759a4ca240f26d9794 (patch)
treec476902d6c1e5d9ce885e2fbd0c0cff032a957bd
parent58e7fd1bbf50943dfcf2f857fc9eb05ded8663b2 (diff)
downloaddefinitions-f23ba1208ff3f30e646b9b759a4ca240f26d9794.tar.gz
Update xdg-app -> flatpak
Change-Id: I0a281f931d469837a5b0bfb54bbd930eb186ffb0
-rw-r--r--strata/flatpak-common.morph (renamed from strata/xdg-app-common.morph)15
-rw-r--r--strata/flatpak-common/elfutils.morph (renamed from strata/xdg-app-common/elfutils.morph)0
-rw-r--r--strata/flatpak-common/flatpak.morph (renamed from strata/xdg-app-common/xdg-app.morph)2
-rw-r--r--systems/gnome-system-armv7lhf-jetson.morph4
-rw-r--r--systems/gnome-system-x86_64.morph4
5 files changed, 13 insertions, 12 deletions
diff --git a/strata/xdg-app-common.morph b/strata/flatpak-common.morph
index 0cbe8c2..a3540a0 100644
--- a/strata/xdg-app-common.morph
+++ b/strata/flatpak-common.morph
@@ -1,19 +1,20 @@
-name: xdg-app-common
+name: flatpak-common
kind: stratum
build-depends:
- morph: strata/ostree-core.morph
+- morph: strata/privileges-management.morph
- morph: strata/x-common.morph
chunks:
- name: elfutils
- morph: strata/xdg-app-common/elfutils.morph
+ morph: strata/flatpak-common/elfutils.morph
repo: upstream:elfutils
ref: 9b4bce40709611875754cf4931eb91d394042122
unpetrify-ref: elfutils-0.165
-- name: xdg-app
- morph: strata/xdg-app-common/xdg-app.morph
- repo: upstream:xdg-app
- ref: 619e1f1025851179dee3e616000e5de2ccde9412
- unpetrify-ref: 0.5.1
+- name: flatpak
+ morph: strata/flatpak-common/flatpak.morph
+ repo: upstream:flatpak
+ ref: c741200fa5e22199dc88104bdb73da4583cc8c00
+ unpetrify-ref: 0.6.5
build-depends:
- elfutils
submodules:
diff --git a/strata/xdg-app-common/elfutils.morph b/strata/flatpak-common/elfutils.morph
index 4570725..4570725 100644
--- a/strata/xdg-app-common/elfutils.morph
+++ b/strata/flatpak-common/elfutils.morph
diff --git a/strata/xdg-app-common/xdg-app.morph b/strata/flatpak-common/flatpak.morph
index 87b205e..e052c2a 100644
--- a/strata/xdg-app-common/xdg-app.morph
+++ b/strata/flatpak-common/flatpak.morph
@@ -1,4 +1,4 @@
-name: xdg-app
+name: flatpak
kind: chunk
build-system: autotools
configure-commands:
diff --git a/systems/gnome-system-armv7lhf-jetson.morph b/systems/gnome-system-armv7lhf-jetson.morph
index c64b03f..df82e80 100644
--- a/systems/gnome-system-armv7lhf-jetson.morph
+++ b/systems/gnome-system-armv7lhf-jetson.morph
@@ -67,8 +67,8 @@ strata:
morph: strata/x-generic.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: xdg-app-common
- morph: strata/xdg-app-common.morph
+- name: flatpak-common
+ morph: strata/flatpak-common.morph
- name: network-security
morph: strata/network-security.morph
- name: icu-common
diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph
index 431da3b..3a53ab8 100644
--- a/systems/gnome-system-x86_64.morph
+++ b/systems/gnome-system-x86_64.morph
@@ -75,8 +75,8 @@ strata:
morph: strata/x-generic.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: xdg-app-common
- morph: strata/xdg-app-common.morph
+- name: flatpak-common
+ morph: strata/flatpak-common.morph
- name: network-security
morph: strata/network-security.morph
- name: icu-common