diff options
| author | Zach Marano <zmarano@google.com> | 2016-05-31 17:52:38 -0700 |
|---|---|---|
| committer | Zach Marano <zmarano@google.com> | 2016-05-31 17:57:23 -0700 |
| commit | 9057fcbf3d62a46a263bf53808cd1cc5625530e0 (patch) | |
| tree | 6328322525ba922abc1cc153bf392081056952b5 | |
| parent | 9d4d7fc0c5848146712361f5b916605e5a5c7c29 (diff) | |
| download | google-compute-image-packages-9057fcbf3d62a46a263bf53808cd1cc5625530e0.tar.gz | |
Change package dependencies and distro names.
| -rwxr-xr-x | build_packages.sh | 6 | ||||
| -rwxr-xr-x | google_configs/build_packages.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build_packages.sh b/build_packages.sh index 0a38806..b119403 100755 --- a/build_packages.sh +++ b/build_packages.sh @@ -36,7 +36,7 @@ function build_distro() { --after-install "package/${init_config}/postinst.sh" \ --before-remove "package/${init_config}/prerm.sh" \ --depends 'python-boto' \ - --depends 'python-pkg-resources' \ + --depends 'python-setuptools' \ --iteration "0.${TIMESTAMP}" \ --maintainer 'gc-team@google.com' \ --name "${name}" \ @@ -53,5 +53,5 @@ build_distro 'el6' 'rpm' 'upstart' '/usr/lib/python2.6/site-packages' build_distro 'el7' 'rpm' 'systemd' '/usr/lib/python2.7/site-packages' # Debian -build_distro 'deb7' 'deb' 'sysvinit' '/usr/lib/python2.7/dist-packages' -build_distro 'deb8' 'deb' 'systemd' '/usr/lib/python2.7/dist-packages' +build_distro 'wheezy' 'deb' 'sysvinit' '/usr/lib/python2.7/dist-packages' +build_distro 'jessie' 'deb' 'systemd' '/usr/lib/python2.7/dist-packages' diff --git a/google_configs/build_packages.sh b/google_configs/build_packages.sh index c9bd574..3b4e24f 100755 --- a/google_configs/build_packages.sh +++ b/google_configs/build_packages.sh @@ -56,9 +56,9 @@ build_distro 'el7' 'rpm' \ 'dhcp/google_hostname.sh=/etc/dhcp/dhclient.d/google_hostname.sh' # Debian 7 -build_distro 'deb7' 'deb' \ +build_distro 'wheezy' 'deb' \ 'bin/set_hostname=/etc/dhcp/dhclient-exit-hooks.d/set_hostname' # Debian 8 -build_distro 'deb8' 'deb' \ +build_distro 'jessie' 'deb' \ 'bin/set_hostname=/etc/dhcp/dhclient-exit-hooks.d/set_hostname' |