From 6537cdf2e9c51c3a36ddc361d5189d3a1c146f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Mon, 30 Mar 2020 15:33:53 +0200 Subject: [PATCH] app-admin/mayday: Point to flatcar-master and use Go Modules Pulls in https://github.com/flatcar-linux/mayday/pull/7 https://github.com/flatcar-linux/mayday/pull/6 https://github.com/flatcar-linux/mayday/pull/4 to include pstore files and the journalctl output in the tar ball by default, and also use Go Modules to build. --- .../mayday/{mayday-1.0.0-r1.ebuild => mayday-1.0.0-r2.ebuild} | 0 .../coreos-overlay/app-admin/mayday/mayday-9999.ebuild | 4 ++-- .../md5-cache/app-admin/{mayday-1.0.0-r1 => mayday-1.0.0-r2} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/mayday/{mayday-1.0.0-r1.ebuild => mayday-1.0.0-r2.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/{mayday-1.0.0-r1 => mayday-1.0.0-r2} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-1.0.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-1.0.0-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-1.0.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-1.0.0-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild index 2e39ab5082..513f2c5b77 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild @@ -11,7 +11,7 @@ inherit coreos-go cros-workon if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="a1fafd6bcaab8fd035a081afb4a47ba21c6864ee" # flatcar-master + CROS_WORKON_COMMIT="b2b1b3cb6beed130454b3fb04b45a020997a9edd" # flatcar-master KEYWORDS="amd64 arm64" fi @@ -24,7 +24,7 @@ SLOT="0" IUSE="" src_compile() { - go_build "${COREOS_GO_PACKAGE}" + COREOS_GO_MOD=vendor go_build "${COREOS_GO_PACKAGE}" } src_install() { diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-1.0.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-1.0.0-r2 similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-1.0.0-r1 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-1.0.0-r2