summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2016-02-11 14:07:35 (GMT)
committerJavier Jardón <jjardon@gnome.org>2016-02-11 14:07:35 (GMT)
commit944faa227531318cd9b3a1af112bc8c1271a176a (patch)
treec244de2b7b959e938efccf7bf57306aafaf7edf5
parent214f4c83f993b5798d890f184b2fb3d2325f36c7 (diff)
downloaddefinitions-jjardon/reorganization.tar.gz
Move polkit to 'privileges-management' stratumjjardon/reorganization
Change-Id: I231453daa3e84b72af9eb4121596d6bb868cf009
-rw-r--r--strata/NetworkManager-common.morph3
-rw-r--r--strata/gnome.morph19
-rw-r--r--strata/privileges-management.morph21
-rw-r--r--strata/privileges-management/mozjs17.morph (renamed from strata/gnome/mozjs17.morph)2
-rw-r--r--strata/privileges-management/polkit.morph (renamed from strata/gnome/polkit.morph)0
-rw-r--r--systems/gnome-system-x86_64.morph2
6 files changed, 27 insertions, 20 deletions
diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph
index d32b059..14994a8 100644
--- a/strata/NetworkManager-common.morph
+++ b/strata/NetworkManager-common.morph
@@ -2,8 +2,9 @@ name: NetworkManager-common
kind: stratum
build-depends:
- morph: strata/audio-bluetooth.morph
-- morph: strata/network-security.morph
- morph: strata/connectivity.morph
+- morph: strata/network-security.morph
+- morph: strata/privileges-management.morph
chunks:
- name: libndp
repo: upstream:libndp
diff --git a/strata/gnome.morph b/strata/gnome.morph
index 7198bea..00177c1 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -12,6 +12,7 @@ build-depends:
- morph: strata/NetworkManager-common.morph
- morph: strata/multimedia-gstreamer.morph
- morph: strata/network-security.morph
+- morph: strata/privileges-management.morph
- morph: strata/python3-gobject.morph
- morph: strata/python2-core.morph
- morph: strata/wayland-generic.morph
@@ -184,18 +185,6 @@ chunks:
ref: 0c5eb813279c67607e17dfd99087358d34c6c8f5
unpetrify-ref: master
build-system: autotools
-- name: mozjs17
- morph: strata/gnome/mozjs17.morph
- repo: upstream:mozilla/mozjs17
- ref: c8e33aaaba2787d3c94eba00257051400d106e76
- unpetrify-ref: baserock/gnome
-- name: polkit
- morph: strata/gnome/polkit.morph
- repo: upstream:polkit
- ref: 5a7e3b76aa45eea43e4bdc403ddd4c6e1a4c6542
- unpetrify-ref: master
- build-depends:
- - mozjs17
- name: libatasmart
morph: strata/gnome/libatasmart.morph
repo: upstream:libatasmart
@@ -207,7 +196,6 @@ chunks:
ref: 410cab8f3d749ad2660cda3ba38b6aece42bf10f
unpetrify-ref: master
build-depends:
- - polkit
- libatasmart
- name: colord
morph: strata/gnome/colord.morph
@@ -217,7 +205,6 @@ chunks:
build-depends:
- gusb
- lcms2
- - polkit
- name: colord-gtk
repo: upstream:colord-gtk
ref: eadca143872288e1300303a771efdaab196900e1
@@ -508,7 +495,6 @@ chunks:
- gjs
- libcanberra
- mutter
- - polkit
- startup-notification
- telepathy-glib
- network-manager-applet
@@ -547,15 +533,12 @@ chunks:
repo: upstream:accountsservice
ref: 36b424b4aad91aaf91eeb6b6285cf550b15fcfeb
unpetrify-ref: master
- build-depends:
- - polkit
- name: gdm
morph: strata/gnome/gdm.morph
repo: upstream:gdm
ref: 494ec8cee5727c37118994d3864c44f36aa454fc
unpetrify-ref: 3.18.0
build-depends:
- - polkit
- accountsservice
- libcanberra
- dconf
diff --git a/strata/privileges-management.morph b/strata/privileges-management.morph
new file mode 100644
index 0000000..f00fdde
--- /dev/null
+++ b/strata/privileges-management.morph
@@ -0,0 +1,21 @@
+name: privileges-management
+kind: stratum
+description: Toolkit for controlling system-wide privileges
+build-depends:
+- morph: strata/foundation.morph
+- morph: strata/glib-common.morph
+- morph: strata/network-security.morph
+- morph: strata/python2-core.morph
+chunks:
+- name: mozjs17
+ morph: strata/privileges-management/mozjs17.morph
+ repo: upstream:mozilla/mozjs17
+ ref: c8e33aaaba2787d3c94eba00257051400d106e76
+ unpetrify-ref: baserock/gnome
+- name: polkit
+ morph: strata/privileges-management/polkit.morph
+ repo: upstream:polkit
+ ref: 5a7e3b76aa45eea43e4bdc403ddd4c6e1a4c6542
+ unpetrify-ref: master
+ build-depends:
+ - mozjs17
diff --git a/strata/gnome/mozjs17.morph b/strata/privileges-management/mozjs17.morph
index 9ef9885..968bfcc 100644
--- a/strata/gnome/mozjs17.morph
+++ b/strata/privileges-management/mozjs17.morph
@@ -5,7 +5,7 @@ configure-commands:
- |
cd js/src;
./configure --prefix="$PREFIX" \
- --sysconfdir=/etc \
+ --sysconfdir=/etc \
--with-system-nspr \
--with-system-ffi \
--enable-threadsafe
diff --git a/strata/gnome/polkit.morph b/strata/privileges-management/polkit.morph
index d903ae0..d903ae0 100644
--- a/strata/gnome/polkit.morph
+++ b/strata/privileges-management/polkit.morph
diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph
index ee9861e..781adbb 100644
--- a/systems/gnome-system-x86_64.morph
+++ b/systems/gnome-system-x86_64.morph
@@ -37,6 +37,8 @@ strata:
morph: strata/multimedia-common.morph
- name: multimedia-gstreamer
morph: strata/multimedia-gstreamer.morph
+- name: strata/privileges-management
+ morph: strata/privileges-management.morph
- name: python2-core
morph: strata/python2-core.morph
- name: python3-gobject