This is an automated email from the ASF dual-hosted git repository.
tuhaihe pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/main by this push:
new 0c49c9964d9 Fix the clients path script name in gpAux/Makefile
0c49c9964d9 is described below
commit 0c49c9964d94fc6b759e93524ff3477bd2f764a3
Author: Dianjin Wang <[email protected]>
AuthorDate: Tue Sep 15 11:57:27 2026 +0800
Fix the clients path script name in gpAux/Makefile
The clients target copies the shell script that sets GPHOME_CLIENTS into
the package it assembles:
cp -f client/scripts/greenplum_$@_path$(SCRIPT) $(CLIENTSINSTLOC)/
With $@ expanding to "clients" and SCRIPT to ".sh" that resolves to
client/scripts/greenplum_clients_path.sh, which does not exist. The file
was renamed to cloudberry_clients_path.sh during the rebranding and this
reference was not updated with it, so the target would fail here if anyone
reached it.
Nobody has: the top-level GNUmakefile deliberately steps over
gpAux/Makefile, and the body of the clients target is skipped unless
BLD_TARGETS contains "clients", which nothing in the tree sets. So this
is a latent break rather than a live one, and fixing it costs a word.
Verified with `make -C gpAux -n clients BLD_TARGETS=clients` on Rocky 9.
Before, the expanded command reads
cp -f client/scripts/greenplum_clients_path.sh ...
and after
cp -f client/scripts/cloudberry_clients_path.sh ...
which matches the file in the tree and copies successfully when run from
gpAux/, the directory make uses.
Note that gpMgmt/bin/gpload, gpload.py and gpdirtableload still look for
greenplum_loaders_path.sh under $GPHOME_LOADERS. Those are deliberate
compatibility lookups against a separately installed Greenplum loaders
package, not references to anything in this repository, so they are left
alone.
Assisted-by: Claude Code
Backpatch-through: REL_2_STABLE
---
gpAux/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gpAux/Makefile b/gpAux/Makefile
index dcdc2fc5f5e..edf07dc486a 100644
--- a/gpAux/Makefile
+++ b/gpAux/Makefile
@@ -429,7 +429,7 @@ endif
endif
# ---- copy scripts fileset ----
mkdir -p $(CLIENTSINSTLOC)
- cp -f client/scripts/greenplum_$@_path$(SCRIPT) $(CLIENTSINSTLOC)/
+ cp -f client/scripts/cloudberry_$@_path$(SCRIPT) $(CLIENTSINSTLOC)/
# ---- updating the version in required packages ----
@$(MAKE) set_scripts_version INSTLOC=$(CLIENTSINSTLOC)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
