From afbaf34e4dae7bf7f1822d04320b47b864562680 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Thu, 28 Nov 2024 13:42:12 +0100 Subject: [PATCH] emerge-gitclone: Use commit+FETCH_HEAD for fetching Pulls in a commit in emerge-gitclone, that adapts emerge-gitclone to work for commits for PRs from external contributors. Signed-off-by: Jeremi Piotrowski --- .../coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild index 113067d692..61132d5b67 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild @@ -7,7 +7,9 @@ EGIT_REPO_URI="https://github.com/flatcar/flatcar-dev-util.git" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - EGIT_COMMIT="00396595376d8d6a3c4b9251ba94e9de2d7a9e39" # flatcar-master + #EGIT_COMMIT="00396595376d8d6a3c4b9251ba94e9de2d7a9e39" # flatcar-master + EGIT_COMMIT="cd1b814127e8d8dbe8513ba10195eab70c853579" # flatcar-master + EGIT_BRANCH="jepio/fetch-head" KEYWORDS="amd64 arm arm64 x86" fi