diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | cros-container-guest-tools.install | 17 |
3 files changed, 17 insertions, 18 deletions
@@ -6,10 +6,9 @@ pkgbase = cros-container-guest-tools-git install = cros-container-guest-tools.install arch = any license = custom - optdepends = xdg-utils: for setting default-web-browser to ChromeOS host via garcon bridge - optdepends = xorg-apps: for XWayland functionality - optdepends = wayland: for Wayland functionality - optdepends = qt5-wayland: Qt5 Wayland backend + depends = openssh + depends = xdg-utils + depends = xkeyboard-config source = git+https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools source = cros-sftp-conditions.conf source = cros-garcon-conditions.conf @@ -17,7 +16,7 @@ pkgbase = cros-container-guest-tools-git sha1sums = SKIP sha1sums = 0827ce6d673949a995be2d69d4974ddd9bdf16f1 sha1sums = d326cd35dcf150f9f9c8c7d6336425ec08ad2433 - sha1sums = b5a315f5b8f474a31dc3576efa3ef19881ec80d6 + sha1sums = 8586cf72dacdcca82022519467065f70fe4a3294 pkgname = cros-container-guest-tools-git @@ -5,13 +5,7 @@ pkgrel=1 pkgdesc="Guest tools for the Crostini containers on ChromeOS" arch=('any') license=('custom') -depends=() -optdepends=( - 'xdg-utils: for setting default-web-browser to ChromeOS host via garcon bridge' - 'xorg-apps: for XWayland functionality' - 'wayland: for Wayland functionality' - 'qt5-wayland: Qt5 Wayland backend' -) +depends=('openssh' 'xdg-utils' 'xkeyboard-config') install=cros-container-guest-tools.install url="https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools" source=("git+${url}" 'cros-sftp-conditions.conf' 'cros-garcon-conditions.conf' 'cros-locale.sh') @@ -108,6 +102,7 @@ package() { install -m440 -D ${srcdir}/${_pkgname}/cros-sudo-config/10-cros-nopasswd \ ${pkgdir}/etc/sudoers.d/10-cros-nopasswd + # replace sudo group with wheel group for no password sudo access sed -i 's/%sudo/%wheel/1' ${pkgdir}/etc/sudoers.d/10-cros-nopasswd diff --git a/cros-container-guest-tools.install b/cros-container-guest-tools.install index 1e601ca8404c..829387482d5a 100644 --- a/cros-container-guest-tools.install +++ b/cros-container-guest-tools.install @@ -5,10 +5,10 @@ post_install() { dconf update fi - # mask systemd-journald-audit.socket, which failes inside unprivileged container + # mask systemd-journald-audit.socket, which fails inside unprivileged container systemctl mask systemd-journald-audit.socket - # workaround for https://bugs.archlinux.org/task/58701, remove after fix + # workaround for https://bugs.archlinux.org/task/58701 - remove after fix ln -sf /opt/google/cros-containers/cros-adapta /usr/share/themes/CrosAdapta ln -sf /opt/google/cros-containers/bin/sommelier /usr/bin/sommelier @@ -17,13 +17,18 @@ post_install() { xdg-settings set default-web-browser garcon_host_browser.desktop fi + post_upgrade +} + +post_upgrade() { + cat << EOF (!) This package is permanently work in progress until Crostini - considered to be stable by Google! + considered to be stable by Google, issues and bugs are expected! - Developed and tested on Samsung Chromebook Plus, should work on - other Chromebooks with Crostini enabled. + Tested on Google Pixelbook and Samsung Chromebook Plus, should + work fine on other Chromebooks/Chromeboxes with Crostini enabled. EOF @@ -39,7 +44,7 @@ post_remove() { # unmask systemd-journald-audit.socket systemctl unmask systemd-journald-audit.socket - # workaround for https://bugs.archlinux.org/task/58701, remove after fix + # workaround for https://bugs.archlinux.org/task/58701 - remove after fix rm /usr/share/themes/CrosAdapta rm /usr/bin/sommelier |