From 3e927c505509243de9353f89624a2e793dd7f5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Tue, 10 Jan 2023 19:45:32 +0100 Subject: [PATCH] Tell arch to nfpm --- builder/package.centos-7 | 3 +++ builder/package.centos-8 | 3 +++ builder/package.debian-10 | 1 + builder/package.debian-11 | 1 + builder/package.opensuse-153 | 3 +++ builder/package.opensuse-154 | 3 +++ builder/package.rhel-9 | 3 +++ builder/package.ubuntu-1804 | 1 + builder/package.ubuntu-2004 | 1 + builder/package.ubuntu-2204 | 1 + 10 files changed, 20 insertions(+) diff --git a/builder/package.centos-7 b/builder/package.centos-7 index 6bad41a..e48278a 100644 --- a/builder/package.centos-7 +++ b/builder/package.centos-7 @@ -23,10 +23,13 @@ if [ -d /opt/R/${R_VERSION} ]; then fi EOF +if [ "$(arch)" == "aarch64" ]; then echo arm64; else echo amd64; fi > /tmp/arch + cat < /tmp/nfpm.yml name: R-${R_VERSION} version: 1 version_schema: none +arch: $(cat /tmp/arch) release: 1 maintainer: RStudio, PBC description: | diff --git a/builder/package.centos-8 b/builder/package.centos-8 index c541087..cc8ced9 100644 --- a/builder/package.centos-8 +++ b/builder/package.centos-8 @@ -23,10 +23,13 @@ if [ -d /opt/R/${R_VERSION} ]; then fi EOF +if [ "$(arch)" == "aarch64" ]; then echo arm64; else echo amd64; fi > /tmp/arch + cat < /tmp/nfpm.yml name: R-${R_VERSION} version: 1 version_schema: none +arch: $(cat /tmp/arch) release: 1 maintainer: RStudio, PBC description: | diff --git a/builder/package.debian-10 b/builder/package.debian-10 index 82acaae..a4266f8 100644 --- a/builder/package.debian-10 +++ b/builder/package.debian-10 @@ -15,6 +15,7 @@ name: r-${R_VERSION} version: 1 version_schema: none section: gnu-r +arch: $(dpkg --print-architecture) priority: optional maintainer: RStudio, PBC description: | diff --git a/builder/package.debian-11 b/builder/package.debian-11 index b897a5a..aec9c45 100644 --- a/builder/package.debian-11 +++ b/builder/package.debian-11 @@ -16,6 +16,7 @@ name: r-${R_VERSION} version: 1 version_schema: none section: gnu-r +arch: $(dpkg --print-architecture) priority: optional maintainer: RStudio, PBC description: | diff --git a/builder/package.opensuse-153 b/builder/package.opensuse-153 index 0385da0..bfb1114 100644 --- a/builder/package.opensuse-153 +++ b/builder/package.opensuse-153 @@ -23,10 +23,13 @@ if [ -d /opt/R/${R_VERSION} ]; then fi EOF +if [ "$(arch)" == "aarch64" ]; then echo arm64; else echo amd64; fi > /tmp/arch + cat < /tmp/nfpm.yml name: R-${R_VERSION} version: 1 version_schema: none +arch: $(cat /tmp/arch) release: 1 maintainer: RStudio, PBC description: | diff --git a/builder/package.opensuse-154 b/builder/package.opensuse-154 index f11f113..61f8b53 100644 --- a/builder/package.opensuse-154 +++ b/builder/package.opensuse-154 @@ -39,10 +39,13 @@ if [ -d /opt/R/${R_VERSION} ]; then fi EOF +if [ "$(arch)" == "aarch64" ]; then echo arm64; else echo amd64; fi > /tmp/arch + cat < /tmp/nfpm.yml name: R-${R_VERSION} version: 1 version_schema: none +arch: $(cat /tmp/arch) release: 1 maintainer: RStudio, PBC description: | diff --git a/builder/package.rhel-9 b/builder/package.rhel-9 index 5144ba8..964fbaa 100644 --- a/builder/package.rhel-9 +++ b/builder/package.rhel-9 @@ -40,10 +40,13 @@ if [ -d /opt/R/${R_VERSION} ]; then fi EOF +if [ "$(arch)" == "aarch64" ]; then echo arm64; else echo amd64; fi > /tmp/arch + cat < /tmp/nfpm.yml name: R-${R_VERSION} version: 1 version_schema: none +arch: $(cat /tmp/arch) release: 1 maintainer: RStudio, PBC description: | diff --git a/builder/package.ubuntu-1804 b/builder/package.ubuntu-1804 index 8501a89..6adbda9 100644 --- a/builder/package.ubuntu-1804 +++ b/builder/package.ubuntu-1804 @@ -15,6 +15,7 @@ name: r-${R_VERSION} version: 1 version_schema: none section: universe/math +arch: $(dpkg --print-architecture) priority: optional maintainer: RStudio, PBC description: | diff --git a/builder/package.ubuntu-2004 b/builder/package.ubuntu-2004 index 2465ff9..31d2b85 100644 --- a/builder/package.ubuntu-2004 +++ b/builder/package.ubuntu-2004 @@ -16,6 +16,7 @@ version: 1 version_schema: none section: universe/math priority: optional +arch: $(dpkg --print-architecture) maintainer: RStudio, PBC description: | GNU R statistical computation and graphics system diff --git a/builder/package.ubuntu-2204 b/builder/package.ubuntu-2204 index 175065c..7c68c3b 100644 --- a/builder/package.ubuntu-2204 +++ b/builder/package.ubuntu-2204 @@ -17,6 +17,7 @@ version: 1 version_schema: none section: universe/math priority: optional +arch: $(dpkg --print-architecture) maintainer: RStudio, PBC description: | GNU R statistical computation and graphics system