diff options
author | Aliaksandr Stelmachonak | 2020-04-05 14:26:08 -0400 |
---|---|---|
committer | Aliaksandr Stelmachonak | 2020-04-05 14:26:08 -0400 |
commit | 95958776afd7c47847a4fadae299976254094637 (patch) | |
tree | fe3340d7d0c800c5c01c2f32869e798f72a5fe3a | |
parent | 9efb947b0e97aecf57196d556b0beaed94a5548f (diff) | |
download | aur-95958776afd7c47847a4fadae299976254094637.tar.gz |
Updated to latest version; Added simlink for sommelier binary to /usr/bin
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 14 | ||||
-rw-r--r-- | cros-container-guest-tools.install | 12 |
3 files changed, 21 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = cros-container-guest-tools-git pkgdesc = Linux guest tools for the Crostini containers on ChromeOS - pkgver = r238.5591412 - pkgrel = 2 + pkgver = r258.61d9c12 + pkgrel = 1 url = https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools install = cros-container-guest-tools.install arch = any @@ -1,7 +1,7 @@ _pkgname=cros-container-guest-tools pkgname=${_pkgname}-git -pkgver=r238.5591412 -pkgrel=2 +pkgver=r258.61d9c12 +pkgrel=1 pkgdesc="Linux guest tools for the Crostini containers on ChromeOS" arch=('any') license=('custom') @@ -59,7 +59,6 @@ package() { mkdir -p ${pkgdir}/usr/share/themes # Uncomment after https://bugs.archlinux.org/task/58701 is fixed -# # ln -sf /opt/google/cros-containers/cros-adapta ${pkgdir}/usr/share/themes/CrosAdapta ### cros-apt-config -> not applicable @@ -82,6 +81,12 @@ package() { ### cros-gpu-stretch -> not applicable ### cros-guest-tools -> not applicable + ### cros-host-fonts + + install -m644 -D ${srcdir}/${_pkgname}/cros-host-fonts/05-cros-fonts.conf ${pkgdir}/etc/fonts/conf.avail/05-cros-fonts.conf + mkdir -p ${pkgdir}/etc/fonts/conf.d/ + ln -sf ../conf.avail/05-cros-fonts.conf ${pkgdir}/etc/fonts/conf.d/05-cros-fonts.conf + ### cros-notificationd install -m644 -D ${srcdir}/${_pkgname}/cros-notificationd/org.freedesktop.Notifications.service \ @@ -102,6 +107,7 @@ package() { ### cros-sommelier install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier/sommelierrc ${pkgdir}/etc/sommelierrc + install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier/skel.sommelierrc ${pkgdir}/etc/skel/.sommelierrc install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier/sommelier.sh ${pkgdir}/etc/profile.d/sommelier.sh install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier/sommelier@.service ${pkgdir}/usr/lib/systemd/user/sommelier@.service sed -i 's|=/usr|=/opt/google/cros-containers|g' ${pkgdir}/usr/lib/systemd/user/sommelier@.service @@ -111,6 +117,8 @@ package() { ln -sf ../sommelier@.service ${pkgdir}/usr/lib/systemd/user/default.target.wants/sommelier@1.service ln -sf ../sommelier-x@.service ${pkgdir}/usr/lib/systemd/user/default.target.wants/sommelier-x@0.service ln -sf ../sommelier-x@.service ${pkgdir}/usr/lib/systemd/user/default.target.wants/sommelier-x@1.service +# Uncomment after https://bugs.archlinux.org/task/58701 is fixed +# ln -sf /opt/google/cros-containers/bin/sommelier ${pkgdir}/usr/bib/sommelier ### cros-sommelier-config diff --git a/cros-container-guest-tools.install b/cros-container-guest-tools.install index 4dadadd058a3..1eefff3d3ef3 100644 --- a/cros-container-guest-tools.install +++ b/cros-container-guest-tools.install @@ -19,13 +19,16 @@ post_install() { post_upgrade() { + # workaround for https://bugs.archlinux.org/task/58701 - remove after fix + ln -sf /opt/google/cros-containers/bin/sommelier /usr/bin/sommelier + cat << EOF - (!) This package is permanently work-in-progress while Crostini + This package is permanently work-in-progress while Crostini is in beta. Missing features, issues and bugs are possible! - Developed and tested on Google Pixelbook, but should work fine - on other Chromebooks/Chromeboxes with Crostini enabled. + Developed and tested on Google Pixelbook, but should work + fine on other Chromebooks/Chromeboxes with Crostini enabled. Please report any issues to the AUR page! @@ -47,5 +50,6 @@ post_remove() { systemctl unmask systemd-udev-trigger.service # workaround for https://bugs.archlinux.org/task/58701 - remove after fix - rm /usr/share/themes/CrosAdapta + rm -f /usr/share/themes/CrosAdapta + rm -f /usr/bin/sommelier } |