From 4e33e9667ce74d9b986655725925d5b2bc86587c Mon Sep 17 00:00:00 2001
From: Dongsu Park <dongsu@kinvolk.io>
Date: Wed, 1 Apr 2020 09:10:48 +0200
Subject: [PATCH] .github: fix metadata generation for Kernel and Go

We need to generate metadata after the main commit was created.
Also run git format-patch for both commits, main and metadata.
---
 .../.github/workflows/go-apply-patch.sh              | 12 +++++++-----
 .../.github/workflows/kernel-apply-patch.sh          | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh
index 620af74163..3e6b3cefa3 100755
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh
@@ -18,14 +18,16 @@ function enter() ( cd ../../..; exec cork enter -- $@ )
 
 enter ebuild "/mnt/host/source/src/third_party/coreos-overlay/dev-lang/go/go-${VERSION_NEW}.ebuild" manifest --force
 
-# Generate metadata after the main commit was done.
-enter /mnt/host/source/src/scripts/update_metadata --commit coreos
-
 # We can only create the actual commit in the actual source directory, not under the SDK.
 # So create a format-patch, and apply to the actual source.
 git add dev-lang/go/go-${VERSION_NEW}* metadata
 git commit -a -m "dev-lang/go: Upgrade Go ${versionOld} to ${VERSION_NEW}"
-git format-patch -1 --stdout HEAD > "${branch}".patch
+
+# Generate metadata after the main commit was done.
+enter /mnt/host/source/src/scripts/update_metadata --commit coreos
+
+# Create 2 patches, one for the main ebuilds, the other for metadata changes.
+git format-patch -2 HEAD
 popd || exit
 
 git config user.name 'Flatcar Buildbot'
@@ -33,6 +35,6 @@ git config user.email 'buildbot@flatcar-linux.org'
 git reset --hard HEAD
 git fetch origin
 git checkout -B "${BASE_BRANCH}" "origin/${BASE_BRANCH}"
-git am ~/flatcar-sdk/src/third_party/coreos-overlay/"${branch}".patch
+git am ~/flatcar-sdk/src/third_party/coreos-overlay/0*.patch
 
 echo ::set-output name=VERSION_OLD::"${versionOld}"
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh
index a79e436576..b4c68a54c5 100755
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh
@@ -21,14 +21,16 @@ function enter() ( cd ../../..; exec cork enter -- $@ )
 
 enter ebuild "/mnt/host/source/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-${VERSION_NEW}.ebuild" manifest --force
 
-# Generate metadata after the main commit was done.
-enter /mnt/host/source/src/scripts/update_metadata --commit coreos
-
 # We can only create the actual commit in the actual source directory, not under the SDK.
 # So create a format-patch, and apply to the actual source.
 git add sys-kernel/coreos-* metadata
 git commit -a -m "sys-kernel: Upgrade Linux ${versionOld} to ${VERSION_NEW}"
-git format-patch -1 --stdout HEAD > "${branch}".patch
+
+# Generate metadata after the main commit was done.
+enter /mnt/host/source/src/scripts/update_metadata --commit coreos
+
+# Create 2 patches, one for the main ebuilds, the other for metadata changes.
+git format-patch -2 HEAD
 popd || exit
 
 git config user.name 'Flatcar Buildbot'
@@ -36,6 +38,6 @@ git config user.email 'buildbot@flatcar-linux.org'
 git reset --hard HEAD
 git fetch origin
 git checkout -B "${BASE_BRANCH}" "origin/${BASE_BRANCH}"
-git am ~/flatcar-sdk/src/third_party/coreos-overlay/"${branch}".patch
+git am ~/flatcar-sdk/src/third_party/coreos-overlay/0*.patch
 
 echo ::set-output name=VERSION_OLD::"${versionOld}"