Skip to content

AIX and RHEL 9 fixes. #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dumol merged 4 commits into from
Sep 30, 2022
Merged

AIX and RHEL 9 fixes. #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd1e3fd
Updated brink stuff from server repo.
dumol Sep 20, 2022
53d506f
Require AIX 7.2.
dumol Sep 20, 2022
a878a62
Updated deps docs.
dumol Sep 20, 2022
3abf2f1
Back to supporting AIX 7.1
dumol Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion brink.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BASE_REQUIREMENTS='pip==20.3.4chevah chevah-brink==0.79.0 paver==1.2.4'
PYTHON_CONFIGURATION='default@2.7.18.241e9fe'
PYTHON_CONFIGURATION='default@2.7.18.90dc4a6'
# For production packages there are 2 options:
BINARY_DIST_URI='https://github.com/chevah/python-package/releases/download'
#BINARY_DIST_URI='https://bin.chevah.com:20443/production'
Expand Down
11 changes: 10 additions & 1 deletion brink.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ clean_build() {
delete_folder ${DIST_FOLDER}
echo "Removing publish..."
delete_folder 'publish'
echo "Removing node_modules..."
delete_folder node_modules
echo "Removing web build"
delete_folder chevah/server/static/build/

# In some case pip hangs with a build folder in temp and
# will not continue until it is manually removed.
Expand Down Expand Up @@ -766,7 +770,12 @@ detect_os() {
os_version_raw="$VERSION_ID"
check_os_version "Red Hat Enterprise Linux" 8 \
"$os_version_raw" os_version_chevah
set_os_if_not_generic "rhel" $os_version_chevah
if [ ${os_version_chevah} == "8" ]; then
set_os_if_not_generic "rhel" $os_version_chevah
else
# OpenSSL 3.0.x not supported by cryptography 3.3.x.
check_linux_libc
fi
;;
ubuntu|ubuntu-core)
os_version_raw="$VERSION_ID"
Expand Down
3 changes: 2 additions & 1 deletion chevah_build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,8 @@ case "$ARCH" in
;;
esac
# Only add to $MAKE if there is one, so that NMAKE on Windows is not confused.
if [ -n "${MAKE-}" ]; then
# But not on AIX, where there are random errors w/ parallel builds on IBM Cloud.
if [ -n "${MAKE-}" -a "${OS%aix*}" != "" ]; then
export MAKE="$MAKE -j${JOBS}"
fi

Expand Down