summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-10-01 19:00:09 +0100
committerJavier Jardón <jjardon@gnome.org>2014-10-01 19:02:19 +0100
commitf1da7ace54bed18c5c7eac5242ec84d4ca81c55d (patch)
tree71f4e0f337e8c57d13f41e1ce2f521981cae61d8
parent93ea7bf4ca153970134968c8034b5e25168998f9 (diff)
parent584e20d85333604eb51aa80304950c247ec3f639 (diff)
downloaddefinitions-f1da7ace54bed18c5c7eac5242ec84d4ca81c55d.tar.gz
Merge remote-tracking branch 'gitorious/jjardon/NetworkManager'
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
-rw-r--r--strata/NetworkManager-common.morph18
-rw-r--r--strata/NetworkManager-common/NetworkManager.morph5
-rw-r--r--strata/connectivity.morph7
-rw-r--r--strata/connman-common.morph11
-rw-r--r--strata/connman-common/connman.morph (renamed from strata/connectivity/connman.morph)0
-rw-r--r--strata/enlightenment.morph2
-rw-r--r--strata/virtualization.morph2
-rw-r--r--systems/devel-system-x86_64-vagrant.morph2
-rw-r--r--systems/genivi-baseline-system-armv7lhf-versatile.morph2
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.morph2
-rw-r--r--systems/gitlab-ci-runner.morph2
-rw-r--r--systems/nodejs-system-x86_64.morph2
-rw-r--r--systems/qt4-devel-system-x86_64-generic.morph2
-rw-r--r--systems/qt5-devel-system-x86_64-generic.morph2
-rw-r--r--systems/xfce-system.morph2
15 files changed, 52 insertions, 9 deletions
diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph
new file mode 100644
index 00000000..7233d84f
--- /dev/null
+++ b/strata/NetworkManager-common.morph
@@ -0,0 +1,18 @@
+name: NetworkManager-common
+kind: stratum
+build-depends:
+- morph: strata/audio-bluetooth.morph
+- morph: strata/network-security.morph
+- morph: strata/connectivity.morph
+chunks:
+- name: libndp
+ repo: upstream:libndp
+ ref: master
+ build-depends: []
+- name: NetworkManager
+ morph: strata/NetworkManager-common/NetworkManager.morph
+ repo: upstream:NetworkManager
+ ref: 6eb82acd6dce882f4b91aafcf68dd9e143ce34e2
+ unpetrify-ref: 0.9.10
+ build-depends:
+ - libndp
diff --git a/strata/NetworkManager-common/NetworkManager.morph b/strata/NetworkManager-common/NetworkManager.morph
new file mode 100644
index 00000000..9840dfa4
--- /dev/null
+++ b/strata/NetworkManager-common/NetworkManager.morph
@@ -0,0 +1,5 @@
+name: NetworkManager
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --with-session-tracking=systemd --disable-ppp
diff --git a/strata/connectivity.morph b/strata/connectivity.morph
index a65a940e..a8697f3a 100644
--- a/strata/connectivity.morph
+++ b/strata/connectivity.morph
@@ -20,10 +20,3 @@ chunks:
ref: 3e6fa55d5e28c93f417afeae7a7d4f349ddffcf4
unpetrify-ref: baserock/morph
build-depends: []
-- name: connman
- morph: strata/connectivity/connman.morph
- repo: upstream:connman
- ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44
- unpetrify-ref: baserock/1.24
- build-depends:
- - iptables
diff --git a/strata/connman-common.morph b/strata/connman-common.morph
new file mode 100644
index 00000000..f6f7ddb0
--- /dev/null
+++ b/strata/connman-common.morph
@@ -0,0 +1,11 @@
+name: connman-common
+kind: stratum
+build-depends:
+- morph: strata/connectivity.morph
+chunks:
+- name: connman
+ morph: strata/connman-common/connman.morph
+ repo: upstream:connman
+ ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44
+ unpetrify-ref: baserock/1.24
+ build-depends: []
diff --git a/strata/connectivity/connman.morph b/strata/connman-common/connman.morph
index e468bc49..e468bc49 100644
--- a/strata/connectivity/connman.morph
+++ b/strata/connman-common/connman.morph
diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph
index 95b42a6b..7ef6e22a 100644
--- a/strata/enlightenment.morph
+++ b/strata/enlightenment.morph
@@ -7,7 +7,7 @@ build-depends:
- morph: strata/lua.morph
- morph: strata/audio-bluetooth.morph
- morph: strata/multimedia-gstreamer-0.10.morph
-- morph: strata/connectivity.morph
+- morph: strata/connman-common.morph
chunks:
- name: efl
morph: strata/enlightenment/efl.morph
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index 1f35df7e..e3261f84 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -2,7 +2,7 @@ name: virtualization
kind: stratum
description: virtualization for baserock
build-depends:
-- morph: strata/connectivity.morph
+- morph: strata/connman-common.morph
chunks:
- name: yajl
morph: strata/virtualization/yajl.morph
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index 454f981d..29acb5bc 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -17,6 +17,8 @@ strata:
morph: strata/bsp-x86_64-generic.morph
- name: connectivity
morph: strata/connectivity.morph
+- name: connman-common
+ morph: strata/connman-common.morph
- name: audio-bluetooth
morph: strata/audio-bluetooth.morph
- name: x-common
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index 7c283170..bffcb2e7 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/bsp-armv7-versatile.morph
- name: connectivity
morph: strata/connectivity.morph
+- name: connman-common
+ morph: strata/connman-common.morph
- name: audio-bluetooth
morph: strata/audio-bluetooth.morph
- name: x-common
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index fe7447ee..d1f479d9 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/bsp-x86_64-generic.morph
- name: connectivity
morph: strata/connectivity.morph
+- name: connman-common
+ morph: strata/connman-common.morph
- name: audio-bluetooth
morph: strata/audio-bluetooth.morph
- name: x-common
diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph
index 35eef485..0f9e296c 100644
--- a/systems/gitlab-ci-runner.morph
+++ b/systems/gitlab-ci-runner.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/bsp-x86_64-generic.morph
- name: connectivity
morph: strata/connectivity.morph
+- name: connman-common
+ morph: strata/connman-common.morph
- name: audio-bluetooth
morph: strata/audio-bluetooth.morph
- name: x-common
diff --git a/systems/nodejs-system-x86_64.morph b/systems/nodejs-system-x86_64.morph
index 1dab9f2a..1a810554 100644
--- a/systems/nodejs-system-x86_64.morph
+++ b/systems/nodejs-system-x86_64.morph
@@ -16,6 +16,8 @@ strata:
morph: strata/bsp-x86_64-generic.morph
- name: connectivity
morph: strata/connectivity.morph
+- name: connman-common
+ morph: strata/connman-common.morph
- name: audio-bluetooth
morph: strata/audio-bluetooth.morph
- name: x-common
diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph
index eb3ab48d..0b4e4638 100644
--- a/systems/qt4-devel-system-x86_64-generic.morph
+++ b/systems/qt4-devel-system-x86_64-generic.morph
@@ -30,6 +30,8 @@ strata:
morph: strata/lua.morph
- name: connectivity
morph: strata/connectivity.morph
+- name: connman-common
+ morph: strata/connman-common.morph
- name: enlightenment
morph: strata/enlightenment.morph
configuration-extensions:
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
index eafd97e0..7171c0ca 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -30,6 +30,8 @@ strata:
morph: strata/lua.morph
- name: connectivity
morph: strata/connectivity.morph
+- name: connman-common
+ morph: strata/connman-common.morph
- name: enlightenment
morph: strata/enlightenment.morph
configuration-extensions:
diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph
index efdd7bdb..17531e89 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/bsp-x86_64-generic.morph
- name: connectivity
morph: strata/connectivity.morph
+- name: connman-common
+ morph: strata/connman-common.morph
- name: audio-bluetooth
morph: strata/audio-bluetooth.morph
- name: x-common