summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Marano <zmarano@google.com>2017-10-25 11:37:55 -0700
committerGitHub <noreply@github.com>2017-10-25 11:37:55 -0700
commita07e28c0c131feb6338c82880fd8e208f3295c2e (patch)
treea08e803b40a76bfd688f878923fcd8affe3f6a85
parent85982c0221be0bc6745a9cf8208c546ab7a31b30 (diff)
downloadgoogle-compute-image-packages-a07e28c0c131feb6338c82880fd8e208f3295c2e.tar.gz
Bump package versions. (#508)
-rw-r--r--debian/changelog7
-rw-r--r--debian/google-compute-engine.install4
-rw-r--r--google_compute_engine_oslogin/Makefile2
-rw-r--r--google_compute_engine_oslogin/packaging/debian8/changelog6
-rw-r--r--google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links2
-rw-r--r--google_compute_engine_oslogin/packaging/debian9/changelog6
-rw-r--r--google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links2
-rw-r--r--google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec2
-rwxr-xr-xgoogle_compute_engine_oslogin/packaging/setup_deb.sh2
-rwxr-xr-xgoogle_compute_engine_oslogin/packaging/setup_rpm.sh2
-rwxr-xr-xsetup.py2
-rw-r--r--specs/google-compute-engine.spec2
-rw-r--r--specs/python-google-compute-engine.spec2
13 files changed, 30 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index b933d9c..a731af4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+google-compute-image-packages (2.7.1-1) stable; urgency=low
+
+ * Update set_hostname file name to prevent conflict.
+ * Add apt config to prevent auto-removal of google-compute-engine.
+
+ -- Google Cloud Team <gc-team@google.com> Wed, 25 Oct 2017 12:00:00 -0700
+
google-compute-image-packages (2.7.0-6) stable; urgency=low
* Linux guest environment support for OS Login.
diff --git a/debian/google-compute-engine.install b/debian/google-compute-engine.install
index 5ba7f77..e9dfb6c 100644
--- a/debian/google-compute-engine.install
+++ b/debian/google-compute-engine.install
@@ -1,7 +1,7 @@
google_compute_engine_init/systemd/*.service lib/systemd/system
google_compute_engine_init/systemd/90-google-compute-engine.preset lib/systemd/system-preset
-google_confid/apt/01autoremove-gce etc/apt/apt.conf.d
+google_config/apt/01autoremove-gce etc/apt/apt.conf.d
google_config/bin/google_set_hostname etc/dhcp/dhclient-exit-hooks.d
google_config/rsyslog/* etc/rsyslog.d
google_config/sysctl/* etc/sysctl.d
-google_config/udev/* lib/udev/rules.d \ No newline at end of file
+google_config/udev/* lib/udev/rules.d
diff --git a/google_compute_engine_oslogin/Makefile b/google_compute_engine_oslogin/Makefile
index 762f264..41d2dd8 100644
--- a/google_compute_engine_oslogin/Makefile
+++ b/google_compute_engine_oslogin/Makefile
@@ -4,7 +4,7 @@ BASENAME = oslogin
NAME = google-compute-engine-$(BASENAME)
MAJOR = 1
MINOR = 1
-REVISION = 0
+REVISION = 1
NSS_LIBRARY_NAME = libnss_$(NAME)-$(MAJOR).$(MINOR).$(REVISION).so
NSS_LIBRARY_SONAME = libnss_$(BASENAME).so.2
diff --git a/google_compute_engine_oslogin/packaging/debian8/changelog b/google_compute_engine_oslogin/packaging/debian8/changelog
index 4ca21ff..8ecb4e5 100644
--- a/google_compute_engine_oslogin/packaging/debian8/changelog
+++ b/google_compute_engine_oslogin/packaging/debian8/changelog
@@ -1,3 +1,9 @@
+google-compute-engine-oslogin (1.1.1-1+deb8) unstable; urgency=low
+
+ * Remove logging when checking OS Login status.
+
+ -- MAINTAINER <gc-team@google.com> Wed, 25 Oct 2017 12:00:00 -0700
+
google-compute-engine-oslogin (1.1.0-1+deb8) unstable; urgency=low
* OS Login is enabled via the google-compute-engine package.
diff --git a/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links b/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links
index f0a2b36..80df68f 100644
--- a/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links
+++ b/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links
@@ -1 +1 @@
-/lib/libnss_google-compute-engine-oslogin-1.1.0.so /lib/libnss_oslogin.so.2
+/lib/libnss_google-compute-engine-oslogin-1.1.1.so /lib/libnss_oslogin.so.2
diff --git a/google_compute_engine_oslogin/packaging/debian9/changelog b/google_compute_engine_oslogin/packaging/debian9/changelog
index 6213f99..7c8af52 100644
--- a/google_compute_engine_oslogin/packaging/debian9/changelog
+++ b/google_compute_engine_oslogin/packaging/debian9/changelog
@@ -1,3 +1,9 @@
+google-compute-engine-oslogin (1.1.1-1+deb9) unstable; urgency=low
+
+ * Remove logging when checking OS Login status.
+
+ -- MAINTAINER <gc-team@google.com> Wed, 25 Oct 2017 12:00:00 -0700
+
google-compute-engine-oslogin (1.1.0-1+deb9) unstable; urgency=low
* OS Login is enabled via the google-compute-engine package.
diff --git a/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links b/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links
index f0a2b36..80df68f 100644
--- a/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links
+++ b/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links
@@ -1 +1 @@
-/lib/libnss_google-compute-engine-oslogin-1.1.0.so /lib/libnss_oslogin.so.2
+/lib/libnss_google-compute-engine-oslogin-1.1.1.so /lib/libnss_oslogin.so.2
diff --git a/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec b/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec
index b7fb662..991a16f 100644
--- a/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec
+++ b/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec
@@ -13,7 +13,7 @@
# limitations under the License.
Name: google-compute-engine-oslogin
-Version: 1.1.0
+Version: 1.1.1
Release: 1%{?dist}
Summary: OS Login Functionality for Google Compute Engine
diff --git a/google_compute_engine_oslogin/packaging/setup_deb.sh b/google_compute_engine_oslogin/packaging/setup_deb.sh
index 9de2c79..c361c22 100755
--- a/google_compute_engine_oslogin/packaging/setup_deb.sh
+++ b/google_compute_engine_oslogin/packaging/setup_deb.sh
@@ -20,7 +20,7 @@
# Run from the top of the source directory.
NAME="google-compute-engine-oslogin"
-VERSION="1.1.0"
+VERSION="1.1.1"
working_dir=${PWD}
diff --git a/google_compute_engine_oslogin/packaging/setup_rpm.sh b/google_compute_engine_oslogin/packaging/setup_rpm.sh
index 87bbe2a..3d71eeb 100755
--- a/google_compute_engine_oslogin/packaging/setup_rpm.sh
+++ b/google_compute_engine_oslogin/packaging/setup_rpm.sh
@@ -20,7 +20,7 @@
# Run from the top of the source directory.
NAME="google-compute-engine-oslogin"
-VERSION="1.1.0"
+VERSION="1.1.1"
working_dir=${PWD}
rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION}
diff --git a/setup.py b/setup.py
index d8c888a..51223db 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ setuptools.setup(
packages=setuptools.find_packages(),
scripts=glob.glob('scripts/*'),
url='https://github.com/GoogleCloudPlatform/compute-image-packages',
- version='2.7.0',
+ version='2.7.1',
# Entry points create scripts in /usr/bin that call a function.
entry_points={
'console_scripts': [
diff --git a/specs/google-compute-engine.spec b/specs/google-compute-engine.spec
index b1b14e6..6f39831 100644
--- a/specs/google-compute-engine.spec
+++ b/specs/google-compute-engine.spec
@@ -18,7 +18,7 @@
%endif
Name: google-compute-engine
-Version: 2.7.0
+Version: 2.7.1
Release: 1%{?dist}
Summary: Google Compute Engine guest environment.
License: ASL 2.0
diff --git a/specs/python-google-compute-engine.spec b/specs/python-google-compute-engine.spec
index 39f4a5b..7a4e8e4 100644
--- a/specs/python-google-compute-engine.spec
+++ b/specs/python-google-compute-engine.spec
@@ -18,7 +18,7 @@
%endif
Name: python-google-compute-engine
-Version: 2.7.0
+Version: 2.7.1
Release: 1%{?dist}
Summary: Google Compute Engine python library
License: ASL 2.0