From ec46bd5c351bd52b2501840f76ca1f68bc70644f Mon Sep 17 00:00:00 2001 From: zxvv Date: Thu, 14 Apr 2016 23:13:17 -0500 Subject: [PATCH 1/4] Add mate target. depend on X11. allow install on ARM. --- host-bin/startmate | 18 ++++++++++++++++++ targets/mate | 41 ++++++++++++++++++++++++++++++++++++++++ test/tests/x0-alltargets | 2 +- 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100755 host-bin/startmate create mode 100644 targets/mate diff --git a/host-bin/startmate b/host-bin/startmate new file mode 100755 index 000000000..60502753f --- /dev/null +++ b/host-bin/startmate @@ -0,0 +1,18 @@ +#!/bin/sh -e +# Copyright (c) 2016 The crouton Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +set -e + +APPLICATION="${0##*/}" + +USAGE="$APPLICATION [options] + +Wraps enter-chroot to start an MATE session. +By default, it will log into the primary user on the first chroot found. + +Options are directly passed to enter-chroot; run enter-chroot to list them." + +exec sh -e "`dirname "\`readlink -f "$0"\`"`/enter-chroot" -t mate "$@" "" \ + exec xinit /usr/bin/mate-session diff --git a/targets/mate b/targets/mate new file mode 100644 index 000000000..9dbe9b7b1 --- /dev/null +++ b/targets/mate @@ -0,0 +1,41 @@ +#!/bin/sh -e +# Copyright (c) 2016 The crouton Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +if [ "${TARGETNOINSTALL:-c}" = 'c' ] + if release -lt trusty; then + error 99 "Mate packages are not available for Ubuntu releases prior to trusty." + fi + if release -lt jessie; then + error 99 "Mate packages are not available for Debian releases prior to jessie." + fi + if release -lt sana; then + error 99 "Mate packages are not available for Kali Linux prior to sana." + fi +fi + +REQUIRES='x11' +DESCRIPTION='Installs the mate desktop environment. (Approx. 205MB)' +HOSTBIN='startmate' +CHROOTBIN='crouton-noroot startmate' +. "${TARGETSDIR:="$PWD"}/common" + +if release -le precise ; then + install software-properties-common + sudo apt-add-repository -y "deb http://packages.mate-desktop.org/repo/ubuntu precise main" + sudo apt-get update +fi + +if release -eq trusty && [ "$ARCH" = 'amd64' -o "$ARCH" = 'i386' ]; then + install software-properties-common + sudo apt-add-repository -y ppa:ubuntu-mate-dev/ppa + sudo apt-add-repository -y ppa:ubuntu-mate-dev/trusty-mate + sudo apt-get update +fi + +install mate-desktop-environment + +TIPS="$TIPS +You can start mate via the startmate host command: sudo startmate +" diff --git a/test/tests/x0-alltargets b/test/tests/x0-alltargets index bfd0bf9aa..91ae68d5c 100644 --- a/test/tests/x0-alltargets +++ b/test/tests/x0-alltargets @@ -26,7 +26,7 @@ for target in "$SCRIPTDIR/targets/"*; do # Some other targets do not require testing in this context, # or have their own w* tests for blacklist in audio core x11 xephyr xiwi xorg \ - e17 gnome kde lxde unity xbmc xfce; do + e17 gnome kde lxde unity xbmc xfce mate; do if [ "$target" = "$blacklist" ]; then break fi From 390bef33f1e14c75c5e8132fb5ca32578c590c2a Mon Sep 17 00:00:00 2001 From: zxvv Date: Tue, 17 May 2016 18:11:07 -0500 Subject: [PATCH 2/4] fix missing then statement reported by Morgul --- targets/mate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/mate b/targets/mate index 9dbe9b7b1..dd01ea37b 100644 --- a/targets/mate +++ b/targets/mate @@ -3,7 +3,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -if [ "${TARGETNOINSTALL:-c}" = 'c' ] +if [ "${TARGETNOINSTALL:-c}" = 'c' ]; then if release -lt trusty; then error 99 "Mate packages are not available for Ubuntu releases prior to trusty." fi From 172d70ba835f6df65b5059bd852fe7207811382b Mon Sep 17 00:00:00 2001 From: zxvv Date: Tue, 17 May 2016 20:55:59 -0500 Subject: [PATCH 3/4] on xenial, add ppa:ubuntu-mate-dev/xenial-mate, as reported by Morgul --- targets/mate | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/targets/mate b/targets/mate index dd01ea37b..5aee8576c 100644 --- a/targets/mate +++ b/targets/mate @@ -21,12 +21,21 @@ HOSTBIN='startmate' CHROOTBIN='crouton-noroot startmate' . "${TARGETSDIR:="$PWD"}/common" +EXTRAPACKAGES= + if release -le precise ; then install software-properties-common sudo apt-add-repository -y "deb http://packages.mate-desktop.org/repo/ubuntu precise main" sudo apt-get update fi +if release -ge xenial ; then + install software-properties-common + sudo apt-add-repository -y ppa:ubuntu-mate-dev/xenial-mate + sudo apt-get update + EXTRAPACKAGES="${EXTRAPACKAGES} caja-actions ubuntu-mate-artwork" +fi + if release -eq trusty && [ "$ARCH" = 'amd64' -o "$ARCH" = 'i386' ]; then install software-properties-common sudo apt-add-repository -y ppa:ubuntu-mate-dev/ppa @@ -34,7 +43,8 @@ if release -eq trusty && [ "$ARCH" = 'amd64' -o "$ARCH" = 'i386' ]; then sudo apt-get update fi -install mate-desktop-environment + +install mate-desktop-environment ${EXTRAPACKAGES} TIPS="$TIPS You can start mate via the startmate host command: sudo startmate From 8e9945af1f69f224b0996a796160fa1567c7fbd5 Mon Sep 17 00:00:00 2001 From: zxvv Date: Thu, 9 Jun 2016 16:34:42 -0500 Subject: [PATCH 4/4] allow arm arch on trusty --- targets/mate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/mate b/targets/mate index 5aee8576c..4acbd10dd 100644 --- a/targets/mate +++ b/targets/mate @@ -36,7 +36,7 @@ if release -ge xenial ; then EXTRAPACKAGES="${EXTRAPACKAGES} caja-actions ubuntu-mate-artwork" fi -if release -eq trusty && [ "$ARCH" = 'amd64' -o "$ARCH" = 'i386' ]; then +if release -eq trusty ; then install software-properties-common sudo apt-add-repository -y ppa:ubuntu-mate-dev/ppa sudo apt-add-repository -y ppa:ubuntu-mate-dev/trusty-mate