summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFirehose merge bot <firehose@merge.bot>2015-10-12 23:14:37 +0000
committerFirehose merge bot <firehose@merge.bot>2015-10-12 23:14:37 +0000
commitd1bf8c3c3b0716651b3f0e65e26a88a7e9ad5f41 (patch)
tree01f611b96c4fee674cd180f9e9c96cbf5fc9ac17
parentd6b2bb41043089702bb76abc3a45007b59992dd0 (diff)
downloaddefinitions-d1bf8c3c3b0716651b3f0e65e26a88a7e9ad5f41.tar.gz
Firehose test commit
-rw-r--r--clusters/gnome-system-x86_64-deploy.morph1
-rw-r--r--install-files/gnome/etc/securetty8
-rw-r--r--install-files/gnome/etc/ssh/sshd_config135
-rw-r--r--install-files/gnome/manifest2
-rw-r--r--strata/NetworkManager-common/NetworkManager.morph6
-rw-r--r--strata/foundation/systemd.morph2
-rw-r--r--strata/gnome.morph64
-rw-r--r--strata/gnome/ModemManager.morph9
-rw-r--r--strata/gnome/accountsservice.morph9
-rw-r--r--strata/gnome/gdm.morph5
-rw-r--r--strata/gnome/gnome-keyring.morph2
-rw-r--r--strata/gnome/gnome-themes-standard.morph5
-rw-r--r--strata/gnome/libatasmart.morph6
-rw-r--r--strata/gnome/polkit.morph5
-rw-r--r--strata/gnome/telepathy-logger.morph5
-rw-r--r--strata/gnome/udisks.morph5
-rw-r--r--strata/gtk-deps/gdk-pixbuf.morph8
-rw-r--r--strata/x-common.morph16
-rw-r--r--systems/gnome-system-x86_64.morph1
19 files changed, 273 insertions, 21 deletions
diff --git a/clusters/gnome-system-x86_64-deploy.morph b/clusters/gnome-system-x86_64-deploy.morph
index 195949dc..8d63dbab 100644
--- a/clusters/gnome-system-x86_64-deploy.morph
+++ b/clusters/gnome-system-x86_64-deploy.morph
@@ -13,6 +13,7 @@ systems:
type: rawdisk
location: /gnome-system-x86_64.img
DISK_SIZE: 6G
+ INSTALL_FILES: install-files/gnome/manifest
KERNEL_ARGS: vga=788
INITRAMFS_PATH: boot/initramfs.gz
subsystems:
diff --git a/install-files/gnome/etc/securetty b/install-files/gnome/etc/securetty
new file mode 100644
index 00000000..e3dfb6c4
--- /dev/null
+++ b/install-files/gnome/etc/securetty
@@ -0,0 +1,8 @@
+tty1
+#tty2
+#tty3
+#tty4
+#tty5
+#tty6
+#tty7
+#tty8
diff --git a/install-files/gnome/etc/ssh/sshd_config b/install-files/gnome/etc/ssh/sshd_config
new file mode 100644
index 00000000..aaab3cca
--- /dev/null
+++ b/install-files/gnome/etc/ssh/sshd_config
@@ -0,0 +1,135 @@
+# $OpenBSD: sshd_config,v 1.93 2014/01/10 05:59:19 djm Exp $
+
+# This is the sshd server system-wide configuration file. See
+# sshd_config(5) for more information.
+
+# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# The strategy used for options in the default sshd_config shipped with
+# OpenSSH is to specify options with their default value where
+# possible, but leave them commented. Uncommented options override the
+# default value.
+
+#Port 22
+#AddressFamily any
+#ListenAddress 0.0.0.0
+#ListenAddress ::
+
+# The default requires explicit activation of protocol 1
+#Protocol 2
+
+# HostKey for protocol version 1
+#HostKey /etc/ssh/ssh_host_key
+# HostKeys for protocol version 2
+#HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_dsa_key
+#HostKey /etc/ssh/ssh_host_ecdsa_key
+#HostKey /etc/ssh/ssh_host_ed25519_key
+
+# Lifetime and size of ephemeral version 1 server key
+#KeyRegenerationInterval 1h
+#ServerKeyBits 1024
+
+# Ciphers and keying
+#RekeyLimit default none
+
+# Logging
+# obsoletes QuietMode and FascistLogging
+#SyslogFacility AUTH
+#LogLevel INFO
+
+# Authentication:
+
+#LoginGraceTime 2m
+#PermitRootLogin yes
+#StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10
+
+#RSAAuthentication yes
+#PubkeyAuthentication yes
+
+# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
+# but this is overridden so installations will only check .ssh/authorized_keys
+AuthorizedKeysFile .ssh/authorized_keys
+
+#AuthorizedPrincipalsFile none
+
+#AuthorizedKeysCommand none
+#AuthorizedKeysCommandUser nobody
+
+# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+#RhostsRSAAuthentication no
+# similar for protocol version 2
+#HostbasedAuthentication no
+# Change to yes if you don't trust ~/.ssh/known_hosts for
+# RhostsRSAAuthentication and HostbasedAuthentication
+#IgnoreUserKnownHosts no
+# Don't read the user's ~/.rhosts and ~/.shosts files
+#IgnoreRhosts yes
+
+# To disable tunneled clear text passwords, change to no here!
+#PasswordAuthentication yes
+#PermitEmptyPasswords no
+
+# Change to no to disable s/key passwords
+#ChallengeResponseAuthentication yes
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+#KerberosGetAFSToken no
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
+# be allowed through the ChallengeResponseAuthentication and
+# PasswordAuthentication. Depending on your PAM configuration,
+# PAM authentication via ChallengeResponseAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and ChallengeResponseAuthentication to 'no'.
+UsePAM yes
+
+#AllowAgentForwarding yes
+#AllowTcpForwarding yes
+#GatewayPorts no
+#X11Forwarding no
+#X11DisplayOffset 10
+#X11UseLocalhost yes
+#PermitTTY yes
+#PrintMotd yes
+#PrintLastLog yes
+#TCPKeepAlive yes
+#UseLogin no
+UsePrivilegeSeparation sandbox # Default for new installations.
+PermitUserEnvironment yes
+#Compression delayed
+#ClientAliveInterval 0
+#ClientAliveCountMax 3
+#UseDNS yes
+#PidFile /var/run/sshd.pid
+#MaxStartups 10:30:100
+#PermitTunnel no
+#ChrootDirectory none
+#VersionAddendum none
+
+# no default banner path
+#Banner none
+
+# override default of no subsystems
+Subsystem sftp /usr/lib/openssh/sftp-server
+
+# Example of overriding settings on a per-user basis
+#Match User anoncvs
+# X11Forwarding no
+# AllowTcpForwarding no
+# PermitTTY no
+# ForceCommand cvs server
+
+AcceptEnv LANG LC_*
diff --git a/install-files/gnome/manifest b/install-files/gnome/manifest
new file mode 100644
index 00000000..9546270d
--- /dev/null
+++ b/install-files/gnome/manifest
@@ -0,0 +1,2 @@
+0100644 0 0 /etc/securetty
+overwrite 0100644 0 0 /etc/ssh/sshd_config
diff --git a/strata/NetworkManager-common/NetworkManager.morph b/strata/NetworkManager-common/NetworkManager.morph
index 553c979b..9b9a93de 100644
--- a/strata/NetworkManager-common/NetworkManager.morph
+++ b/strata/NetworkManager-common/NetworkManager.morph
@@ -2,4 +2,8 @@ name: NetworkManager
kind: chunk
build-system: autotools
configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --with-session-tracking=systemd --disable-ppp --enable-more-warnings=yes
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --with-session-tracking=systemd --disable-ppp --enable-more-warnings=yes
+system-integration:
+ ModemManager-misc:
+ 00-enable-NetworkManager-unit:
+ - systemctl enable NetworkManager
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
index 4c62d617..04a04c62 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.morph
@@ -6,7 +6,7 @@ configure-commands:
# KILL added because it picks up /usr/bin/kill, which is not installed on
# all systems
- |
- KILL=/bin/kill ./configure --prefix="$PREFIX" --enable-xz --disable-manpages \
+ KILL=/bin/kill ./configure --prefix="$PREFIX" --enable-xz --disable-manpages --enable-compat-libs \
--disable-tests --sysconfdir=/etc --localstatedir=/var \
--libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" \
--with-rootprefix= --with-rootlibdir=/lib
diff --git a/strata/gnome.morph b/strata/gnome.morph
index b67912f6..85847bc4 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -129,6 +129,19 @@ chunks:
unpetrify-ref: master
build-depends:
- mozjs17
+- name: libatasmart
+ morph: strata/gnome/libatasmart.morph
+ repo: upstream:libatasmart
+ ref: de6258940960443038b4c1651dfda3620075e870
+ unpetrify-ref: master
+- name: udisks
+ morph: strata/gnome/udisks.morph
+ repo: upstream:udisks
+ ref: 410cab8f3d749ad2660cda3ba38b6aece42bf10f
+ unpetrify-ref: master
+ build-depends:
+ - polkit
+ - libatasmart
- name: colord
morph: strata/gnome/colord.morph
repo: upstream:colord
@@ -156,6 +169,7 @@ chunks:
unpetrify-ref: master
build-system: autotools
- name: ModemManager
+ morph: strata/gnome/ModemManager.morph
repo: upstream:ModemManager
ref: 0ca68657fbcd5bace3d303a0babe2da292784385
unpetrify-ref: master
@@ -163,7 +177,6 @@ chunks:
- libmbim
- libqmi
- polkit
- build-system: autotools
- name: geoclue
morph: strata/gnome/geoclue.morph
repo: upstream:geoclue
@@ -220,6 +233,13 @@ chunks:
repo: upstream:telepathy-glib
ref: d27684c488ceee4f2f54f549738adab0e2e8165d
unpetrify-ref: master
+- name: telepathy-logger
+ morph: strata/gnome/telepathy-logger.morph
+ repo: upstream:telepathy-logger
+ ref: 711842911edb15977430c0b6c1803e947619efc3
+ unpetrify-ref: master
+ build-depends:
+ - telepathy-glib
- name: startup-notification
repo: upstream:startup-notification
ref: 07237ff25d6171e1b548118442ddba4259a53ba5
@@ -251,8 +271,8 @@ chunks:
build-system: autotools
- name: mutter
repo: upstream:mutter
- ref: 35729e8659cc99f45d3564c33d44a475f20d0060
- unpetrify-ref: 3.18.0
+ ref: b975676c5ddd9401d4acfc4d0b9317dd8956656b
+ unpetrify-ref: 3.18.0-25-gb975676
build-depends:
- clutter
- cogl
@@ -315,8 +335,8 @@ chunks:
- name: gnome-shell
morph: strata/gnome/gnome-shell.morph
repo: upstream:gnome/gnome-shell
- ref: 7d01383b8ee4919534a5df11e4f22ab43c240d4e
- unpetrify-ref: baserock/3.18.0
+ ref: 464d5d8a13e41c4495301071de0d04f9fde726f5
+ unpetrify-ref: 3.18.0-59-g464d5d8
build-depends:
- caribou
- clutter
@@ -331,8 +351,8 @@ chunks:
- name: gnome-session
morph: strata/gnome/gnome-session.morph
repo: upstream:gnome/gnome-session
- ref: e5c28ee81c91d659e592de55e0fc42e8e936d128
- unpetrify-ref: master
+ ref: 9af8474a027edecf7c73827964fd88bc960266d6
+ unpetrify-ref: 3.18.0-3-g9af8474
build-depends:
- gnome-desktop
- json-glib
@@ -357,3 +377,33 @@ chunks:
unpetrify-ref: master
build-depends:
- gcr
+ - udisks
+- name: accountsservice
+ morph: strata/gnome/accountsservice.morph
+ 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: master
+ build-depends:
+ - polkit
+ - accountsservice
+ - libcanberra
+ - dconf
+- name: hicolor-icon-theme
+ repo: upstream:hicolor-icon-theme
+ ref: 5954bd6c123aa31c8f35b83d70b73e1f6dcf34b3
+ unpetrify-ref: master
+ build-system: autotools
+- name: gnome-themes-standard
+ morph: strata/gnome/gnome-themes-standard.morph
+ repo: upstream:gnome-themes-standard
+ ref: 4058c3bced2173c8e6f2a22953327dcc2023e82d
+ unpetrify-ref: master
+ build-depends:
+ - hicolor-icon-theme
diff --git a/strata/gnome/ModemManager.morph b/strata/gnome/ModemManager.morph
new file mode 100644
index 00000000..909f6eca
--- /dev/null
+++ b/strata/gnome/ModemManager.morph
@@ -0,0 +1,9 @@
+name: ModemManager
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc
+system-integration:
+ ModemManager-misc:
+ 00-enable-ModemManager-unit:
+ - systemctl enable ModemManager
diff --git a/strata/gnome/accountsservice.morph b/strata/gnome/accountsservice.morph
new file mode 100644
index 00000000..15ba434d
--- /dev/null
+++ b/strata/gnome/accountsservice.morph
@@ -0,0 +1,9 @@
+name: accountsservice
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --enable-admin-group=adm
+system-integration:
+ accountsservice-misc:
+ 00-enable-accounts-daemon-unit:
+ - systemctl enable accounts-daemon
diff --git a/strata/gnome/gdm.morph b/strata/gnome/gdm.morph
new file mode 100644
index 00000000..cd5e37e9
--- /dev/null
+++ b/strata/gnome/gdm.morph
@@ -0,0 +1,5 @@
+name: gdm
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --with-plymouth=no
diff --git a/strata/gnome/gnome-keyring.morph b/strata/gnome/gnome-keyring.morph
index 820c4dcf..d34bc65f 100644
--- a/strata/gnome/gnome-keyring.morph
+++ b/strata/gnome/gnome-keyring.morph
@@ -2,4 +2,4 @@ name: gnome-keyring
kind: chunk
build-system: autotools
configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-doc
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --enable-pam --with-pam-dir=/lib/security --disable-doc
diff --git a/strata/gnome/gnome-themes-standard.morph b/strata/gnome/gnome-themes-standard.morph
new file mode 100644
index 00000000..c5b6702c
--- /dev/null
+++ b/strata/gnome/gnome-themes-standard.morph
@@ -0,0 +1,5 @@
+name: gnome-themes-standard
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-gtk2-engine
diff --git a/strata/gnome/libatasmart.morph b/strata/gnome/libatasmart.morph
new file mode 100644
index 00000000..e8df654e
--- /dev/null
+++ b/strata/gnome/libatasmart.morph
@@ -0,0 +1,6 @@
+name: libatasmart
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh
+- ./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib --libexecdir=/usr/lib
diff --git a/strata/gnome/polkit.morph b/strata/gnome/polkit.morph
index 2c40ecd0..d903ae0f 100644
--- a/strata/gnome/polkit.morph
+++ b/strata/gnome/polkit.morph
@@ -3,3 +3,8 @@ 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/gnome/telepathy-logger.morph b/strata/gnome/telepathy-logger.morph
new file mode 100644
index 00000000..38c90539
--- /dev/null
+++ b/strata/gnome/telepathy-logger.morph
@@ -0,0 +1,5 @@
+name: telepathy-logger
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc
diff --git a/strata/gnome/udisks.morph b/strata/gnome/udisks.morph
new file mode 100644
index 00000000..785fab39
--- /dev/null
+++ b/strata/gnome/udisks.morph
@@ -0,0 +1,5 @@
+name: udisks
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --enable-fhs-media --disable-gtk-doc --disable-man
diff --git a/strata/gtk-deps/gdk-pixbuf.morph b/strata/gtk-deps/gdk-pixbuf.morph
index c89c75c8..92655e30 100644
--- a/strata/gtk-deps/gdk-pixbuf.morph
+++ b/strata/gtk-deps/gdk-pixbuf.morph
@@ -1,6 +1,8 @@
name: gdk-pixbuf
kind: chunk
build-system: autotools
-install-commands:
-- make DESTDIR=$DESTDIR install
-- LD_LIBRARY_PATH=$DESTDIR/usr/lib $DESTDIR/usr/bin/gdk-pixbuf-query-loaders > $DESTDIR/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+system-integration:
+ gdk-pixbuf-misc:
+ 01-query-loaders:
+ - mkdir -p /usr/lib/gdk-pixbuf-2.0/2.10.0/
+ - /usr/bin/gdk-pixbuf-query-loaders > /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
diff --git a/strata/x-common.morph b/strata/x-common.morph
index 9165d148..fe7b9a0d 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -210,6 +210,14 @@ chunks:
- xorg-lib-libXau
- xorg-proto-x11proto
- xorg-proto-xextproto
+- name: xorg-lib-libXfixes
+ repo: upstream:xorg-lib-libXfixes
+ ref: 0cb446962381f750e05d97bfb974ca1e32481d5d
+ unpetrify-ref: libXfixes-5.0.1
+ build-system: autotools
+ build-depends:
+ - xorg-lib-libXext
+ - xorg-proto-fixesproto
- name: xorg-lib-libXi
repo: upstream:xorg-lib-libXi
ref: f180dff710dc54d00e0e26b84de053151f8f207e
@@ -222,14 +230,6 @@ chunks:
- xorg-proto-inputproto
- xorg-proto-x11proto
- xorg-proto-xextproto
-- name: xorg-lib-libXfixes
- repo: upstream:xorg-lib-libXfixes
- ref: 0cb446962381f750e05d97bfb974ca1e32481d5d
- unpetrify-ref: libXfixes-5.0.1
- build-system: autotools
- build-depends:
- - xorg-lib-libXext
- - xorg-proto-fixesproto
- name: xorg-lib-libXcomposite
repo: upstream:xorg-lib-libXcomposite
ref: eda48b1bedaa344ada8e13930c9ab3058b836190
diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph
index a95ded5f..ecec7a1f 100644
--- a/systems/gnome-system-x86_64.morph
+++ b/systems/gnome-system-x86_64.morph
@@ -60,4 +60,5 @@ strata:
configuration-extensions:
- extensions/set-hostname
- extensions/add-config-files
+- extensions/install-files
- extensions/install-essential-files