From 944faa227531318cd9b3a1af112bc8c1271a176a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 11 Feb 2016 14:07:35 +0000
Subject: Move polkit to 'privileges-management' stratum

Change-Id: I231453daa3e84b72af9eb4121596d6bb868cf009
---
 strata/NetworkManager-common.morph         |  3 ++-
 strata/gnome.morph                         | 19 +------------------
 strata/gnome/mozjs17.morph                 | 18 ------------------
 strata/gnome/polkit.morph                  | 10 ----------
 strata/privileges-management.morph         | 21 +++++++++++++++++++++
 strata/privileges-management/mozjs17.morph | 18 ++++++++++++++++++
 strata/privileges-management/polkit.morph  | 10 ++++++++++
 systems/gnome-system-x86_64.morph          |  2 ++
 8 files changed, 54 insertions(+), 47 deletions(-)
 delete mode 100644 strata/gnome/mozjs17.morph
 delete mode 100644 strata/gnome/polkit.morph
 create mode 100644 strata/privileges-management.morph
 create mode 100644 strata/privileges-management/mozjs17.morph
 create mode 100644 strata/privileges-management/polkit.morph

diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph
index d32b059c..14994a80 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 7198bea0..00177c12 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/gnome/mozjs17.morph b/strata/gnome/mozjs17.morph
deleted file mode 100644
index 9ef98854..00000000
--- a/strata/gnome/mozjs17.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-name: mozjs17
-kind: chunk
-build-system: manual
-configure-commands:
-- |
-  cd js/src;
-  ./configure --prefix="$PREFIX" \
-  	      --sysconfdir=/etc \
-              --with-system-nspr \
-              --with-system-ffi \
-              --enable-threadsafe
-build-commands:
-- |
-  cd js/src;
-  make
-install-commands:
-- cd js/src;
-  make DESTDIR="$DESTDIR" install
diff --git a/strata/gnome/polkit.morph b/strata/gnome/polkit.morph
deleted file mode 100644
index d903ae0f..00000000
--- a/strata/gnome/polkit.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: polkit
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-man-pages --disable-gtk-doc --enable-libsystemd-login=yes
-system-integration:
-  polkit-misc:
-    00-add-polkitd-user:
-    - groupadd -fg 27 polkitd
-    - useradd -c "PolicyKit Daemon Owner" -d /etc/polkit-1 -u 27  -g polkitd -s /bin/false polkitd
diff --git a/strata/privileges-management.morph b/strata/privileges-management.morph
new file mode 100644
index 00000000..f00fdde8
--- /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/privileges-management/mozjs17.morph b/strata/privileges-management/mozjs17.morph
new file mode 100644
index 00000000..968bfcc8
--- /dev/null
+++ b/strata/privileges-management/mozjs17.morph
@@ -0,0 +1,18 @@
+name: mozjs17
+kind: chunk
+build-system: manual
+configure-commands:
+- |
+  cd js/src;
+  ./configure --prefix="$PREFIX" \
+              --sysconfdir=/etc \
+              --with-system-nspr \
+              --with-system-ffi \
+              --enable-threadsafe
+build-commands:
+- |
+  cd js/src;
+  make
+install-commands:
+- cd js/src;
+  make DESTDIR="$DESTDIR" install
diff --git a/strata/privileges-management/polkit.morph b/strata/privileges-management/polkit.morph
new file mode 100644
index 00000000..d903ae0f
--- /dev/null
+++ b/strata/privileges-management/polkit.morph
@@ -0,0 +1,10 @@
+name: polkit
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-man-pages --disable-gtk-doc --enable-libsystemd-login=yes
+system-integration:
+  polkit-misc:
+    00-add-polkitd-user:
+    - groupadd -fg 27 polkitd
+    - useradd -c "PolicyKit Daemon Owner" -d /etc/polkit-1 -u 27  -g polkitd -s /bin/false polkitd
diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph
index ee9861ea..781adbb9 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
-- 
cgit v1.2.1