This is an automated email from the ASF dual-hosted git repository.
weichiu 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 0fdf91470bd HDDS-14052. Auto-detect arch for RPM builds (#9379)
0fdf91470bd is described below
commit 0fdf91470bd70c5c7d479e5727fafcc17c4c1d68
Author: Eric C. Ho <[email protected]>
AuthorDate: Tue Dec 2 06:59:34 2025 +0800
HDDS-14052. Auto-detect arch for RPM builds (#9379)
---
hadoop-ozone/dist/pom.xml | 7 ++++---
hadoop-ozone/dist/src/main/dockerlibexec/envtoconf.py | 2 +-
hadoop-ozone/dist/src/main/dockerlibexec/transformation.py | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index ceb45e8c986..ae3415cef4b 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -38,7 +38,7 @@
<!-- no tests in this module so far -->
<maven.test.skip>true</maven.test.skip>
<!-- rpm usage-->
- <rpm.targetArch>noarch</rpm.targetArch>
+ <rpm.needArch>true</rpm.needArch>
</properties>
<dependencies>
@@ -605,16 +605,17 @@
<configuration>
<name>ozone</name>
<version>${project.version}</version>
- <release>1</release>
+ <release>${rpm.release}%{?dist}</release>
<license>Apache License, Version 2.0</license>
<summary>Ozone RPM package</summary>
<group>Applications/Engineering</group>
- <targetArch>${rpm.targetArch}</targetArch>
<targetOS>linux</targetOS>
+ <needarch>${rpm.needArch}</needarch>
<postinstallScriptlet>
<scriptFile>${basedir}/src/main/package/rpm/postinstall.sh</scriptFile>
</postinstallScriptlet>
<requires>
+ <require>java-headless >= 1:1.8.0</require>
<require>ncurses</require>
</requires>
diff --git a/hadoop-ozone/dist/src/main/dockerlibexec/envtoconf.py
b/hadoop-ozone/dist/src/main/dockerlibexec/envtoconf.py
index 0e2c3686276..55677317b66 100755
--- a/hadoop-ozone/dist/src/main/dockerlibexec/envtoconf.py
+++ b/hadoop-ozone/dist/src/main/dockerlibexec/envtoconf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/hadoop-ozone/dist/src/main/dockerlibexec/transformation.py
b/hadoop-ozone/dist/src/main/dockerlibexec/transformation.py
index a6f68d26623..5ad4e86d175 100755
--- a/hadoop-ozone/dist/src/main/dockerlibexec/transformation.py
+++ b/hadoop-ozone/dist/src/main/dockerlibexec/transformation.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
