Skip to content

{Packaging} Adapt entry script to Mariner: hardcode %{_lib} to lib64 #20574

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
jiasli merged 1 commit into from
Dec 2, 2021
Merged

{Packaging} Adapt entry script to Mariner: hardcode %{_lib} to lib64 #20574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions scripts/release/rpm/azure-cli.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,23 @@ deactivate
# Fix up %{buildroot} appearing in some files...
for d in %{buildroot}%{cli_lib_dir}/bin/*; do perl -p -i -e "s#%{buildroot}##g" $d; done;

# Create executable
# Create executable (entry script)

# For PYTHONPATH:
# - We can't use %{_libdir} (expands to absolute path '/usr/lib64'), because we need to support customized
# installation location: https://github.com/Azure/azure-cli/pull/17491
# - We also can't use %{_lib}, because %{_lib} expands to different values on difference OSes：
# https://github.com/Azure/azure-cli/pull/20061
# - Fedora/CentOS/RedHat: relative path 'lib64'
# - Mariner: abolute path '/usr/lib'
# The only solution left is to hard-code 'lib64' as we only release 64-bit RPM packages.
mkdir -p %{buildroot}%{_bindir}
python_version=$(ls %{buildroot}%{cli_lib_dir}/lib/ | head -n 1)
printf "#!/usr/bin/env bash
bin_dir=\`cd \"\$(dirname \"\$BASH_SOURCE[0]\")\"; pwd\`
python_cmd=%{python_cmd}
if command -v ${python_version} &>/dev/null; then python_cmd=${python_version}; fi
AZ_INSTALLER=RPM PYTHONPATH=\"\$bin_dir\"/../%{_lib}/az/lib/${python_version}/site-packages \$python_cmd -sm azure.cli \"\$@\"
AZ_INSTALLER=RPM PYTHONPATH=\"\$bin_dir/../lib64/az/lib/${python_version}/site-packages\" \$python_cmd -sm azure.cli \"\$@\"
" > %{buildroot}%{_bindir}/az
rm %{buildroot}%{cli_lib_dir}/bin/python* %{buildroot}%{cli_lib_dir}/bin/pip*

Expand Down