This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 9f3dd01111 HDDS-12917. cp: option '--update' doesn't allow an argument
(#8346)
9f3dd01111 is described below
commit 9f3dd011119a33b6e5f458d826442bbda49810fb
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Apr 29 12:03:22 2025 +0200
HDDS-12917. cp: option '--update' doesn't allow an argument (#8346)
---
hadoop-ozone/dist/dev-support/bin/dist-layout-stitching | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
index 7f0754ea9e..85d347fc6b 100755
--- a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
+++ b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
@@ -130,23 +130,17 @@ run cp -p -r
"${ROOT}/hadoop-ozone/dist/target/Dockerfile" .
run mkdir compose/_keytabs
-# Determine CPFLAGS based on system type
-if [ "$(uname)" = "Darwin" ]; then
- CPFLAGS="-n"
-else
- CPFLAGS="--update=none"
-fi
-
for file in $(find "${ROOT}" -path '*/target/classes/*.classpath' | sort); do
# We need to add the artifact manually as it's not part the generated
classpath desciptor
module=$(basename "${file%.classpath}")
sed -i -e "s;$;:\$HDDS_LIB_JARS_DIR/${module}-${HDDS_VERSION}.jar;" "$file"
- cp $CPFLAGS -p -v "$file" share/ozone/classpath/
+ run cp -p "$file" share/ozone/classpath/
done
for file in $(find "${ROOT}" -path '*/share/ozone/lib/*jar' | sort); do
- cp $CPFLAGS -p -v "$file" share/ozone/lib/
+ # copy without printing to output due to large number of files
+ cp -p "$file" share/ozone/lib/
done
#workaround for https://issues.apache.org/jira/browse/MRESOURCES-236
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
