jolla-sbj: update arch to armv7 (MR 2160)

[ci:skip-build] already built successfully in CI

device/testing/device-jolla-sbj/APKBUILD

@@ -1,11 +1,11 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-jolla-sbj
 pkgdesc="Jolla phone"
-pkgver=0.1
-pkgrel=9
+pkgver=0.2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="armhf"
+arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-jolla-sbj mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
@@ -19,4 +19,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-sha512sums="d293b2b655334c5c5e9e113740f0eca7b3abab1591f97bb85db090e8095d6ecb09891932da66677a50bfa9937418a001b436b9f5f37c65b8b49121eb59cba71d  deviceinfo"
+sha512sums="
+1dcb1fdedb3d2410228f70f0dbbec005a30d644e508d9d809fcef2b16f86760df4a6781d06b3940fe82bf774ed9d96aa4b97b4bad4a2d1ab924f2c3e1affd009  deviceinfo
+"

device/testing/device-jolla-sbj/deviceinfo

@@ -8,7 +8,7 @@ deviceinfo_codename="jolla-sbj"
 deviceinfo_year="2013"
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_chassis="handset"

device/testing/linux-jolla-sbj/APKBUILD

@@ -2,9 +2,9 @@
 
 pkgname=linux-jolla-sbj
 pkgver=3.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Jolla phone kernel fork"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="jolla-sbj"
 url="http://releases.sailfishos.org/sources/2.1.0.11/"
@@ -30,13 +30,13 @@ source="
 	02_gpu-msm-fix-gcc5-compile.patch
 	duplicate-return-address-definition.patch
 "
-kver="kernel-adaptation-sbj-3.4.108.20161101.1"
-kernelarchive="$srcdir/sailfish-$_hash-oss-adaptation-sbj/kernel-adaptation-sbj/$kver.tar.bz2"
-builddir="$srcdir/$kver"
+_kver="kernel-adaptation-sbj-3.4.108.20161101.1"
+_kernelarchive="$srcdir/sailfish-$_hash-oss-adaptation-sbj/kernel-adaptation-sbj/$_kver.tar.bz2"
+builddir="$srcdir/$_kver"
 
 prepare() {
 	cd "$srcdir"
-	tar -xf "$kernelarchive"
+	tar -xf "$_kernelarchive"
 	cd "$ksrcdir"
 
 	default_prepare
@@ -53,7 +53,9 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 }
 
-sha512sums="c0ff1641dd6ae4dbf736ddaf543da0cfd51188d36f163a5f519772867a44c19b40ab86043c9ee1598bbf766e05ef8620588dde9ae5ebadce6e03360ebc78e484  linux-jolla-sbj-2.1.0.11.tar.bz2
-8fb696b344d99e4fd5afdbda401d5ed767c849ab5de81a5b295b9cac055980a8613fa849cef3f7edc66eb69dde4ec39ce077f5af8023d6c2a9b5bbafde252e31  config-jolla-sbj.armhf
+sha512sums="
+c0ff1641dd6ae4dbf736ddaf543da0cfd51188d36f163a5f519772867a44c19b40ab86043c9ee1598bbf766e05ef8620588dde9ae5ebadce6e03360ebc78e484  linux-jolla-sbj-2.1.0.11.tar.bz2
+8fb696b344d99e4fd5afdbda401d5ed767c849ab5de81a5b295b9cac055980a8613fa849cef3f7edc66eb69dde4ec39ce077f5af8023d6c2a9b5bbafde252e31  config-jolla-sbj.armv7
 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
-9b15bf1f6cb66f54c785b0af6c9db8a7d63257e6fa3eeb0cbf47284334166aa6a7ff93e1b64ab69206c8047d64641199c0f5fcbc257bbe039263252fff45118e  duplicate-return-address-definition.patch"
+9b15bf1f6cb66f54c785b0af6c9db8a7d63257e6fa3eeb0cbf47284334166aa6a7ff93e1b64ab69206c8047d64641199c0f5fcbc257bbe039263252fff45118e  duplicate-return-address-definition.patch
+"