diff options
author | Zach Marano <zmarano@google.com> | 2019-06-11 14:32:32 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-11 14:32:32 -0700 |
commit | aaea64d8d135df44fca9f98c620d53f4a660858b (patch) | |
tree | 7570f2d94062196ac950309daca6f523ea8e656c /packages/google-compute-engine | |
parent | e7cc083cfaace84516d9d5fb99881a154850d638 (diff) | |
download | google-compute-image-packages-aaea64d8d135df44fca9f98c620d53f4a660858b.tar.gz |
Cleanup build files pull in distro patches. (#791)
- Pull in common patches from Debian[1] and Ubuntu[2] sources.
- Drop unnecessary build and package dependencies.
- Log to journal and console directly from systemd service files and drop system journal config[3].
- Remove links from Debian build and use dh_link.
- Update Debian build dependencies to Stretch+ standards.
- Move Debian entry point scripts to python3.
[1] https://salsa.debian.org/cloud-team/google-compute-image-packages/tree/debian/20190124-3
[2] https://git.launchpad.net/ubuntu/+source/gce-compute-image-packages/
[3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923889
Diffstat (limited to 'packages/google-compute-engine')
16 files changed, 18 insertions, 25 deletions
diff --git a/packages/google-compute-engine/packaging/debian/changelog b/packages/google-compute-engine/packaging/debian/changelog index 42a62e1..27d94df 100644 --- a/packages/google-compute-engine/packaging/debian/changelog +++ b/packages/google-compute-engine/packaging/debian/changelog @@ -2,7 +2,7 @@ google-compute-engine (2.8.16-1) stable; urgency=low * Fix instance setup in Python 3 environments. - -- Google Cloud Team <gc-team@google.com> Tue, 22 May 2019 12:00:00 -0700 + -- Google Cloud Team <gc-team@google.com> Wed, 22 May 2019 12:00:00 -0700 google-compute-engine (2.8.15-1) stable; urgency=low diff --git a/packages/google-compute-engine/packaging/debian/compat b/packages/google-compute-engine/packaging/debian/compat index ec63514..f599e28 100644 --- a/packages/google-compute-engine/packaging/debian/compat +++ b/packages/google-compute-engine/packaging/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/packages/google-compute-engine/packaging/debian/control b/packages/google-compute-engine/packaging/debian/control index 3f647fe..1c39b9f 100644 --- a/packages/google-compute-engine/packaging/debian/control +++ b/packages/google-compute-engine/packaging/debian/control @@ -2,18 +2,17 @@ Source: google-compute-engine Section: admin Priority: optional Maintainer: Google Cloud Team <gc-team@google.com> -Build-Depends: debhelper (>= 9), - dh-systemd (>= 1.5) +Build-Depends: debhelper (>= 10) Standards-Version: 3.9.8 Homepage: https://github.com/GoogleCloudPlatform/compute-image-packages Package: google-compute-engine Architecture: all Depends: google-compute-engine-oslogin, + python3-google-compute-engine, ${misc:Depends}, - rsyslog | system-log-daemon, systemd -Recommends: rsyslog +Recommends: rsyslog | system-log-daemon Provides: irqbalance Conflicts: google-compute-engine-jessie, google-compute-engine-init-jessie, diff --git a/packages/google-compute-engine/packaging/debian/google-compute-engine.links b/packages/google-compute-engine/packaging/debian/google-compute-engine.links new file mode 100644 index 0000000..a8ebeff --- /dev/null +++ b/packages/google-compute-engine/packaging/debian/google-compute-engine.links @@ -0,0 +1 @@ +usr/bin/google_set_hostname etc/dhcp/dhclient-exit-hooks.d/google_set_hostname diff --git a/packages/google-compute-engine/packaging/debian/install b/packages/google-compute-engine/packaging/debian/install index f95892b..b436f83 100644 --- a/packages/google-compute-engine/packaging/debian/install +++ b/packages/google-compute-engine/packaging/debian/install @@ -1,5 +1,4 @@ etc/apt/apt.conf.d/* -etc/dhcp/dhclient-exit-hooks.d/* etc/modprobe.d/* etc/rsyslog.d/* etc/sysctl.d/* diff --git a/packages/google-compute-engine/packaging/debian/rules b/packages/google-compute-engine/packaging/debian/rules index d82bff9..d82bff9 100644..100755 --- a/packages/google-compute-engine/packaging/debian/rules +++ b/packages/google-compute-engine/packaging/debian/rules diff --git a/packages/google-compute-engine/packaging/google-compute-engine-el6.spec b/packages/google-compute-engine/packaging/google-compute-engine-el6.spec index a4c4084..f41808d 100644 --- a/packages/google-compute-engine/packaging/google-compute-engine-el6.spec +++ b/packages/google-compute-engine/packaging/google-compute-engine-el6.spec @@ -44,6 +44,8 @@ specific to the Google Compute Engine cloud environment. cp -a src/{etc,usr} %{buildroot} install -d %{buildroot}/lib/ cp -a src/lib/udev %{buildroot}/lib +mkdir -p %{buildroot}/etc/dhcp +ln -sf /usr/bin/google_set_hostname %{buildroot}/etc/dhcp/dhclient-exit-hooks %files %defattr(0644,root,root,0755) diff --git a/packages/google-compute-engine/src/etc/dhcp/dhclient-exit-hooks b/packages/google-compute-engine/src/etc/dhcp/dhclient-exit-hooks deleted file mode 120000 index 577ef53..0000000 --- a/packages/google-compute-engine/src/etc/dhcp/dhclient-exit-hooks +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/google_set_hostname
\ No newline at end of file diff --git a/packages/google-compute-engine/src/etc/dhcp/dhclient-exit-hooks.d/google_set_hostname b/packages/google-compute-engine/src/etc/dhcp/dhclient-exit-hooks.d/google_set_hostname deleted file mode 120000 index 577ef53..0000000 --- a/packages/google-compute-engine/src/etc/dhcp/dhclient-exit-hooks.d/google_set_hostname +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/google_set_hostname
\ No newline at end of file diff --git a/packages/google-compute-engine/src/lib/systemd/system/google-accounts-daemon.service b/packages/google-compute-engine/src/lib/systemd/system/google-accounts-daemon.service index 9158be5..db627aa 100644 --- a/packages/google-compute-engine/src/lib/systemd/system/google-accounts-daemon.service +++ b/packages/google-compute-engine/src/lib/systemd/system/google-accounts-daemon.service @@ -1,13 +1,13 @@ [Unit] Description=Google Compute Engine Accounts Daemon After=network.target google-instance-setup.service google-network-daemon.service -Requires=network.target [Service] Type=simple ExecStart=/usr/bin/google_accounts_daemon OOMScoreAdjust=-999 Restart=always +StandardOutput=journal+console [Install] WantedBy=multi-user.target diff --git a/packages/google-compute-engine/src/lib/systemd/system/google-clock-skew-daemon.service b/packages/google-compute-engine/src/lib/systemd/system/google-clock-skew-daemon.service index 71369f5..9339116 100644 --- a/packages/google-compute-engine/src/lib/systemd/system/google-clock-skew-daemon.service +++ b/packages/google-compute-engine/src/lib/systemd/system/google-clock-skew-daemon.service @@ -1,11 +1,11 @@ [Unit] Description=Google Compute Engine Clock Skew Daemon After=network.target google-instance-setup.service google-network-daemon.service -Requires=network.target [Service] Type=simple ExecStart=/usr/bin/google_clock_skew_daemon +StandardOutput=journal+console [Install] WantedBy=multi-user.target diff --git a/packages/google-compute-engine/src/lib/systemd/system/google-instance-setup.service b/packages/google-compute-engine/src/lib/systemd/system/google-instance-setup.service index afa639a..fff2ca0 100644 --- a/packages/google-compute-engine/src/lib/systemd/system/google-instance-setup.service +++ b/packages/google-compute-engine/src/lib/systemd/system/google-instance-setup.service @@ -1,12 +1,12 @@ [Unit] Description=Google Compute Engine Instance Setup -After=local-fs.target network-online.target network.target rsyslog.service +After=network-online.target network.target Before=sshd.service -Wants=local-fs.target network-online.target network.target [Service] Type=oneshot ExecStart=/usr/bin/google_instance_setup +StandardOutput=journal+console [Install] WantedBy=sshd.service diff --git a/packages/google-compute-engine/src/lib/systemd/system/google-network-daemon.service b/packages/google-compute-engine/src/lib/systemd/system/google-network-daemon.service index 74bf82e..71745d4 100644 --- a/packages/google-compute-engine/src/lib/systemd/system/google-network-daemon.service +++ b/packages/google-compute-engine/src/lib/systemd/system/google-network-daemon.service @@ -1,14 +1,13 @@ [Unit] Description=Google Compute Engine Network Daemon -After=local-fs.target network-online.target network.target rsyslog.service +After=network-online.target network.target After=google-instance-setup.service -Wants=local-fs.target network-online.target network.target -Requires=network.target PartOf=network.service [Service] Type=simple ExecStart=/usr/bin/google_network_daemon +StandardOutput=journal+console [Install] WantedBy=multi-user.target diff --git a/packages/google-compute-engine/src/lib/systemd/system/google-shutdown-scripts.service b/packages/google-compute-engine/src/lib/systemd/system/google-shutdown-scripts.service index 069405e..3db4d21 100644 --- a/packages/google-compute-engine/src/lib/systemd/system/google-shutdown-scripts.service +++ b/packages/google-compute-engine/src/lib/systemd/system/google-shutdown-scripts.service @@ -1,8 +1,7 @@ [Unit] Description=Google Compute Engine Shutdown Scripts -After=local-fs.target network-online.target network.target rsyslog.service systemd-resolved.service +After=network-online.target network.target After=google-instance-setup.service google-network-daemon.service -Wants=local-fs.target network-online.target network.target [Service] ExecStart=/bin/true @@ -10,6 +9,7 @@ ExecStop=/usr/bin/google_metadata_script_runner --script-type shutdown Type=oneshot RemainAfterExit=true TimeoutStopSec=0 +StandardOutput=journal+console [Install] WantedBy=multi-user.target diff --git a/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service b/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service index 73ee8db..0f8cf8b 100644 --- a/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service +++ b/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service @@ -1,13 +1,13 @@ [Unit] Description=Google Compute Engine Startup Scripts -After=local-fs.target network-online.target network.target rsyslog.service +After=network-online.target network.target After=google-instance-setup.service google-network-daemon.service -Wants=local-fs.target network-online.target network.target [Service] ExecStart=/usr/bin/google_metadata_script_runner --script-type startup KillMode=process Type=oneshot +StandardOutput=journal+console [Install] WantedBy=multi-user.target diff --git a/packages/google-compute-engine/src/usr/lib/systemd/journald.conf.d/20-google.conf b/packages/google-compute-engine/src/usr/lib/systemd/journald.conf.d/20-google.conf deleted file mode 100644 index 6c620d5..0000000 --- a/packages/google-compute-engine/src/usr/lib/systemd/journald.conf.d/20-google.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Google Compute Engine default console logging. -# This is not currently included in any packages, but may in the future. - -[Journal] -ForwardToConsole=yes |