-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update patches & update armhf version to 2.1.0p21
- Loading branch information
1 parent
2db2fda
commit ba6e36a
Showing
9 changed files
with
65 additions
and
85 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,10 @@ | ||
| --- Pipfile 2022-08-21 08:56:09.064859847 +0100 | ||
| +++ Pipfile_v2 2022-08-21 13:30:53.027364237 +0100 | ||
| @@ -92,7 +92,6 @@ | ||
| --- Pipfile 2023-01-29 01:10:00.000000000 +0000 | ||
| +++ Pipfile_v2 2023-02-11 13:49:01.281257851 +0000 | ||
| @@ -93,7 +93,6 @@ | ||
| chardet = "==4.0.0" # needed by requests | ||
| urllib3 = "==1.26.7" # needed by requests | ||
| pyOpenSSL = "==19.1.0" # needed by requests with extras = ["security"] | ||
| -pbr = "==5.4.4" # needed by jira | ||
| -pbr = "==5.10.0" # needed by jira | ||
| pyghmi = "==1.5.13" # needed by base for IPMI | ||
| requests = {version = "==2.27.0",extras = ["security"]} # needed by DCD, connexion | ||
| requests = {version = "==2.28.1",extras = ["security"]} # needed by DCD, connexion | ||
| pykerberos = "==1.2.1" # needed by check_bi_aggr | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| --- Pipfile 2022-05-26 01:02:30.000000000 +0100 | ||
| +++ Pipfile_v2 2022-06-11 19:53:11.919789661 +0100 | ||
| --- Pipfile 2023-01-29 01:10:00.000000000 +0000 | ||
| +++ Pipfile_v2 2023-02-11 13:50:02.480665810 +0000 | ||
| @@ -36,7 +36,6 @@ | ||
| types-redis = "==4.1.15" # used for type checking | ||
| types-protobuf = "==3.19.12" # used for type checking | ||
| types-setuptools = "==57.4.9" # used for type checking | ||
| -playwright = "==1.19.0" # used for in-browser testing | ||
| pydantic-factories = "==1.2.4" # used for pydantic model testing | ||
| pymongo = "==4.0.1" # used by mk_mongodb agent plugin | ||
| pytest = "==7.0.1" # used by various test/Makefile targets | ||
| pytest = "==7.0.1" # used by various test/Makefile targets |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,11 @@ | ||
| --- omd/packages/Python/Python.make 2022-05-26 01:02:30.000000000 +0100 | ||
| +++ omd/packages/Python/Python.make_v2 2022-06-10 21:32:19.602657739 +0100 | ||
| @@ -56,10 +56,10 @@ | ||
| done | ||
| # Native modules built based on this version need to use the correct rpath | ||
| sed -i 's|--rpath,/omd/versions/[^/]*/lib|--rpath,$(OMD_ROOT)/lib|g' \ | ||
| - $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_x86_64-linux-gnu.py | ||
| + $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_aarch64-linux-gnu.py | ||
| LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" \ | ||
| $(PACKAGE_PYTHON_EXECUTABLE) -m py_compile \ | ||
| - $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_x86_64-linux-gnu.py | ||
| + $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_aarch64-linux-gnu.py | ||
| if [ -d "$(PACKAGE_PYTHON_PYTHONPATH)/test" ] ; then \ | ||
| $(RM) -r $(PACKAGE_PYTHON_PYTHONPATH)/test ; \ | ||
| fi | ||
| --- omd/packages/Python/Python.make 2023-02-11 13:16:52.925978135 +0000 | ||
| +++ omd/packages/Python/Python.make_v2 2023-02-11 13:23:00.204044150 +0000 | ||
| @@ -12,7 +12,7 @@ | ||
| PYTHON_INTERMEDIATE_INSTALL := $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-install-intermediate | ||
| PYTHON_CACHE_PKG_PROCESS := $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-cache-pkg-process | ||
| PYTHON_INSTALL := $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-install | ||
| -PYTHON_SYSCONFIGDATA := _sysconfigdata__linux_x86_64-linux-gnu.py | ||
| +PYTHON_SYSCONFIGDATA := _sysconfigdata__linux_aarch64-linux-gnu.py | ||
|
|
||
| PYTHON_INSTALL_DIR := $(INTERMEDIATE_INSTALL_BASE)/$(PYTHON_DIR) | ||
| PYTHON_BUILD_DIR := $(PACKAGE_BUILD_DIR)/$(PYTHON_DIR) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,11 @@ | ||
| --- omd/packages/Python/Python.make 2022-05-26 01:02:30.000000000 +0100 | ||
| +++ omd/packages/Python/Python.make_v2 2022-06-10 21:32:48.472505509 +0100 | ||
| @@ -56,10 +56,10 @@ | ||
| done | ||
| # Native modules built based on this version need to use the correct rpath | ||
| sed -i 's|--rpath,/omd/versions/[^/]*/lib|--rpath,$(OMD_ROOT)/lib|g' \ | ||
| - $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_x86_64-linux-gnu.py | ||
| + $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_arm-linux-gnueabihf.py | ||
| LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" \ | ||
| $(PACKAGE_PYTHON_EXECUTABLE) -m py_compile \ | ||
| - $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_x86_64-linux-gnu.py | ||
| + $(PACKAGE_PYTHON_PYTHONPATH)/_sysconfigdata__linux_arm-linux-gnueabihf.py | ||
| if [ -d "$(PACKAGE_PYTHON_PYTHONPATH)/test" ] ; then \ | ||
| $(RM) -r $(PACKAGE_PYTHON_PYTHONPATH)/test ; \ | ||
| fi | ||
| --- omd/packages/Python/Python.make 2023-02-11 13:16:52.925978135 +0000 | ||
| +++ omd/packages/Python/Python.make_v2 2023-02-11 13:22:04.134207815 +0000 | ||
| @@ -12,7 +12,7 @@ | ||
| PYTHON_INTERMEDIATE_INSTALL := $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-install-intermediate | ||
| PYTHON_CACHE_PKG_PROCESS := $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-cache-pkg-process | ||
| PYTHON_INSTALL := $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-install | ||
| -PYTHON_SYSCONFIGDATA := _sysconfigdata__linux_x86_64-linux-gnu.py | ||
| +PYTHON_SYSCONFIGDATA := _sysconfigdata__linux_arm-linux-gnueabihf.py | ||
|
|
||
| PYTHON_INSTALL_DIR := $(INTERMEDIATE_INSTALL_BASE)/$(PYTHON_DIR) | ||
| PYTHON_BUILD_DIR := $(PACKAGE_BUILD_DIR)/$(PYTHON_DIR) |