diff options
| author | Aliaksandr Stelmachonak | 2019-06-08 11:58:22 -0400 |
|---|---|---|
| committer | Aliaksandr Stelmachonak | 2019-06-08 11:58:22 -0400 |
| commit | 5cb5347adafa199483e5e7a9cebfbef838f13a80 (patch) | |
| tree | f96408a45fc98035c052335efb33ad533e4eb398 | |
| parent | cb831027e472db7451736348bde480c75d76d96d (diff) | |
| download | aur-5cb5347adafa199483e5e7a9cebfbef838f13a80.tar.gz | |
- Replaced xxd-standalone with xxd in depends section - should resolve dependencies conflicts some people experience
- Applied workaround for https://github.com/systemd/systemd/issues/12401 to fix "Linux Files"
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | cros-logind-override.conf | 2 |
3 files changed, 16 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = cros-container-guest-tools-git pkgdesc = Guest tools for the Crostini containers on ChromeOS - pkgver = r123.4dc99dd + pkgver = r157.5a5206c pkgrel = 1 url = https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools install = cros-container-guest-tools.install @@ -10,17 +10,20 @@ pkgbase = cros-container-guest-tools-git depends = xdg-utils depends = xkeyboard-config depends = pulseaudio - depends = xxd-standalone + depends = xxd + depends = packagekit source = git+https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools source = cros-sftp-conditions.conf source = cros-garcon-conditions.conf source = cros-locale.sh source = cros-garcon.hook + source = cros-logind-override.conf sha1sums = SKIP sha1sums = 0827ce6d673949a995be2d69d4974ddd9bdf16f1 sha1sums = d326cd35dcf150f9f9c8c7d6336425ec08ad2433 sha1sums = 8586cf72dacdcca82022519467065f70fe4a3294 sha1sums = 9a68893cadf9190e99cadc4c781ba43e45104b1e + sha1sums = 0c21f6c85ecbe8f822c378c7e4d5b3165e56eb3a pkgname = cros-container-guest-tools-git @@ -1,19 +1,20 @@ _pkgname=cros-container-guest-tools pkgname=${_pkgname}-git -pkgver=r123.4dc99dd +pkgver=r157.5a5206c pkgrel=1 pkgdesc="Guest tools for the Crostini containers on ChromeOS" arch=('any') license=('custom') -depends=('openssh' 'xdg-utils' 'xkeyboard-config' 'pulseaudio' 'xxd-standalone') +depends=('openssh' 'xdg-utils' 'xkeyboard-config' 'pulseaudio' 'xxd' 'packagekit') 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' 'cros-garcon.hook') +source=("git+${url}" 'cros-sftp-conditions.conf' 'cros-garcon-conditions.conf' 'cros-locale.sh' 'cros-garcon.hook' 'cros-logind-override.conf') sha1sums=('SKIP' '0827ce6d673949a995be2d69d4974ddd9bdf16f1' 'd326cd35dcf150f9f9c8c7d6336425ec08ad2433' '8586cf72dacdcca82022519467065f70fe4a3294' - '9a68893cadf9190e99cadc4c781ba43e45104b1e') + '9a68893cadf9190e99cadc4c781ba43e45104b1e' + '0c21f6c85ecbe8f822c378c7e4d5b3165e56eb3a') pkgver() { cd ${srcdir}/${_pkgname} @@ -87,6 +88,10 @@ package() { ln -sf ../cros-sftp.service \ ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants/cros-sftp.service + # workaround for https://github.com/systemd/systemd/issues/12401 + install -m644 -D ${srcdir}/cros-logind-override.conf \ + ${pkgdir}/usr/lib/systemd/system/systemd-logind.service.d/cros-logind-override.conf + # add drop-in for cros-sftp to check if required ssh artifacts were bind-mounted before starting install -m644 -D ${srcdir}/cros-sftp-conditions.conf \ ${pkgdir}/usr/lib/systemd/system/cros-sftp.service.d/cros-sftp-conditions.conf diff --git a/cros-logind-override.conf b/cros-logind-override.conf new file mode 100644 index 000000000000..8f7fd66aed9b --- /dev/null +++ b/cros-logind-override.conf @@ -0,0 +1,2 @@ +[Service] +ReadWritePaths=/etc /run /var/lib/systemd/linger |