Quellcode durchsuchen

[Core] Fix the build on centos7 and sles12

Change-Id: I4a7a63fdcdab5a41b6f52475a6f4d86fe617d6d7
(cherry picked from commit 2dc6482f6d6a84bdd080f3bc49397027be81f22e)
(cherry picked from commit b03a1580c9275150ba4d3ba0e7e85542ab9122e1)
agl29 vor 7 Monaten
Ursprung
Commit
340aad6a90
2 geänderte Dateien mit 18 neuen und 10 gelöschten Zeilen
  1. 7 5
      Makefile.vars
  2. 11 5
      tools/cloudera/build_hue_cloudera.sh

+ 7 - 5
Makefile.vars

@@ -53,16 +53,18 @@ endif
 BLD_DIR := $(ROOT)/build
 
 # Default case for Python 3.11
-ifeq ($(PYTHON_VER),python3.11)
-  BLD_DIR_ENV := $(BLD_DIR)/env
-else
-  BLD_DIR_ENV := $(BLD_DIR)/venvs/$(PYTHON_VER)
+ifndef BLD_DIR_ENV
+  ifeq ($(PYTHON_VER),python3.11)
+    BLD_DIR_ENV := $(BLD_DIR)/env
+  else
+    BLD_DIR_ENV := $(BLD_DIR)/venvs/$(PYTHON_VER)
+  endif
 endif
 
 ifdef INSTALL_DIR
   INST_DIR := $(INSTALL_DIR)/build
 
-  ifeq ($(PYTHON_VER),python3.11)
+  ifeq ($(BLD_DIR_ENV),"$(BLD_DIR)/env")
     INST_DIR_ENV := $(INST_DIR)/env
   else
     INST_DIR_ENV := $(INST_DIR)/venvs/$(PYTHON_VER)

+ 11 - 5
tools/cloudera/build_hue_cloudera.sh

@@ -49,10 +49,13 @@ function install_prerequisite() {
   fi
 
   export SQLITE3_PATH=${SQLITE3_PATH:-"$TOOLS_HOME/sqlite/bin/sqlite3"}
-  # check_sqlite3
+  check_sqlite3
   if [[ $1 == "centos7" ]]; then
     export PYTHON38_PATH=/opt/cloudera/cm-agent
-    export pip38_bin="$PYTHON38_PATH/bin/pip3.8"
+    export pip_bin="$PYTHON38_PATH/bin/pip3.8"
+    export PATH="$PYTHON38_PATH/bin:$PATH"
+    export SYS_PYTHON="$PYTHON38_PATH/bin/python3.8"
+    export SYS_PIP="$PYTHON38_PATH/bin/pip3.8"
     centos7_install
   elif [[ $1 == "redhat8" || $1 == "snapshot" ]]; then
     redhat8_install
@@ -127,18 +130,21 @@ for PYTHON_VER in "${PYTHON_VERSIONS[@]}"; do
   HUE_SRC=$(realpath "$WORK_DIR/../..")
   cd "$HUE_SRC" || exit 1
 
-  BLD_DIR="${BLD_DIR:-build}"             # Default build directory if not set
+  BLD_DIR="${BLD_DIR:-$HUE_SRC/build}"             # Default build directory if not set
   if [[ $PYTHON_VER == "python3.11" ]]; then
     BLD_DIR_ENV="${BLD_DIR}/env"
   else
     BLD_DIR_ENV="${BLD_DIR}/venvs/${PYTHON_VER}"
   fi
+  if [[ $DOCKEROS == "sles12" || $DOCKEROS == "centos7" || $DOCKEROS == "ubuntu20" ]]; then
+    BLD_DIR_ENV="${BLD_DIR}/env"
+  fi
   echo "BLD_DIR_ENV=${BLD_DIR_ENV}"
 
   big_console_header "Hue Build Start for" $PYTHON_VER "$@"
-  PYTHON_VER=$PYTHON_VER make apps docs relocatable-env huecheck
+  BLD_DIR_ENV=$BLD_DIR_ENV PYTHON_VER=$PYTHON_VER make apps docs relocatable-env huecheck
   big_console_header "Hue Build End for" $PYTHON_VER "$@"
 done
 big_console_header "Hue PROD Build Start for" "$@"
-make release
+BLD_DIR_ENV=$BLD_DIR_ENV PYTHON_VER=$PYTHON_VER make release
 big_console_header "Hue PROD Build End for" "$@"