From 7dd3c27d076af5ce54d1a6b23061bc0211f67989 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 18 Feb 2021 16:26:18 +0100 Subject: [PATCH 1/3] .github: Drop unnecessary semicolons and trailing backslashes Looks like it was copied straight from the Makefile. --- .../.github/workflows/kernel-apply-patch.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 e46d0a7715..722568fd17 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 @@ -25,11 +25,11 @@ if [[ "${VERSION_NEW}" = "${VERSION_OLD}" ]]; then exit 0 fi -for pkg in sources modules kernel; do \ - pushd "sys-kernel/coreos-${pkg}" >/dev/null || exit; \ - git mv "coreos-${pkg}"-*.ebuild "coreos-${pkg}-${VERSION_NEW}.ebuild"; \ - sed -i -e '/^COREOS_SOURCE_REVISION=/s/=.*/=""/' "coreos-${pkg}-${VERSION_NEW}.ebuild"; \ - popd >/dev/null || exit; \ +for pkg in sources modules kernel; do + pushd "sys-kernel/coreos-${pkg}" >/dev/null || exit + git mv "coreos-${pkg}"-*.ebuild "coreos-${pkg}-${VERSION_NEW}.ebuild" + sed -i -e '/^COREOS_SOURCE_REVISION=/s/=.*/=""/' "coreos-${pkg}-${VERSION_NEW}.ebuild" + popd >/dev/null || exit done popd >/dev/null || exit From e8e2a31ce583bff65add15dbabdf65534b903b49 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 18 Feb 2021 16:27:38 +0100 Subject: [PATCH 2/3] .github: Fix invocation to generate_patches in kernel job generate_patches takes three parameters - a category, a package name and a description. Invoking the function like `generate_patches sys-kernel coreos-{sources,modules,kernel} Linux` makes "sys-kernel" to be a category, "coreos-sources" to be a package name and "coreos-modules" to become a description, while "coreos-kernel" and "Linux" are simply ignored. It has worked so far only because coreos-sources was first in the list and that's where the actual changes in Manifest file happened. Had the order of the packages been different, the workflow would be broken. Since only coreos-sources was modified and all worked fine, simplify the call to generate-patches. --- .../coreos-overlay/.github/workflows/kernel-apply-patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 722568fd17..37ad227377 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 @@ -34,7 +34,7 @@ done popd >/dev/null || exit -generate_patches sys-kernel coreos-{sources,kernel,modules} Linux +generate_patches sys-kernel coreos-sources Linux apply_patches From 7d2428e83e30a927cc14c6f0023f28d1e15b9eee Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 18 Feb 2021 19:37:07 +0100 Subject: [PATCH 3/3] .github: Use "Kernel" as a description for Linux kernel updates --- .../coreos-overlay/.github/workflows/kernel-apply-patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 37ad227377..bb699ae73e 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 @@ -34,7 +34,7 @@ done popd >/dev/null || exit -generate_patches sys-kernel coreos-sources Linux +generate_patches sys-kernel coreos-sources Kernel apply_patches