devxy/r-builds
Watch
2
0
Fork
You've already forked r-builds
 0
Code Issues 1 Pull requests Releases Activity

Use uname -m instead of uname -p, for Debian

Browse source 
On Debian uname -p returns 'unknown'.
This commit is contained in:
Gábor Csárdi 2023-01-10 16:25:31 +01:00
commit be9465a997
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
builder/Dockerfile.opensuse-154
View file

@ -67,7 +67,7 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
&& zypper clean
# Install AWS CLI
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -p).zip" -o "awscliv2.zip" && \
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "awscliv2.zip" && \
unzip awscliv2.zip && \
./aws/install && \
rm -rf aws awscliv2.zip

2
builder/Dockerfile.rhel-9
View file

@ -46,7 +46,7 @@ RUN dnf -y upgrade \
&& dnf clean all
# Install AWS CLI
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -p).zip" -o "awscliv2.zip" && \
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "awscliv2.zip" && \
unzip awscliv2.zip && \
./aws/install && \
rm -rf aws awscliv2.zip

2
builder/build.sh
View file

@ -67,7 +67,7 @@ compile_r() {
# tools/config.guess in R versions older than 3.2.2 guess 'unknown' instead of 'pc'
# test the version and properly set the flag.
build_flag="--build=$(uname -p)-pc-linux-gnu"
build_flag="--build=$(uname -m)-pc-linux-gnu"
if _version_is_greater_than ${R_VERSION} 3.2.2; then
build_flag=''
fi