Merge "lakitu: kubernetes: Updated to 1.18.8"
diff --git a/overlay-lakitu/app-emulation/konlet/Manifest b/overlay-lakitu/app-emulation/konlet/Manifest
index 9ffff5b..d4ae10e 100644
--- a/overlay-lakitu/app-emulation/konlet/Manifest
+++ b/overlay-lakitu/app-emulation/konlet/Manifest
@@ -1 +1 @@
-DIST konlet-0.10.0.tar.gz 507883 BLAKE2B 49ebedc0fa80048867e40e6996e370785840efeab89f078a91c40e0c5dade39579578ee1da9b9e26efe36979afafb5123dc0ee1fbca51d50296e74aa15c642e7 SHA512 956768ebadbff3f33d698aaeee8c757be891645d914f65bbc56fb7340475d63f5293a8335dbe614acce1f25a9f61d91a4622596dfac57436cad64f829afc6ebe
+DIST konlet-0.11.0.tar.gz 507876 BLAKE2B 6b6ef577571bc92c41f094c39d7e54a7fb9099b474eb30bb91d6355afe9065be3abf67ac02200bac53ed61728d1c04d1fcf91bf9fb539c99d24e2de51c7aa2c9 SHA512 2ce7d3942c09bf0566ef0f0f2cd932d7438decc22d4a65e44b3e84cc4a4efd9b44f7dd279ad985428d43999dacb3d492de4a36ef1f9ee6022677d61e74477a45
diff --git a/overlay-lakitu/app-emulation/konlet/konlet-0.10.0-r2.ebuild b/overlay-lakitu/app-emulation/konlet/konlet-0.10.0-r2.ebuild
deleted file mode 120000
index 7b7d0af..0000000
--- a/overlay-lakitu/app-emulation/konlet/konlet-0.10.0-r2.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-konlet-0.10.0.ebuild
\ No newline at end of file
diff --git a/overlay-lakitu/app-emulation/konlet/konlet-0.11.0-r1.ebuild b/overlay-lakitu/app-emulation/konlet/konlet-0.11.0-r1.ebuild
new file mode 120000
index 0000000..2186203
--- /dev/null
+++ b/overlay-lakitu/app-emulation/konlet/konlet-0.11.0-r1.ebuild
@@ -0,0 +1 @@
+konlet-0.11.0.ebuild
\ No newline at end of file
diff --git a/overlay-lakitu/app-emulation/konlet/konlet-0.10.0.ebuild b/overlay-lakitu/app-emulation/konlet/konlet-0.11.0.ebuild
similarity index 100%
rename from overlay-lakitu/app-emulation/konlet/konlet-0.10.0.ebuild
rename to overlay-lakitu/app-emulation/konlet/konlet-0.11.0.ebuild
diff --git a/overlay-lakitu/sys-kernel/dump-capture-kernel/Manifest b/overlay-lakitu/sys-kernel/dump-capture-kernel/Manifest
index 7699495..84cfb24 100644
--- a/overlay-lakitu/sys-kernel/dump-capture-kernel/Manifest
+++ b/overlay-lakitu/sys-kernel/dump-capture-kernel/Manifest
@@ -1 +1 @@
-DIST cos-dump-capture-kernel-f8649a7408c63f53937e33b0e8379679b0434849.tar.gz 161557003 BLAKE2B 5802ab95ff85a11267c0b3a95c0dc51aff5d3a2f87180a6ebdfa237816aeaf69af2c8d873ef7b29390aeb46ab9284d488e3907478f41948072d00b4ce2a51abf SHA512 f9db206411e0b126fda793ceaf2ea7a75a1b6b769da3c422e4fcf649bc42996a82135cc7f389b60526e2a6199aca24003e13e85c8430e32031d49aeaaa2e5b24
+DIST cos-dump-capture-kernel-f8649a7.tar.gz 161556523 BLAKE2B 2b9afb615aa57cf56f256c3f7460d1ff5e384ab599aa417c7ce47ca28c9628243356464f874a295291a3523c5aee0e5ac45f16f7e6b0086229f076b6ff8b0fd9 SHA512 3d42a846cd5f54c142dca4f1c27da65da65d15c201f1e6b35477420e320615628491b87149525c9fc1d36e09808e9ae4dad7137bf991a67d2c36bd83c7013fb3
diff --git a/overlay-lakitu/sys-kernel/dump-capture-kernel/README.md b/overlay-lakitu/sys-kernel/dump-capture-kernel/README.md
new file mode 100644
index 0000000..82cda9b
--- /dev/null
+++ b/overlay-lakitu/sys-kernel/dump-capture-kernel/README.md
@@ -0,0 +1,46 @@
+# How to update dump-capture-kernel
+
+Find the dump-capture-kernel commit you want to use for the tarball at
+https://cos.googlesource.com/third_party/dump-capture-kernel.
+Download the dump-capture-kernel tarball and upload it to chromeos-localmirror
+using the following commands:
+
+```
+# Better do this outside the chroot otherwise gsutil will complain
+# For example: Consider the kernel commit to be f8649a7.
+$ wget https://cos.googlesource.com/third_party/dump-capture-kernel/+archive/f8649a7.tar.gz
+$ gsutil cp -n -a public-read f8649a7.tar.gz \
+    gs://chromeos-localmirror/distfiles/cos-dump-capture-kernel-f8649a7.tar.gz
+$ rm f8649a7.tar.gz
+```
+
+Update the `EGIT_COMMIT` variable in the ebuild file with the new commit.
+
+1. If you have just changed the dump-capture-kernel commit in the same kernel
+   version, use the following command:
+
+   ```
+   # Outside chroot
+   $ git mv dump-capture-kernel-<kernel_version>-r<revision>.ebuild dump-capture-kernel-<kernel_version>-r<revision+1>.ebuild
+   ```
+   ```
+   # Inside chroot
+   $ equery-lakitu w dump-capture-kernel
+   $ ebuild-lakitu </path/to/ebuild>.ebuild manifest
+   $ emerge-lakitu dump-capture-kernel
+   ```
+
+2. If you have changed the kernel version for dump-capture-kernel, use the following
+   commands:
+
+   ```
+   # Outside chroot
+   $ git mv dump-capture-kernel-<old_kernel_version>-r<revision>.ebuild dump-capture-kernel-<new_kernel_version>-r1.ebuild
+   ```
+
+   ```
+   # Inside chroot
+   $ equery-lakitu w dump-capture-kernel
+   $ ebuild-lakitu </path/to/ebuild>.ebuild manifest
+   $ emerge-lakitu dump-capture-kernel
+   ```
diff --git a/overlay-lakitu/sys-kernel/dump-capture-kernel/dump-capture-kernel-4.19.ebuild b/overlay-lakitu/sys-kernel/dump-capture-kernel/dump-capture-kernel-4.19.ebuild
index e8cb031..1f94a92 100644
--- a/overlay-lakitu/sys-kernel/dump-capture-kernel/dump-capture-kernel-4.19.ebuild
+++ b/overlay-lakitu/sys-kernel/dump-capture-kernel/dump-capture-kernel-4.19.ebuild
@@ -3,37 +3,38 @@
 
 EAPI=5
 
-ETYPE="sources"
-EGIT_COMMIT="f8649a7408c63f53937e33b0e8379679b0434849"
-
-SRC_URI="https://cos.googlesource.com/third_party/dump-capture-kernel/+archive/${EGIT_COMMIT}.tar.gz -> cos-dump-capture-kernel-${EGIT_COMMIT}.tar.gz"
-
-KEYWORDS="*"
-
-CHROMEOS_KERNEL_CONFIG="${FILESDIR}/base.config"
+CROS_WORKON_BLACKLIST="1"
+EGIT_COMMIT="f8649a7"
 
 # This must be inherited *after* EGIT/CROS_WORKON variables defined
-inherit kernel-2
-
-BUILD_PARAMS="CC=${CC} CXX=${CXX}"
-STRIP_MASK+=" /usr/src/${P}/build/vmlinux"
-STRIP_MASK+=" *.ko"
+inherit cros-workon cros-kernel2
 
 DESCRIPTION="A dump capture kernel for kdump functionality"
 HOMEPAGE="https://cloud.google.com/container-optimized-os"
+KEYWORDS="*"
+CHROMEOS_KERNEL_CONFIG="${FILESDIR}/base.config"
 
+SRC_URI="gs://chromeos-localmirror/distfiles/cos-dump-capture-kernel-${EGIT_COMMIT}.tar.gz"
 S="${WORKDIR}"
 
+STRIP_MASK+=" /usr/src/${P}/build/vmlinux"
+STRIP_MASK+=" *.ko"
+
+DEPEND="
+	!sys-kernel/lakitu-kernel
+"
+RDEPEND="${DEPEND}"
+
 src_unpack() {
-	unpack ${A}
+	default
 }
 
 src_install() {
 	dodir /boot/kdump
-	make INSTALL_PATH="${D}/boot/kdump" INSTALL_MOD_PATH="${D}" \
+	kmake INSTALL_PATH="${D}/boot/kdump" INSTALL_MOD_PATH="${D}" \
 		INSTALL_MOD_STRIP=1 install
 	local version
-	version=$(make -s --no-print-directory kernelrelease)
+	version=$(kmake -s --no-print-directory kernelrelease)
 	ln -sf "vmlinuz-${version}" "${D}/boot/kdump/vmlinuz" || die
 
 	# We also strips the symbol table /boot/kdump/System.map-* at: