Support aarch64 and i686

2 files changed, 22 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4fadf21052c..e971d3de2f9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,6 +4,8 @@ pkgbase = zulu-17-bin
 	pkgrel = 1
 	url = https://www.azul.com/downloads/
 	install = zulu-17-bin.install
+	arch = aarch64
+	arch = i686
 	arch = x86_64
 	license = custom
 	depends = java-environment-common>=3
@@ -15,7 +17,11 @@ pkgbase = zulu-17-bin
 	provides = java-runtime-headless-openjdk=17
 	provides = java-runtime=17
 	provides = java-runtime-openjdk=17
-	source = https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-linux_x64.tar.gz
-	sha256sums = 9b8e4d1e47b02b9c2392462ee82988c189357471de3224c37173fa58e2b25112
+	source_aarch64 = https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-linux_aarch64.tar.gz
+	sha256sums_aarch64 = 4d9c9116eb0cdd2d7fb220d6d27059f4bf1b7e95cc93d5512bd8ce3791af86c7
+	source_i686 = https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-linux_i686.tar.gz
+	sha256sums_i686 = 31db6972e14c33f4f2136f3ea8fc016d2265d840b914bfbf6446473605aefdda
+	source_x86_64 = https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-linux_x64.tar.gz
+	sha256sums_x86_64 = 9b8e4d1e47b02b9c2392462ee82988c189357471de3224c37173fa58e2b25112
 
 pkgname = zulu-17-bin
diff --git a/PKGBUILD b/PKGBUILD
index 29094e17c5b1..f767baf9b1d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname="${_jdkname}-bin"
 pkgver="${_java_ver}.0.1"
 pkgrel=1
 pkgdesc='Azul Zulu builds of OpenJDK are open source, TCK-tested and certified builds of OpenJDK.'
-arch=('x86_64')
+arch=('aarch64' 'i686' 'x86_64')
 url='https://www.azul.com/downloads/'
 license=('custom')
 depends=(
@@ -24,14 +24,23 @@ provides=(
   "java-runtime-openjdk=$_java_ver"
 )
 install="$pkgname.install"
-_tarballname="zulu${_zulu_build}-jdk${pkgver}-linux_x64"
-source=("https://cdn.azul.com/zulu/bin/${_tarballname}.tar.gz")
-sha256sums=('9b8e4d1e47b02b9c2392462ee82988c189357471de3224c37173fa58e2b25112')
+source_aarch64=("https://cdn.azul.com/zulu/bin/zulu${_zulu_build}-jdk${pkgver}-linux_aarch64.tar.gz")
+source_i686=("https://cdn.azul.com/zulu/bin/zulu${_zulu_build}-jdk${pkgver}-linux_i686.tar.gz")
+source_x86_64=("https://cdn.azul.com/zulu/bin/zulu${_zulu_build}-jdk${pkgver}-linux_x64.tar.gz")
+sha256sums_aarch64=('4d9c9116eb0cdd2d7fb220d6d27059f4bf1b7e95cc93d5512bd8ce3791af86c7')
+sha256sums_i686=('31db6972e14c33f4f2136f3ea8fc016d2265d840b914bfbf6446473605aefdda')
+sha256sums_x86_64=('9b8e4d1e47b02b9c2392462ee82988c189357471de3224c37173fa58e2b25112')
 
 _jvmdir="/usr/lib/jvm/${_jdkname}"
 
 package() {
-  cd "$srcdir/${_tarballname}"
+  if [ "${CARCH}" = "aarch64" ]; then
+    cd "zulu${_zulu_build}-jdk${pkgver}-linux_aarch64"
+  elif [ "${CARCH}" = "i686" ]; then
+    cd "zulu${_zulu_build}-jdk${pkgver}-linux_i686"
+  else
+    cd "zulu${_zulu_build}-jdk${pkgver}-linux_x64"
+  fi
 
   install -dm 755 "${pkgdir}/${_jvmdir}"
   cp -a . "${pkgdir}/${_jvmdir}/"