From: Don Zickus <dzickus(a)redhat.com>
The ark-update-configs.sh script is written to be executed from the top of the
git tree. However, from a make -C redhat/ command it is executed from the
redhat/ path. This breaks the script when it needs to generate new configs
(redhat/gen_config_patches.sh).
A simple fix is to execute the script inside the redhat/Makefile from the top
level. The alternative is to teach the script to be location agnostic, but
there is a handful of hardcoded places across 2 scripts that I thought it
wasn't worth it.
Tested by running the 'scheduled' merge-upstream job using my test-os-build
branch where it passed
(
https://gitlab.com/cki-project/kernel-ark/-/pipelines/199415525)
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
---
redhat/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/redhat/Makefile b/redhat/Makefile
index 27d2cd94e78f..834704a1a0a7 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -327,8 +327,8 @@ dist-merge-upstream: git-tree-check
fi;
@# If TAG is empty, script defaults to master:HEAD
- git checkout $(DIST_BRANCH)
- @$(REDHAT)/scripts/ci/ark-update-configs.sh $(TAG)
+ @git checkout $(DIST_BRANCH)
+ @cd ..; $(REDHAT)/scripts/ci/ark-update-configs.sh $(TAG)
dist-merge-upstream-push: export DIST_PUSH="1"
dist-merge-upstream-push: dist-merge-upstream
--
GitLab