set arch in nfpm config

rstudio · Jul 2, 2024 · ae8f94a · ae8f94a
1 parent 9a2963f
commit ae8f94a
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 0 deletions.
diff --git a/builder/package.centos-8 b/builder/package.centos-8
@@ -4,13 +4,16 @@ if [[ ! -d /tmp/output/${OS_IDENTIFIER} ]]; then
   mkdir -p "/tmp/output/${OS_IDENTIFIER}"
 fi
 
+if [ "$(arch)" == "aarch64" ]; then echo arm64; else echo amd64; fi > /tmp/arch
+
 ln -s "/opt/python/${PYTHON_VERSION}/bin/python3" "/opt/python/${PYTHON_VERSION}/bin/python"
 ln -s "/opt/python/${PYTHON_VERSION}/bin/pip3" "/opt/python/${PYTHON_VERSION}/bin/pip"
 
 cat <<EOF > /tmp/nfpm.yml
 name: python-${PYTHON_VERSION}
 version: 1
 version_schema: none
+arch: $(cat /tmp/arch)
 release: 1
 maintainer: RStudio, PBC <https://github.com/rstudio/python-builds>
 vendor: RStudio, PBC

diff --git a/builder/package.debian-11 b/builder/package.debian-11
@@ -11,6 +11,7 @@ cat <<EOF > /tmp/nfpm.yml
 name: python-${PYTHON_VERSION}
 version: 1
 version_schema: none
+arch: $(dpkg --print-architecture)
 priority: optional
 maintainer: RStudio, PBC <https://github.com/rstudio/python-builds>
 description: |

diff --git a/builder/package.debian-12 b/builder/package.debian-12
@@ -11,6 +11,7 @@ cat <<EOF > /tmp/nfpm.yml
 name: python-${PYTHON_VERSION}
 version: 1
 version_schema: none
+arch: $(dpkg --print-architecture)
 priority: optional
 maintainer: RStudio, PBC <https://github.com/rstudio/python-builds>
 description: |

diff --git a/builder/package.opensuse-155 b/builder/package.opensuse-155
@@ -4,13 +4,16 @@ if [[ ! -d /tmp/output/${OS_IDENTIFIER} ]]; then
   mkdir -p "/tmp/output/${OS_IDENTIFIER}"
 fi
 
+if [ "$(arch)" == "aarch64" ]; then echo arm64; else echo amd64; fi > /tmp/arch
+
 ln -s "/opt/python/${PYTHON_VERSION}/bin/python3" "/opt/python/${PYTHON_VERSION}/bin/python"
 ln -s "/opt/python/${PYTHON_VERSION}/bin/pip3" "/opt/python/${PYTHON_VERSION}/bin/pip"
 
 cat <<EOF > /tmp/nfpm.yml
 name: python-${PYTHON_VERSION}
 version: 1
 version_schema: none
+arch: $(cat /tmp/arch)
 release: 1
 maintainer: Posit Software, PBC <https://github.com/rstudio/python-builds>
 vendor: Posit Software, PBC

diff --git a/builder/package.rhel-9 b/builder/package.rhel-9
@@ -4,13 +4,16 @@ if [[ ! -d /tmp/output/${OS_IDENTIFIER} ]]; then
   mkdir -p "/tmp/output/${OS_IDENTIFIER}"
 fi
 
+if [ "$(arch)" == "aarch64" ]; then echo arm64; else echo amd64; fi > /tmp/arch
+
 ln -s "/opt/python/${PYTHON_VERSION}/bin/python3" "/opt/python/${PYTHON_VERSION}/bin/python"
 ln -s "/opt/python/${PYTHON_VERSION}/bin/pip3" "/opt/python/${PYTHON_VERSION}/bin/pip"
 
 cat <<EOF > /tmp/nfpm.yml
 name: python-${PYTHON_VERSION}
 version: 1
 version_schema: none
+arch: $(cat /tmp/arch)
 release: 1
 maintainer: RStudio, PBC <https://github.com/rstudio/python-builds>
 vendor: RStudio, PBC

diff --git a/builder/package.ubuntu-2004 b/builder/package.ubuntu-2004
@@ -11,6 +11,7 @@ cat <<EOF > /tmp/nfpm.yml
 name: python-${PYTHON_VERSION}
 version: 1
 version_schema: none
+arch: $(dpkg --print-architecture)
 priority: optional
 maintainer: RStudio, PBC <https://github.com/rstudio/python-builds>
 description: |

diff --git a/builder/package.ubuntu-2204 b/builder/package.ubuntu-2204
@@ -11,6 +11,7 @@ cat <<EOF > /tmp/nfpm.yml
 name: python-${PYTHON_VERSION}
 version: 1
 version_schema: none
+arch: $(dpkg --print-architecture)
 priority: optional
 maintainer: RStudio, PBC <https://github.com/rstudio/python-builds>
 description: |

diff --git a/builder/package.ubuntu-2404 b/builder/package.ubuntu-2404
@@ -11,6 +11,7 @@ cat <<EOF > /tmp/nfpm.yml
 name: python-${PYTHON_VERSION}
 version: 1
 version_schema: none
+arch: $(dpkg --print-architecture)
 priority: optional
 maintainer: Posit Software, PBC <https://github.com/rstudio/python-builds>
 description: |