summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Castelli2019-03-25 17:57:16 -0700
committerLorenzo Castelli2019-03-25 17:57:16 -0700
commit1244325e52442d10e7d16fb86a7269061fca9cde (patch)
tree5224d8f2ca5c57f57fa988970cc0ee85be7a5a64
parentda90c98115734dccbfea824dcbfc973898e2f466 (diff)
downloadaur-1244325e52442d10e7d16fb86a7269061fca9cde.tar.gz
Updates the package to version 20190315.
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD43
-rw-r--r--google_oslogin_control.patch17
3 files changed, 26 insertions, 44 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 56e0dcfd3d3..54f2412cc32 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,5 @@
-# Generated by makepkg 5.1.1
-# Sun Nov 4 04:17:45 UTC 2018
pkgbase = google-compute-engine
- pkgver = 20181023
+ pkgver = 20190315
pkgrel = 1
url = https://github.com/GoogleCloudPlatform/compute-image-packages
arch = any
@@ -13,10 +11,8 @@ pkgbase = google-compute-engine
makedepends = python-boto
makedepends = python-distro
makedepends = python-setuptools
- source = google-compute-engine-20181023.tar.gz::https://github.com/GoogleCloudPlatform/compute-image-packages/archive/20181023.tar.gz
- source = google_oslogin_control.patch
- sha256sums = 17355f56e405a81b19ebbf139d3d3c8b1f09f3f5b1e6b7cda428ac99d8c70523
- sha256sums = 276c1cabcd0e88b668a8c16bdca2153d47e42cc19d69d62ab54b7c7d6badc360
+ source = google-compute-engine-20190315.tar.gz::https://github.com/GoogleCloudPlatform/compute-image-packages/archive/20190315.tar.gz
+ sha256sums = 8ba134f6adf1490eb02782148586cf6a19ae7e5c779331d2e972ccff9734146a
pkgname = google-compute-engine
pkgdesc = Google Compute Engine guest environment
diff --git a/PKGBUILD b/PKGBUILD
index f7dcaf877f7..a5d54258dad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,28 +16,24 @@
# Maintainer: Samuel Littley <samuellittley@google.com>
pkgname=('google-compute-engine' 'google-compute-engine-oslogin')
-pkgver=20181023
+pkgver=20190315
pkgrel=1
arch=('any' 'x86_64')
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"
- "google_oslogin_control.patch")
-sha256sums=('17355f56e405a81b19ebbf139d3d3c8b1f09f3f5b1e6b7cda428ac99d8c70523'
- '276c1cabcd0e88b668a8c16bdca2153d47e42cc19d69d62ab54b7c7d6badc360')
-
-prepare() {
- cd "compute-image-packages-$pkgver"
- patch -p1 -i ../google_oslogin_control.patch
-}
+source=("$pkgname-$pkgver.tar.gz::https://github.com/GoogleCloudPlatform/compute-image-packages/archive/$pkgver.tar.gz")
+sha256sums=('8ba134f6adf1490eb02782148586cf6a19ae7e5c779331d2e972ccff9734146a')
build() {
- cd "compute-image-packages-$pkgver"
+ cd "compute-image-packages-$pkgver/packages"
+ pushd python-google-compute-engine
python setup.py build
+ popd
- cd google_compute_engine_oslogin
+ pushd google-compute-engine-oslogin
make
+ popd
}
package_google-compute-engine() {
@@ -45,14 +41,21 @@ package_google-compute-engine() {
arch=('any')
depends=('google-compute-engine-oslogin' 'python-boto' 'python-distro' 'python-setuptools')
- cd "compute-image-packages-$pkgver"
-
+ cd "compute-image-packages-$pkgver/packages"
+ pushd python-google-compute-engine
python setup.py install --root="$pkgdir" --optimize=1 --skip-build
- install -m644 -Dt "$pkgdir/usr/lib/systemd/system/" google_compute_engine_init/systemd/*.service
- install -m755 -Dt "$pkgdir/etc/dhcp/dhclient-exit-hooks.d/" google_config/bin/google_set_hostname
- install -m644 -Dt "$pkgdir/etc/modprobe.d" google_config/modprobe/gce-blacklist.conf
- install -m644 -Dt "$pkgdir/etc/sysctl.d" google_config/sysctl/*
- install -m644 -Dt "$pkgdir/usr/lib/udev/rules.d" google_config/udev/*
+ popd
+
+ pushd google-compute-engine/src
+ install -d "$pkgdir/etc/dhcp/dhclient-exit-hooks.d"
+ # Use cp to install symbolic links.
+ cp -d etc/dhcp/dhclient-exit-hooks.d/* "$pkgdir/etc/dhcp/dhclient-exit-hooks.d"
+ install -m644 -Dt "$pkgdir/etc/modprobe.d" etc/modprobe.d/*
+ install -m644 -Dt "$pkgdir/etc/sysctl.d" etc/sysctl.d/*
+ install -m644 -Dt "$pkgdir/usr/lib/systemd/system/" lib/systemd/system/*
+ install -m644 -Dt "$pkgdir/usr/lib/udev/rules.d" lib/udev/rules.d/*
+ install -m755 -Dt "$pkgdir/usr/bin" usr/bin/*
+ popd
}
package_google-compute-engine-oslogin() {
@@ -60,6 +63,6 @@ package_google-compute-engine-oslogin() {
arch=('x86_64')
depends=('curl' 'json-c' 'pam')
- cd "compute-image-packages-$pkgver"/google_compute_engine_oslogin
+ 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
}
diff --git a/google_oslogin_control.patch b/google_oslogin_control.patch
deleted file mode 100644
index 5eb0cf053b9..00000000000
--- a/google_oslogin_control.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/google_compute_engine_oslogin/bin/google_oslogin_control b/google_compute_engine_oslogin/bin/google_oslogin_control
-index 5a1ee99..47f953e 100755
---- a/google_compute_engine_oslogin/bin/google_oslogin_control
-+++ b/google_compute_engine_oslogin/bin/google_oslogin_control
-@@ -15,7 +15,11 @@
-
- script_name=$(basename "$0")
- nss_config="/etc/nsswitch.conf"
--pam_config="/etc/pam.d/sshd"
-+if grep -q -s "ID=arch" /etc/os-release; then
-+ pam_config="/etc/pam.d/system-login"
-+else
-+ pam_config="/etc/pam.d/sshd"
-+fi
- sshd_config="/etc/ssh/sshd_config"
- el_release_file="/etc/redhat-release"
- sudoers_dir="/var/google-sudoers.d"