diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2015-10-30 02:42:35 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2015-10-30 14:46:57 +0900 |
| commit | f686683558d733501b51a9343e83c182e35babc6 (patch) | |
| tree | 2ad7e6619b80d48b094fb3559dfd7ab224041aee | |
| parent | ed7d89f61da399df4dc827aa2b84e23fa88e3c33 (diff) | |
| download | definitions-f686683558d733501b51a9343e83c182e35babc6.tar.gz | |
Adding cups to GNOME strata and system
CUPS is required to build gnome-control-center
Also re-enable cups in gnome-settings-daemon
Change-Id: Iff34724ffa71e7e7e99418309c037b506cca0679
| -rw-r--r-- | strata/gnome.morph | 1 | ||||
| -rw-r--r-- | strata/gnome/gnome-settings-daemon.morph | 2 | ||||
| -rw-r--r-- | systems/gnome-system-x86_64.morph | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/strata/gnome.morph b/strata/gnome.morph index 76299bcd..7e02e597 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -18,6 +18,7 @@ build-depends: - morph: strata/x-generic.morph - morph: strata/ruby.morph - morph: strata/samba.morph +- morph: strata/cups.morph chunks: - name: dconf morph: strata/gnome/dconf.morph diff --git a/strata/gnome/gnome-settings-daemon.morph b/strata/gnome/gnome-settings-daemon.morph index d220fd3e..3112f778 100644 --- a/strata/gnome/gnome-settings-daemon.morph +++ b/strata/gnome/gnome-settings-daemon.morph @@ -2,4 +2,4 @@ name: gnome-settings-daemon kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-cups --disable-man +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-man diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph index 0ad304f6..3166a486 100644 --- a/systems/gnome-system-x86_64.morph +++ b/systems/gnome-system-x86_64.morph @@ -69,6 +69,8 @@ strata: morph: strata/icu-common.morph - name: samba morph: strata/samba.morph +- name: cups + morph: strata/cups.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files |