54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From 3b7265530ad4e6da1773b1e3651a09d621b1ccc9 Mon Sep 17 00:00:00 2001
|
|
From: peng_langyuan <peng_langyuan@hoperun.com>
|
|
Date: Fri, 19 May 2023 17:26:14 +0800
|
|
Subject: [PATCH 3/3] feat : Adapt to openeuler
|
|
|
|
---
|
|
build.py | 9 ---------
|
|
hb/__main__.py | 9 ---------
|
|
2 files changed, 18 deletions(-)
|
|
|
|
diff --git a/build.py b/build.py
|
|
index a94ad4b..2d7ad8a 100755
|
|
--- a/build.py
|
|
+++ b/build.py
|
|
@@ -25,15 +25,6 @@ import subprocess
|
|
def get_python():
|
|
hb_main = importlib.import_module("hb.__main__")
|
|
topdir = hb_main.find_top()
|
|
- index = 0
|
|
- while index < len(sys.argv):
|
|
- if sys.argv[index] == "-p":
|
|
- product_name = sys.argv[index + 1]
|
|
- index += 1
|
|
- if product_name == "openeuler":
|
|
- python_base_dir = "/usr/bin"
|
|
- else:
|
|
- python_base_dir = os.path.join(topdir, 'prebuilts/python')
|
|
python_base_dir = "/usr/bin"
|
|
if os.path.exists(python_base_dir):
|
|
python_dir = hb_main.search(python_base_dir, 'python3')
|
|
diff --git a/hb/__main__.py b/hb/__main__.py
|
|
index cf9b7e2..2f3d595 100644
|
|
--- a/hb/__main__.py
|
|
+++ b/hb/__main__.py
|
|
@@ -53,15 +53,6 @@ def main():
|
|
topdir = find_top()
|
|
except Exception as ex:
|
|
return print("hb_error: Please call hb utilities inside source root directory")
|
|
- index = 0
|
|
- while index < len(sys.argv):
|
|
- if sys.argv[index] == "-p":
|
|
- product_name = sys.argv[index + 1]
|
|
- index += 1
|
|
- if product_name == "openeuler":
|
|
- python_base_dir = "/usr/bin"
|
|
- else:
|
|
- python_base_dir = os.path.join(topdir, 'prebuilts/python')
|
|
python_base_dir = "/usr/bin"
|
|
if os.path.exists(python_base_dir):
|
|
python_dir = search(python_base_dir, 'python3')
|
|
--
|
|
2.33.0
|
|
|