Merge "project-lakitu: export the package information as an build artifact"
diff --git a/project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1-r21.ebuild b/project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1-r22.ebuild
similarity index 100%
rename from project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1-r21.ebuild
rename to project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1-r22.ebuild
diff --git a/project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1.ebuild b/project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1.ebuild
index 4c4c3bc..3744870 100644
--- a/project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1.ebuild
+++ b/project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1.ebuild
@@ -65,8 +65,6 @@
insinto "$(systemd_get_unitdir)/update-engine.service.d"
newins "${FILESDIR}"/update-engine-secure-boot.conf secure-boot.conf
- # Upstream crash-sender.service has a random delay up to 6 minutes.
- # The drop-in file forces immediate uploading by setting max_spread_time=0.
insinto "$(systemd_get_unitdir)/crash-sender.service.d"
newins "${FILESDIR}"/crash-sender-send-immediately.conf send-immediately.conf
diff --git a/project-lakitu/chromeos-base/chromeos-init-systemd/files/crash-sender-send-immediately.conf b/project-lakitu/chromeos-base/chromeos-init-systemd/files/crash-sender-send-immediately.conf
index 3ba8177..6e4805a 100644
--- a/project-lakitu/chromeos-base/chromeos-init-systemd/files/crash-sender-send-immediately.conf
+++ b/project-lakitu/chromeos-base/chromeos-init-systemd/files/crash-sender-send-immediately.conf
@@ -2,5 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
[Service]
+# Clear existing ExecStart specified in ChromiumOS crash-sender.service.
+# See also:
+# https://chromium.googlesource.com/chromiumos/platform2/+/refs/heads/master/crash-reporter/init/crash-sender.service#7
+# https://www.freedesktop.org/software/systemd/man/systemd.unit.html#:~:text=remove%20entries%20from%20a%20setting
ExecStart=
-ExecStart=/sbin/crash_sender --max_spread_time=0
+# Upstream crash-sender.service has a random delay up to 6 minutes.
+# The drop-in file forces immediate uploading by setting max_spread_time=1.
+# Do not set to 0 because it would trigger UMA metric sending, but COS does
+# not have metrics daemon installed.
+ExecStart=/sbin/crash_sender --max_spread_time=1
diff --git a/project-lakitu/profiles/base/package.use b/project-lakitu/profiles/base/package.use
index 56c179f..9383762 100644
--- a/project-lakitu/profiles/base/package.use
+++ b/project-lakitu/profiles/base/package.use
@@ -85,3 +85,7 @@
app-admin/compute-image-packages python_targets_python2_7
app-admin/sosreport python_targets_python2_7
sys-process/audit python_targets_python2_7
+
+# Enable libyaml for the pyyaml
+# netplan requires pyyaml to be enabled with libyaml.
+dev-python/pyyaml libyaml
diff --git a/project-lakitu/sys-kernel/lakitu-kernel-5_4/lakitu-kernel-5_4-5.4.71-r46.ebuild b/project-lakitu/sys-kernel/lakitu-kernel-5_4/lakitu-kernel-5_4-5.4.72-r48.ebuild
similarity index 97%
rename from project-lakitu/sys-kernel/lakitu-kernel-5_4/lakitu-kernel-5_4-5.4.71-r46.ebuild
rename to project-lakitu/sys-kernel/lakitu-kernel-5_4/lakitu-kernel-5_4-5.4.72-r48.ebuild
index c2122db..a16b396 100644
--- a/project-lakitu/sys-kernel/lakitu-kernel-5_4/lakitu-kernel-5_4-5.4.71-r46.ebuild
+++ b/project-lakitu/sys-kernel/lakitu-kernel-5_4/lakitu-kernel-5_4-5.4.72-r48.ebuild
@@ -3,8 +3,8 @@
EAPI=6
-CROS_WORKON_COMMIT="12dc5bfefe82c7370766859fb490faa26ec76f42"
-CROS_WORKON_TREE="aa5f90bf3984cf5723ada88192adfbbced35c38f"
+CROS_WORKON_COMMIT="5534a485b2e9f92f6c0bf92421a2e0399db19650"
+CROS_WORKON_TREE="42b17e5593fc1a109a34f3df4309735dd4992b49"
CROS_WORKON_PROJECT="third_party/kernel"
CROS_WORKON_LOCALNAME="kernel/v5.4"
