summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2016-02-11 13:00:00 +0000
committerJavier Jardón <jjardon@gnome.org>2016-02-11 13:00:00 +0000
commit214f4c83f993b5798d890f184b2fb3d2325f36c7 (patch)
tree79d56ac6f1e72107e2b7b94b092c3cf1d03c92e1
parent7ed1191df4960dc590b66d6cfda1f10beeafa433 (diff)
downloaddefinitions-214f4c83f993b5798d890f184b2fb3d2325f36c7.tar.gz
Move ModemManager to NetworkManager-common stratum
Change-Id: I9470b2759686fc012e278adb15e0cb871bbaf0db
-rw-r--r--strata/NetworkManager-common.morph20
-rw-r--r--strata/NetworkManager-common/ModemManager.morph (renamed from strata/gnome/ModemManager.morph)0
-rw-r--r--strata/gnome.morph20
3 files changed, 20 insertions, 20 deletions
diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph
index d2f9f6c4..d32b059c 100644
--- a/strata/NetworkManager-common.morph
+++ b/strata/NetworkManager-common.morph
@@ -29,3 +29,23 @@ chunks:
- libgudev
- libndp
- readline6
+- name: libmbim
+ repo: upstream:libmbim
+ ref: 6cf74ebfae1dccf807bb34d88f2cd024d4b14da7
+ unpetrify-ref: master
+ build-system: autotools
+ build-depends:
+ - libgudev
+- name: libqmi
+ repo: upstream:libqmi
+ ref: 97aaa6855d071f64ec2e28df1b9f816da02a3e07
+ unpetrify-ref: master
+ build-system: autotools
+- name: ModemManager
+ morph: strata/NetworkManager-common/ModemManager.morph
+ repo: upstream:ModemManager
+ ref: 0ca68657fbcd5bace3d303a0babe2da292784385
+ unpetrify-ref: master
+ build-depends:
+ - libmbim
+ - libqmi
diff --git a/strata/gnome/ModemManager.morph b/strata/NetworkManager-common/ModemManager.morph
index 909f6eca..909f6eca 100644
--- a/strata/gnome/ModemManager.morph
+++ b/strata/NetworkManager-common/ModemManager.morph
diff --git a/strata/gnome.morph b/strata/gnome.morph
index c99a9e8e..7198bea0 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -232,25 +232,6 @@ chunks:
build-depends:
- json-glib
build-system: autotools
-- name: libmbim
- repo: upstream:libmbim
- ref: 6cf74ebfae1dccf807bb34d88f2cd024d4b14da7
- unpetrify-ref: master
- build-system: autotools
-- name: libqmi
- repo: upstream:libqmi
- ref: 97aaa6855d071f64ec2e28df1b9f816da02a3e07
- unpetrify-ref: master
- build-system: autotools
-- name: ModemManager
- morph: strata/gnome/ModemManager.morph
- repo: upstream:ModemManager
- ref: 0ca68657fbcd5bace3d303a0babe2da292784385
- unpetrify-ref: master
- build-depends:
- - libmbim
- - libqmi
- - polkit
- name: geoclue
morph: strata/gnome/geoclue.morph
repo: upstream:geoclue
@@ -258,7 +239,6 @@ chunks:
unpetrify-ref: 2.4.0
build-depends:
- json-glib
- - ModemManager
- name: libgweather
repo: upstream:gnome/libgweather
ref: 5b8aed611f24d03434eed35e438cea213b894b7c