summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Castelli2019-12-06 20:25:09 +0000
committerLorenzo Castelli2019-12-06 16:34:19 -0800
commite60fb1263e1fbbfc90a8c7d5f0366872dc55aad0 (patch)
tree352c6c1e459f0567fd066249117d2cd04cc9f2a1
parent513dfde637b95a013aac998a726803b9bfdd475f (diff)
downloadaur-e60fb1263e1fbbfc90a8c7d5f0366872dc55aad0.tar.gz
Updates to v20191121 and splits off the oslogin package.
-rw-r--r--.SRCINFO25
-rw-r--r--PKGBUILD36
2 files changed, 14 insertions, 47 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f120d8d36f2..77d3eef44d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,16 @@
pkgbase = google-compute-engine
- pkgver = 20190801
+ pkgdesc = Google Compute Engine guest environment
+ pkgver = 20191121
pkgrel = 1
url = https://github.com/GoogleCloudPlatform/compute-image-packages
arch = any
- arch = x86_64
license = Apache
- makedepends = curl
- makedepends = json-c
- makedepends = pam
- makedepends = python-boto
- makedepends = python-distro
- makedepends = python-setuptools
- source = google-compute-engine-20190801.tar.gz::https://github.com/GoogleCloudPlatform/compute-image-packages/archive/20190801.tar.gz
- sha256sums = 495ce6e44034b26cbcf619aeebe2cb83334ee801b2130ba2f20d4468483d3ce8
-
-pkgname = google-compute-engine
- pkgdesc = Google Compute Engine guest environment
- arch = any
depends = google-compute-engine-oslogin
depends = python-boto
depends = python-distro
depends = python-setuptools
+ source = google-compute-engine-20191121.tar.gz::https://github.com/GoogleCloudPlatform/compute-image-packages/archive/v20191121.tar.gz
+ sha256sums = 3a8fd0fcede35552e7efd091a96d2697e7d149383b5fe54008c68d4f53f69951
-pkgname = google-compute-engine-oslogin
- pkgdesc = Google Compute Engine OS login support
- arch = x86_64
- depends = curl
- depends = json-c
- depends = pam
+pkgname = google-compute-engine
diff --git a/PKGBUILD b/PKGBUILD
index f7828ad1906..adc58bab3e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,32 +15,23 @@
# Maintainer: Lorenzo Castelli <lcastelli@google.com>
# Maintainer: Samuel Littley <samuellittley@google.com>
-pkgname=('google-compute-engine' 'google-compute-engine-oslogin')
-pkgver=20190801
+pkgname='google-compute-engine'
+pkgver=20191121
pkgrel=1
-arch=('any' 'x86_64')
+pkgdesc='Google Compute Engine guest environment'
+arch=('any')
url='https://github.com/GoogleCloudPlatform/compute-image-packages'
license=('Apache')
-makedepends=('curl' 'json-c' 'pam' 'python-boto' 'python-distro' 'python-setuptools')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/GoogleCloudPlatform/compute-image-packages/archive/$pkgver.tar.gz")
-sha256sums=('495ce6e44034b26cbcf619aeebe2cb83334ee801b2130ba2f20d4468483d3ce8')
+depends=('google-compute-engine-oslogin' 'python-boto' 'python-distro' 'python-setuptools')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/GoogleCloudPlatform/compute-image-packages/archive/v$pkgver.tar.gz")
+sha256sums=('3a8fd0fcede35552e7efd091a96d2697e7d149383b5fe54008c68d4f53f69951')
build() {
- cd "compute-image-packages-$pkgver/packages"
- pushd python-google-compute-engine
+ cd "compute-image-packages-$pkgver/packages/python-google-compute-engine"
python setup.py build
- popd
-
- pushd google-compute-engine-oslogin
- make
- popd
}
-package_google-compute-engine() {
- pkgdesc='Google Compute Engine guest environment'
- arch=('any')
- depends=('google-compute-engine-oslogin' 'python-boto' 'python-distro' 'python-setuptools')
-
+package() {
cd "compute-image-packages-$pkgver/packages"
pushd python-google-compute-engine
python setup.py install --root="$pkgdir" --optimize=1 --skip-build
@@ -55,12 +46,3 @@ package_google-compute-engine() {
ln -s /usr/bin/google_set_hostname "$pkgdir/etc/dhclient-exit-hooks"
popd
}
-
-package_google-compute-engine-oslogin() {
- pkgdesc='Google Compute Engine OS login support'
- arch=('x86_64')
- depends=('curl' 'json-c' 'pam')
-
- cd "compute-image-packages-$pkgver"/packages/google-compute-engine-oslogin
- make DESTDIR="$pkgdir/" NSS_INSTALL_PATH=/usr/lib PAM_INSTALL_PATH=/usr/lib/security install
-}