docker-images: trisquel-flidas: make the package architecture specific

Trisquel flidas supports both i686 and x86_64.
Debootstrap support foreign architectures.

Because of that we need to encode the architecture in the package as
an i686 host could create an x86_64 trisquel docker image (by using
qemu for the debootstrap second stage).

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

5 files changed, 12 insertions, 12 deletions

diff --git a/docker-images/trisquel-flidas/CC-BY-ND-4.0.txt b/docker-images/trisquel-flidas-x86_64/CC-BY-ND-4.0.txt
index 10fbcae9d..10fbcae9d 100644
--- a/docker-images/trisquel-flidas/CC-BY-ND-4.0.txt
+++ b/docker-images/trisquel-flidas-x86_64/CC-BY-ND-4.0.txt
diff --git a/docker-images/trisquel-flidas/PKGBUILD b/docker-images/trisquel-flidas-x86_64/PKGBUILD
index aa6ba4cbe..86afdc8bb 100644
--- a/docker-images/trisquel-flidas/PKGBUILD
+++ b/docker-images/trisquel-flidas-x86_64/PKGBUILD
@@ -5,10 +5,11 @@
 
 _distro=trisquel
 _suite=etiona
+_arch=x86_64
 
-pkgname="${_distro}-${_suite}"
+pkgname="${_distro}-${_suite}-${_arch}"
 pkgver=9.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Trisquel docker image(s)"
 arch=('x86_64')
 url='https://trisquel.info'
@@ -51,18 +52,17 @@ build(){
 	sudo debuerreotype-apt-get rootfs source -y \
 		$(dpkg --root rootfs --get-selections | cut -f 1)
 
-	sudo debuerreotype-tar rootfs "${_distro}-${_suite}.tar"
+	sudo debuerreotype-tar rootfs "${pkgname}.tar"
 
-	# docker import ${_distro}-${_suite}.tar.xz works, so it's better to
-	# have the smallest file possible as xz compresses quite well and we
-	# will at least have one docker image per FSDG distribution if
-	# possible.
-	sudo xz -9e --verbose -T 0 "${_distro}-${_suite}.tar"
+	# docker import ${_pkgname}.tar.xz works, so it's better to have the
+	# smallest file possible as xz compresses quite well and we will at
+	# least have one docker image per FSDG distribution if possible.
+	sudo xz -9e --verbose -T 0 "${pkgname}.tar"
 }
 
 package(){
-	install                               -d "${pkgdir}/usr/share/docker-images/${pkgname}/"
-	install "${_distro}-${_suite}.tar.xz" -t "${pkgdir}/usr/share/docker-images/${pkgname}/"
+	install                      -d "${pkgdir}/usr/share/docker-images/${pkgname}/"
+	install "${pkgname}.tar.xz"  -t "${pkgdir}/usr/share/docker-images/${pkgname}/"
 
 	install                                          -d "${pkgdir}/usr/share/licenses/${pkgname}/"
 	install free-system-distribution-guidelines.html -t "${pkgdir}/usr/share/licenses/${pkgname}/"
@@ -70,6 +70,6 @@ package(){
 }
 
 check(){
-	sudo sha512sum -c "${_distro}-${_suite}.tar.xz.sha512"
+	sudo sha512sum -c "${pkgname}.tar.xz.sha512"
 }
  
diff --git a/docker-images/trisquel-flidas/free-system-distribution-guidelines.html b/docker-images/trisquel-flidas-x86_64/free-system-distribution-guidelines.html
index 8fa0f6299..8fa0f6299 100644
--- a/docker-images/trisquel-flidas/free-system-distribution-guidelines.html
+++ b/docker-images/trisquel-flidas-x86_64/free-system-distribution-guidelines.html
diff --git a/docker-images/trisquel-flidas-x86_64/trisquel-etiona-x86_64.tar.xz.sha512 b/docker-images/trisquel-flidas-x86_64/trisquel-etiona-x86_64.tar.xz.sha512
new file mode 100644
index 000000000..5969d9991
--- /dev/null
+++ b/docker-images/trisquel-flidas-x86_64/trisquel-etiona-x86_64.tar.xz.sha512
@@ -0,0 +1 @@
+7472cbb725f324fd291f662150285e7ddc63483ccfb803f44a1f79d8a904e5dc7552c1fdcc786a4fcd442cf10136b26ea834a177aef6a7c43c8f5d5c06e3998b  trisquel-etiona-x86_64.tar.xz
diff --git a/docker-images/trisquel-flidas/trisquel-etiona.tar.xz.sha512 b/docker-images/trisquel-flidas/trisquel-etiona.tar.xz.sha512
deleted file mode 100644
index 63f8c6061..000000000
--- a/docker-images/trisquel-flidas/trisquel-etiona.tar.xz.sha512
+++ /dev/null
@@ -1 +0,0 @@
-07a3d455830aa9607ea98a5e00b69ffea89289c559d735f2279ee374f9b82bd808daa8ec8a4721f2bc10a095f5ce1eb1d5d5c315c71db77c69d6cfe5fa93ec96  trisquel-etiona.tar.xz