diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 10 |
2 files changed, 6 insertions, 10 deletions
@@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 -# Thu Jun 22 01:01:46 UTC 2017 +# Thu Jun 22 01:03:12 UTC 2017 pkgbase = google-cloud-sdk - pkgdesc = Tools and libraries SDK for managing resources on the Google Cloud Platform, plus kubectl and Python/PHP appengine SDK components + pkgdesc = Tools and libraries SDK for managing resources on the Google Cloud Platform, plus Python/PHP appengine SDK components pkgver = 160.0.0 pkgrel = 1 url = https://cloud.google.com/sdk/ @@ -13,8 +13,6 @@ pkgbase = google-cloud-sdk optdepends = java-environment: for Java version of App Engine optdepends = php: for PHP version of App Engine optdepends = python2-crcmod: verify the integrity of object contents - provides = kubectl-bin - conflicts = kubectl-bin conflicts = google-appengine-python-php conflicts = google-appengine-python conflicts = google-appengine-php @@ -6,13 +6,12 @@ pkgname="google-cloud-sdk" pkgver=160.0.0 pkgrel=1 -pkgdesc="Tools and libraries SDK for managing resources on the Google Cloud Platform, plus kubectl and Python/PHP appengine SDK components" +pkgdesc="Tools and libraries SDK for managing resources on the Google Cloud Platform, plus Python/PHP appengine SDK components" url="https://cloud.google.com/sdk/" license=("Apache") arch=('i686' 'x86_64') # replaces() only works for sysupgrade, not normal install/upgrade -provides=('kubectl-bin') -conflicts=('kubectl-bin' 'google-appengine-python-php' +conflicts=('google-appengine-python-php' 'google-appengine-python' 'google-appengine-php') replaces=('google-appengine-python-php' 'google-appengine-python' 'google-appengine-php') @@ -56,14 +55,13 @@ package() { mkdir "$pkgdir/opt" cp -r "$srcdir/$pkgname" "$pkgdir/opt" - # kubectl is not in the tarball, add it to the package bootstrap # app-engine-python is actually the PHP+Python SDK widgets combined # NOTE: due to how Google is using argparse we must bare word the components - msg2 "Running bootstrapping script and adding kubectl, app-engine-python" + msg2 "Running bootstrapping script and adding app-engine-python" python2 "$pkgdir/opt/$pkgname/bin/bootstrapping/install.py" \ --usage-reporting false --path-update false --bash-completion false \ --rc-path="$srcdir/fake.bashrc" \ - --additional-components kubectl app-engine-python + --additional-components app-engine-python # https://issuetracker.google.com/issues/35900282 msg2 "Fixing appengine bug #35900282 (RAND_egd)" |