diff --git a/aports/device/device-amazon-thor/APKBUILD b/aports/device/device-amazon-thor/APKBUILD
index 5b65a51a..728da40d 100755
--- a/aports/device/device-amazon-thor/APKBUILD
+++ b/aports/device/device-amazon-thor/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-amazon-thor
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="Amazon KFHDX 7inch 2013"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -25,6 +25,6 @@ package() {
 		"$pkgdir"/etc/fb.modes
 }
 
-sha512sums="6ba210e3a497743b3a2164005f511ac8fa224da26906928e6a61280bf02534265eaf53b0b81a1f091a781e977d79724a680fd8ca4960d7b7cf18f1d65a562245  deviceinfo
+sha512sums="db3db6ecab724a79b5debe8ec665ceefbccb95b817f7f04e8ef1927458f41457911625cf6bb571ccfe5dbc3f0dd8f4dd936c6aabd911f70511b9c93e838f53ee  deviceinfo
 7ed015f42c445cbfa34a26ec33da8d72bcba818eecd3fae91fb418132472e739edaeed021e942d30f7d64593ffe17b61bc75e89fd45ffc44c2cdf0d1827942cb  90-android-touch-dev.rules
 762d712485f581113dd70bf2a4e0602f8b9ac8c05cf519ffc2d9a4a5c7bdb387c150cee087e7523e90f598c0cde3dce89975dadc2d651b770f7f80e480848ed4  fb.modes"
diff --git a/aports/device/device-amazon-thor/deviceinfo b/aports/device/device-amazon-thor/deviceinfo
index 98c1d90f..c3fe560c 100755
--- a/aports/device/device-amazon-thor/deviceinfo
+++ b/aports/device/device-amazon-thor/deviceinfo
@@ -10,7 +10,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="false"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 
 # Device related
diff --git a/aports/device/device-asus-flo/APKBUILD b/aports/device/device-asus-flo/APKBUILD
index 5a0ef5c6..cb8a8270 100644
--- a/aports/device/device-asus-flo/APKBUILD
+++ b/aports/device/device-asus-flo/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-asus-flo
 pkgver=0
-pkgrel=7
+pkgrel=8
 pkgdesc="Google Nexus 7 2013 flo"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -29,7 +29,7 @@ weston() {
 	install -Dm644 "$srcdir"/weston.ini \
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
-sha512sums="40b6e53d5c0ccf80588127607c877d245efeaea0276356749fdaff232e9b9880d9e00c07d7296cfd5f96703ebca9e3f88becc368dff51d819c7f6fb71832ca71  deviceinfo
+sha512sums="cd112666a2c24fe040dbba4010ffb91b1e573d38ecec15e0fc23e2a7c20879d7eff0d677e2053bcf7896edac58038b4192fef689549f0b0cc701e5304c403509  deviceinfo
 5ac89b627f52d2f1103c3329bd905cdbb906cae5bb332d52e6805d7971fbcc0faabe1fd9d2beb7c6de4e4487c05047eaa17852dbf9e114ee3c5d4b0d57d73859  90-android-touch-dev.rules
 3278921cc1617d10fdd13dfbeaf213cda0078d069e727acd8cfac10bd8ade6f373be1e22fd1e4b50ae71cd2eae09f7d6aad5de42338d9ea9f8c1a34f0b60cb69  wpa_supplicant.conf
 cf913217b41a3dde8bc2a16a5bc82013c85679de0e81db1cfc36f2409ea034fec430082ddcb207c16746453601cf8381300b049cd2fb131f1916dc7dbcc247e3  pointercal
diff --git a/aports/device/device-asus-flo/deviceinfo b/aports/device/device-asus-flo/deviceinfo
index 839febf0..ab85fbd5 100644
--- a/aports/device/device-asus-flo/deviceinfo
+++ b/aports/device/device-asus-flo/deviceinfo
@@ -12,7 +12,7 @@ deviceinfo_modules=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="false"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 
 # Splash screen
diff --git a/aports/device/device-asus-grouper/APKBUILD b/aports/device/device-asus-grouper/APKBUILD
index 5ace8d7f..79360713 100644
--- a/aports/device/device-asus-grouper/APKBUILD
+++ b/aports/device/device-asus-grouper/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-asus-grouper
 pkgver=1
-pkgrel=8
+pkgrel=9
 pkgdesc="Asus Nexus 7 2012 Wifi"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -23,6 +23,6 @@ package() {
 		"$pkgdir"/etc/pointercal
 }
 
-sha512sums="23b312147654203150e64c0169ef6a90cc9f96bce02c4a4feda18a4d3704ff42cbc0ae98076e4d470e6c46d35dded9868b9a85735e0a1be2b5e2891eb61c60db  deviceinfo
+sha512sums="f8dc365d8018902681309ad1b8f2ea4090bab960206aedbd8e4e45cac3ea2f009063bf819ad11738f2670b9166472000f2d9b475c7ca955eea77fdc4df00d6e9  deviceinfo
 05f938784e8f30cdbe9923a5f3e34ce7c539060d3a621741206bc5ed02afd7cbf480b02fbe48a70968e7182f885ab9bfe57c4d1e7c6eefca54a6f7188d2849f2  90-android-touch-dev.rules
 ae9c145ffd745c83c73edbc486d3b9d22c6cbb8c57827b6f1ba87b6449a17a73a443be7daa0ab87de8df2dd9594e624364652c84ec1e7b536d37f52449a5a58c  pointercal"
diff --git a/aports/device/device-asus-grouper/deviceinfo b/aports/device/device-asus-grouper/deviceinfo
index 56cbfbb8..5be57a7b 100644
--- a/aports/device/device-asus-grouper/deviceinfo
+++ b/aports/device/device-asus-grouper/deviceinfo
@@ -12,7 +12,7 @@ deviceinfo_modules=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="false"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 deviceinfo_dev_touchscreen="/dev/input/event0"
 
diff --git a/aports/device/device-fairphone-fp2/APKBUILD b/aports/device/device-fairphone-fp2/APKBUILD
index 247dba96..5e1df37c 100644
--- a/aports/device/device-fairphone-fp2/APKBUILD
+++ b/aports/device/device-fairphone-fp2/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-fairphone-fp2
 pkgver=1
-pkgrel=4
+pkgrel=5
 pkgdesc="Fairphone 2"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -25,6 +25,6 @@ package() {
 		"$pkgdir"/etc/wifi/bcmdhd.cal
 }
 
-sha512sums="66cf4782d814e4229551787c105c8705aa56d7e2af85207cc628cff47481926c2742c6ed3981ede538186ea906a6ac6f69b4669e567da769b5313f18a5362f64  deviceinfo
+sha512sums="44fd0b53e82db37d111a04641ca2ebd132d154a40fd5a3e8591e7679688932b12ebbb1e758563eaa850871ced3b6454ba66af92ef822c1e02ba117b765808f3d  deviceinfo
 4e6c0b87872f278de5603d821a1e9dab8363db285d1d7fd56e900b33e8533eecb79b1fb6359e58e112e69e714a4f2aee06157b1d6f8d3e26274cd29c93cd659b  90-android-touch-dev.rules
 32652ef366694f34dec31f316a38aca96700e3a5a3eac1f8d192e3c5de7b91e480b1c0fcd8e7c80a51692dc3737020ebbb2e5d3779436e82fb18822089c63055  bcmdhd.cal"
diff --git a/aports/device/device-fairphone-fp2/deviceinfo b/aports/device/device-fairphone-fp2/deviceinfo
index 5f820db2..748e3e3a 100644
--- a/aports/device/device-fairphone-fp2/deviceinfo
+++ b/aports/device/device-fairphone-fp2/deviceinfo
@@ -12,7 +12,7 @@ deviceinfo_modules=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_flash_sparse="true"
 deviceinfo_arch="armhf"
 
diff --git a/aports/device/device-google-glass/APKBUILD b/aports/device/device-google-glass/APKBUILD
index 8f81d2a3..8a6757ff 100644
--- a/aports/device/device-google-glass/APKBUILD
+++ b/aports/device/device-google-glass/APKBUILD
@@ -1,7 +1,7 @@
 pkgname="device-google-glass"
 pkgdesc="Google Glass"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
@@ -14,4 +14,4 @@ package() {
 		"$pkgdir"/etc/deviceinfo
 }
 
-sha512sums="119fcb71d43e8ce061e169cbc06c73d0d6d8af09321bdba605f979eb37874eac3168b863c9808ab004d8a36e6214178185061978b286215f5f4fa5d66f79ebcf  deviceinfo"
+sha512sums="af722bbc1305d00d0bea05100e31e6108b4cb073d911b89cffa17c733c456516b669682fea31465c71eee41552bb92c7bd31370550c1c8b5e3acdd5c15b1e6cb  deviceinfo"
diff --git a/aports/device/device-google-glass/deviceinfo b/aports/device/device-google-glass/deviceinfo
index 586ee4eb..b01bf99c 100644
--- a/aports/device/device-google-glass/deviceinfo
+++ b/aports/device/device-google-glass/deviceinfo
@@ -19,7 +19,7 @@ deviceinfo_dev_touchscreen=""
 deviceinfo_dev_keyboard=""
 
 # Bootloader related
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyO2,115200n8 vmalloc=500M androidboot.console=ttyO2 androidboot.carrier=wifi-only product_type=w cpuidle_sysfs_switch"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
diff --git a/aports/device/device-htc-ace/APKBUILD b/aports/device/device-htc-ace/APKBUILD
index d02f4075..c0a0d51c 100644
--- a/aports/device/device-htc-ace/APKBUILD
+++ b/aports/device/device-htc-ace/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-htc-ace
 pkgver=1
-pkgrel=5
+pkgrel=6
 pkgdesc="HTC Desire HD"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -25,6 +25,6 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
-sha512sums="9fd6a7fd247d02b99470e72be531f17c6304896598a4f8bd59d53bf38c71a8544a38fa2d83c4d0ca372f5b094714c77ebfc67af48985387afa8295467337a6b1  deviceinfo
+sha512sums="d3df77ec0df3ae5299a554af065abace1ce53bd6c1b55a76c57f68eabc433a41fe037e08c848377f830b62d19a80e0fa2146542bdfe74221cc62f9131ff925b9  deviceinfo
 3ce2d134aa59677e25a160b5985c552fbf048b237169bbeb85e2b8824f734627064b51c097036db10eee0254064d45d804d17372dffcd1ba246938968fe1e225  initfs-hook.sh
 ab8fb357bb45ba44723f1ecb01a10db26f8f74b605499673e1ba90c69a9b11a1555983ce90235e3b636d75461c81c81eea0f8318ded06b72dad17f924d8b9901  90-android-touch-dev.rules"
diff --git a/aports/device/device-htc-ace/deviceinfo b/aports/device/device-htc-ace/deviceinfo
index a3a68146..8f7eb796 100644
--- a/aports/device/device-htc-ace/deviceinfo
+++ b/aports/device/device-htc-ace/deviceinfo
@@ -12,7 +12,7 @@ deviceinfo_modules=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 
 # Splash screen
diff --git a/aports/device/device-htc-bravo/APKBUILD b/aports/device/device-htc-bravo/APKBUILD
index 35a4f96e..5fc5cbd6 100644
--- a/aports/device/device-htc-bravo/APKBUILD
+++ b/aports/device/device-htc-bravo/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-htc-bravo
 pkgver=1
-pkgrel=8
+pkgrel=9
 pkgdesc="HTC Desire"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -28,7 +28,7 @@ package() {
 		"$pkgdir"/etc/pointercal
 }
 
-sha512sums="5e506a4e40db87eca982add78ed1674ead63efa8c54aca3b64c713ec54881237c3b75b81a7c88572d003bf328033af43a381f7912656a5acd6e9c508c3bf9c58  deviceinfo
+sha512sums="90ff8520dade9c1d158287b8dc56d2ae0d97a7160230cc78a3ead1e725f5abf3e1a19c97adfc1a1445c3d14f2d4598564daa953418a01277bcd8f3444bc165a0  deviceinfo
 3ce2d134aa59677e25a160b5985c552fbf048b237169bbeb85e2b8824f734627064b51c097036db10eee0254064d45d804d17372dffcd1ba246938968fe1e225  initfs-hook.sh
 f0f69ab3b5b3fed11ec5049f37c71c4e9dcf87dc1f238199a3917dd61957d46783a8798d63d400cc5d3983987e750e3fec6d7117561ad5005f28131ae4821d66  90-android-touch-dev.rules
 d3de411b31de4bf4336dfac530e6af3392620ef6276ad143ebe0e417d543bfc7f5c9fcab8dab9342798e2c03281275c97e25bd01e97c350a2596f52795a37cef  pointercal"
diff --git a/aports/device/device-htc-bravo/deviceinfo b/aports/device/device-htc-bravo/deviceinfo
index fe1bf555..817a6afd 100644
--- a/aports/device/device-htc-bravo/deviceinfo
+++ b/aports/device/device-htc-bravo/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_modules=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 
 # Device related
diff --git a/aports/device/device-huawei-angler/APKBUILD b/aports/device/device-huawei-angler/APKBUILD
index 7c7f76df..24145256 100644
--- a/aports/device/device-huawei-angler/APKBUILD
+++ b/aports/device/device-huawei-angler/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-huawei-angler
 pkgver=1
-pkgrel=6
+pkgrel=7
 pkgdesc="Huawei Nexus 6P"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -29,6 +29,6 @@ package() {
 		"$pkgdir"/etc/wifi/bcmdhd.cal
 }
 
-sha512sums="449979be4b264d4e3cde514af92fe4e0fb4b2f0eebb97686d484ba2ae2531c2c2cb565d87c9e756ebb0a9d0022c2382341b4e5e0d72cf4ec3bd2be79fee61964  deviceinfo
+sha512sums="8e1ff6d2a11099b0b95903d400837985b347c0d0bdd1cca744b6ec33ea8ab94b9914ef40c4261a3cd6b47ada19c3f4e3b3bf89122a7c8031aefb2ca2a22b022c  deviceinfo
 262f9f3e28cbb28d236cf6edce4919766baabb18e5b0cf35d672d306efeaf12fd66ffba57e6d9bef0eee90203dc98f95aab17145e4c12383055afb58b922ae58  90-android-touch-dev.rules
 61fe1f91d7b0b570b77fcca76503373cbac2515ca3dcc2f2543b910dfaeb1e935a11975f824f6a72001df4e63329356a6aff2d016e9b4f5d8f7b739fee065c4e  bcmdhd.cal"
diff --git a/aports/device/device-huawei-angler/deviceinfo b/aports/device/device-huawei-angler/deviceinfo
index a2de1956..9c9df63d 100644
--- a/aports/device/device-huawei-angler/deviceinfo
+++ b/aports/device/device-huawei-angler/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="false"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="aarch64"
 deviceinfo_msm_refresher="true"
 
diff --git a/aports/device/device-huawei-y530/APKBUILD b/aports/device/device-huawei-y530/APKBUILD
index 4aa63e55..74e49c46 100644
--- a/aports/device/device-huawei-y530/APKBUILD
+++ b/aports/device/device-huawei-y530/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-huawei-y530
 pkgver=1
-pkgrel=5
+pkgrel=6
 pkgdesc="Huawei Ascend Y530"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -22,5 +22,5 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-touchscreen-dev.rules
 }
 
-sha512sums="aec931f402b9825cbf342b09526ca9423b73d97b4f6199ed9ab835009c1233723631f5bf57258d457444f71b77f94bd64403f613904614a0d1b03e9f702ff14b  deviceinfo
+sha512sums="0837c8a4387affc488f3d233c08d3a0602806e81fb6ec77fde1dcd46d7ea25c7f9ebdf6dccbdd0a142f025eaeef44d5a416cddb69926c30a49c13f9d8ef3929b  deviceinfo
 b2ebcd94e54b474d5a0d03f25af0d152583cddbb8ae8a70b72d65e96c9114a11fd535ffc964b23a0852fd541198c940fe6e867dafb6e6a8a12cb6fa5d1538d45  90-touchscreen-dev.rules"
diff --git a/aports/device/device-huawei-y530/deviceinfo b/aports/device/device-huawei-y530/deviceinfo
index 643d0f39..1067690b 100644
--- a/aports/device/device-huawei-y530/deviceinfo
+++ b/aports/device/device-huawei-y530/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_modules=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 
 # Device related
diff --git a/aports/device/device-lenovo-karate/APKBUILD b/aports/device/device-lenovo-karate/APKBUILD
index bcc69a7e..3b56e608 100644
--- a/aports/device/device-lenovo-karate/APKBUILD
+++ b/aports/device/device-lenovo-karate/APKBUILD
@@ -1,7 +1,7 @@
 pkgname="device-lenovo-karate"
 pkgdesc="Lenovo K6 Power"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
@@ -17,5 +17,5 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
-sha512sums="4cf920b531e825adab6354b37157686c554c08cff867cd7fcaa477617ec81ccd4d96762d29c987e089c4bf809ebc73496b045306e60cf476ca256209868f0606  deviceinfo
+sha512sums="dbf14b024f014762f2a52e5cbec94c07cf1184189b813ff9a8d6a458fee3cf812db498fad8493272cd97c53dbf40feb007fa7b42ed9ba6a35a4d8b8de22a4626  deviceinfo
 25086c95c67c27151112efac1dcf7792589c990cc0a93ee910654445a3f9cc66c4a5ab656b3256224b39c49fe104540757cc36abf9de19f47c28c4fa82c4f552  90-android-touch-dev.rules"
diff --git a/aports/device/device-lenovo-karate/deviceinfo b/aports/device/device-lenovo-karate/deviceinfo
index 5e388b27..04800858 100644
--- a/aports/device/device-lenovo-karate/deviceinfo
+++ b/aports/device/device-lenovo-karate/deviceinfo
@@ -19,7 +19,7 @@ deviceinfo_dev_touchscreen="/dev/input/event1"
 deviceinfo_dev_keyboard=""
 
 # Bootloader related
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=tty60,115200,n8 androidboot.console=tty60 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 gpt androidboot.bootdevice=7824900.sdhci earlycon=msm_hsl_uart,0x78B0000 androidboot.selinux=permissive buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
diff --git a/aports/device/device-lg-d285/APKBUILD b/aports/device/device-lg-d285/APKBUILD
index 29355532..bf5da1dd 100644
--- a/aports/device/device-lg-d285/APKBUILD
+++ b/aports/device/device-lg-d285/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-lg-d285
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="LG L65"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -25,6 +25,6 @@ package() {
 		"$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh
 }
 
-sha512sums="86ec02c69f9c036caabb1db31c2bcd988a6fc7eacbe62b4c5db41608a68feb43f6841bed30f2f60a1fccc3f7878f61bb5fa8d637b3e50f03f36c5aa1c95e52bb  deviceinfo
+sha512sums="78f64297d4c86399e505bf736a2a06bbe70d818c3375c0a2a6966acdd2bd1ef8c2916dc76562a79736e20242d61cd2314d3f7184ef6ef852366a34ac026bbac3  deviceinfo
 78224ef3078dd8ee6b15de7a72cc3fe05ec4cb8eb503e11aa06e83009da8a8c104562463ac747d00ac9854c18b16fa557df01f377f4f9af5d98429906fdd016f  initfs-hook.sh
 568d407c3e96b45d740af8617f0e389d36a7091dceccae8f77288fdc45fb7a5ed418c28f31d7fe5a51d92337a40b2dd741b1b18ad02e3fbae91f9a2035d62c95  90-android-touch-dev.rules"
diff --git a/aports/device/device-lg-d285/deviceinfo b/aports/device/device-lg-d285/deviceinfo
index f50b4b30..e8477cc6 100644
--- a/aports/device/device-lg-d285/deviceinfo
+++ b/aports/device/device-lg-d285/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 deviceinfo_msm_refresher="true"
 
diff --git a/aports/device/device-lg-d855/APKBUILD b/aports/device/device-lg-d855/APKBUILD
index b6c3b661..cd78ecfb 100644
--- a/aports/device/device-lg-d855/APKBUILD
+++ b/aports/device/device-lg-d855/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-lg-d855
 pkgver=1
-pkgrel=10
+pkgrel=11
 pkgdesc="LG G3 International"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -19,5 +19,5 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
-sha512sums="5b91503355c9642b9c60f88ded18a72a5f7dc9013209baa4ff2c33dd59a1f72d3c30c2fc01edca464546806f38e0900a9c2c10f7c49d89f092af1715f2590e57  deviceinfo
+sha512sums="9e6e9bf4b3f8d915e177be57f2c38a87748f1edde1090514e9ec5430a9da67116a6a14496cd288bfe8f81ad6539f1027e50c992ade7f0eba441991bfb81c5714  deviceinfo
 ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android-touch-dev.rules"
diff --git a/aports/device/device-lg-d855/deviceinfo b/aports/device/device-lg-d855/deviceinfo
index d203bc1c..6f06b9e7 100644
--- a/aports/device/device-lg-d855/deviceinfo
+++ b/aports/device/device-lg-d855/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 
 # Splash screen
diff --git a/aports/device/device-lg-dory/APKBUILD b/aports/device/device-lg-dory/APKBUILD
index 73d534ba..1eed7382 100644
--- a/aports/device/device-lg-dory/APKBUILD
+++ b/aports/device/device-lg-dory/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-lg-dory
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="LG G Watch"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -19,5 +19,5 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-touchscreen-dev.rules
 }
 
-sha512sums="65c481d06c6ed5d9be8e88871b538393fd0c539263370b23dc0b8f7868ebfe5867aae7edea3ffdc9b20d68b48ff20489342788f1482341d64bd386e5849e5396  deviceinfo
+sha512sums="2a6f876dec7011964d7f45befd4492672067694f7e6bfba4e20a8c496ba24db3176ce940d2f1409c21a63494f95158f32bb8063c0a1947fcdb1addd02b974ef4  deviceinfo
 f52a0bfab7e0067c0837662b5297e6c6d3433a1fc1cbdfaf3000227452d88980b99ac196541fda3bd57fd789580cb4ef96299b24e1bdb277f21f42418fcf17fa  90-touchscreen-dev.rules"
diff --git a/aports/device/device-lg-dory/deviceinfo b/aports/device/device-lg-dory/deviceinfo
index d22f4ff0..c5732d1a 100644
--- a/aports/device/device-lg-dory/deviceinfo
+++ b/aports/device/device-lg-dory/deviceinfo
@@ -10,7 +10,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="false"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 deviceinfo_msm_refresher="true"
 
diff --git a/aports/device/device-lg-hammerhead/APKBUILD b/aports/device/device-lg-hammerhead/APKBUILD
index a0a26be9..e732c7de 100644
--- a/aports/device/device-lg-hammerhead/APKBUILD
+++ b/aports/device/device-lg-hammerhead/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-lg-hammerhead
 pkgver=1
-pkgrel=14
+pkgrel=15
 pkgdesc="Google Nexus 5"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -49,7 +49,7 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
-sha512sums="f7ba9458043b6b00a5f1631750367c029f4d1362f96b359a6d330c8b1f318032c218b7fff526bd0ecf4b2cadb6f666bc62ed375cfc180edc7183b6c3e0002e39  deviceinfo
+sha512sums="be2eba28f0b766917c9369c2f72f337bbb987076f6bd0c80b023bcdcc68684077a375209ac967b038dc018f6633c6795544bad87b2180c04b981660a4d713b41  deviceinfo
 ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android-touch-dev.rules
 4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1  udev-v4l-hack.sh
 d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306  profile.sh
diff --git a/aports/device/device-lg-hammerhead/deviceinfo b/aports/device/device-lg-hammerhead/deviceinfo
index ce9e9d9d..5a6b20b7 100644
--- a/aports/device/device-lg-hammerhead/deviceinfo
+++ b/aports/device/device-lg-hammerhead/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="false"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 
 # Splash screen
diff --git a/aports/device/device-lg-lenok/APKBUILD b/aports/device/device-lg-lenok/APKBUILD
index 49311ac2..21417c0c 100644
--- a/aports/device/device-lg-lenok/APKBUILD
+++ b/aports/device/device-lg-lenok/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-lg-lenok
 pkgver=1
-pkgrel=5
+pkgrel=6
 pkgdesc="LG G Watch R"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -23,7 +23,7 @@ package() {
 		"$pkgdir"/etc/profile.d/fb_fix.sh
 }
 
-sha512sums="83374f8e27b15f2ae2247e0e14ea551650ab5f26f0e89c91ed14f201e61818eb9ec8ef7382352ae3288e7afaaa14bb0f9fba8c85e426260881097f053ee362dc  deviceinfo
+sha512sums="3647840dc7da4c1972f6878cb0b7013414717c8cabdf77d9693f74cf4017e957fba9bf36940445eaa27b5d4a2e2f44e8c43000d1a7ab44ae59f884a1675e70be  deviceinfo
 d29105805adcd79d4f73c2f2c4483a2c627dc7b70acb77f43d085742ef930407c9b1423f7020c34f38e8a09f40cadd991b9acae23e936c90d6a4c0900250da22  initfs-hook.sh
 a36ba9017df3b4be233783096c303abafa873dcdf50f6357b82f3c5526fd161a1914dafe143377cb5982955108b987890638b51911d0dd339172554e39a82d9f  90-android-touch-dev.rules
 f623da68a750ba5dd367d131841aca182b5041292c800e0c919d25187305546e9e42b876cadadc2f56b73e0e6b718a9149a817f5d571e015f7c9467f7387aa61  fb_fix.sh"
diff --git a/aports/device/device-lg-lenok/deviceinfo b/aports/device/device-lg-lenok/deviceinfo
index cd8becad..6a2b1ee0 100644
--- a/aports/device/device-lg-lenok/deviceinfo
+++ b/aports/device/device-lg-lenok/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="false"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 
 # Splash screen
diff --git a/aports/device/device-lg-mako/APKBUILD b/aports/device/device-lg-mako/APKBUILD
index 23c36d08..d5092a3a 100644
--- a/aports/device/device-lg-mako/APKBUILD
+++ b/aports/device/device-lg-mako/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-lg-mako
 pkgver=2
-pkgrel=13
+pkgrel=14
 pkgdesc="Google Nexus 4"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -31,7 +31,7 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
-sha512sums="6d1bdf9037a8b19475e315c637b65d8f6785b8b57e05d61c1c088fb57cbd6bf1be2aa0c538ed64c582f49b4e2e16b848db58ac062159a2812221a6d9c1e0b6d7  deviceinfo
+sha512sums="06f2e3641ed2bc6b6350d8b7ab6f3ac7da1e8376c9e0bd120167684aee5dd687168c47991d84dc75d5716df8dc89ce49e6647ecafe8e5ad6c259b163497725a8  deviceinfo
 ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android-touch-dev.rules
 d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306  profile.sh
 4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1  udev-v4l-hack.sh
diff --git a/aports/device/device-lg-mako/deviceinfo b/aports/device/device-lg-mako/deviceinfo
index d7a551a4..4631f224 100644
--- a/aports/device/device-lg-mako/deviceinfo
+++ b/aports/device/device-lg-mako/deviceinfo
@@ -10,7 +10,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="false"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 
 # Device related
diff --git a/aports/device/device-motorola-osprey/APKBUILD b/aports/device/device-motorola-osprey/APKBUILD
index 7f8d3c3b..3243c0f4 100644
--- a/aports/device/device-motorola-osprey/APKBUILD
+++ b/aports/device/device-motorola-osprey/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-motorola-osprey
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="Motorola Moto G 3rd gen. (2015)"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -23,7 +23,7 @@ package() {
 		"$pkgdir"/etc/profile.d/00-fb-workaround.sh
 }
 
-sha512sums="f4a0827de0a05549c1b610f45464a259958fbfe19465351654a58dac5aec3d40a9962f1b3b4559fbb7234446c336bd6ed4432bd418ec6e7fa9246b4b720a7201  deviceinfo
+sha512sums="63fa93d64f87175d1511927a47c59a83eefc3c01097c40a476d7143de52ad9f87da3c9f9e00fc72b24ff2c286e818a414c7e3f076488025c743a9132e765f3ab  deviceinfo
 3e9d6bf1bd45328104b91b724472ac0e39cb595fb87f84b6793527019477a73234ae37d33e99419bc5810c018402ea6e68e76c26ace112ee11efc416ac0a7398  initfs-hook.sh
 60597699b58aca14a1696329eba4ffb46d98c721d442fb024752e3301ea992ac1727d4609083a299573115288d2039c17831e7c70c2ffdd195a3c20323e6b5fb  90-android-touch-dev.rules
 857da7bfe3a44d960ca1c05f8646eedd16140fa339f3b0421353f6cdb4b42f8e5c6457522e70c2eb2f76717404c688c0d92525b9d1e99895f3febb5ae3687420  fb-workaround.sh"
diff --git a/aports/device/device-motorola-osprey/deviceinfo b/aports/device/device-motorola-osprey/deviceinfo
index eb8b84d0..33cf1d01 100644
--- a/aports/device/device-motorola-osprey/deviceinfo
+++ b/aports/device/device-motorola-osprey/deviceinfo
@@ -12,7 +12,7 @@ deviceinfo_modules=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 
 # Splash screen
diff --git a/aports/device/device-motorola-titan/APKBUILD b/aports/device/device-motorola-titan/APKBUILD
index 9610bb6e..5b7fe0fa 100644
--- a/aports/device/device-motorola-titan/APKBUILD
+++ b/aports/device/device-motorola-titan/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-motorola-titan
 pkgver=1
-pkgrel=17
+pkgrel=18
 pkgdesc="Motorola Moto G 2014"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -29,7 +29,7 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
-sha512sums="0f975a652f6ad14fb51469d832467eec0ca8f873a827c92ee168153c256c98f0749c0f165239c6839b5854ae06b9f6e52c0f6217e3b96ed5427052facc1be30a  deviceinfo
+sha512sums="efdd19f924659b92473d592c501c4ef8622cb09f1de17d1bea0bb371b2880e5da463fbea159ebec3806a5e90a8757cf6e87eb8feab8f2186b26cc198d8fad4bf  deviceinfo
 8406968cd554393ea1e350967c80810d059de2b1d33ea1302e265780c1f0110d64cf15a68c2f374981a88906d0317315e0a71995c85fd5eaf93bb47ed427529c  90-android-touch-dev.rules
 d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306  profile.sh
 4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1  udev-v4l-hack.sh
diff --git a/aports/device/device-motorola-titan/deviceinfo b/aports/device/device-motorola-titan/deviceinfo
index 8865b30c..83beb27c 100644
--- a/aports/device/device-motorola-titan/deviceinfo
+++ b/aports/device/device-motorola-titan/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="false"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 deviceinfo_msm_refresher="true"
 
diff --git a/aports/device/device-nokia-rx51/APKBUILD b/aports/device/device-nokia-rx51/APKBUILD
index 5c2a2936..eb8f2a5e 100644
--- a/aports/device/device-nokia-rx51/APKBUILD
+++ b/aports/device/device-nokia-rx51/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-nokia-rx51
 pkgver=1
-pkgrel=26
+pkgrel=27
 pkgdesc="Nokia N900"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -69,7 +69,7 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
-sha512sums="8e010bebddf1bb09cde3966e402d2c146476eb21761c3110d2ac01010eced42519dab7b81915899894914c7e3820eaf6c48767a21c955412ad53da0bade0c38c  deviceinfo
+sha512sums="b8b61cc2a795e59bb11318ddcaeca1c36dbe786a9925fae366c4ab639db0314fb14f5d08e52665df65fabd62db2a580fd3055b9f56f0e61313b96e185af5f79f  deviceinfo
 8f5b68b86f5345698114a2d70fd174699e5729f6c157659e4e57bef1dcab8c1209c13b30df6f5c2e8f31fee077039ffbc7817ca201f0745467b693e7550eaf6b  uboot-script.cmd
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
 d303734dd49fe75a299ca723f4da52bc0cda2775683c54aa736aabf397db4ae8deb6d912d4116800cf2ba17f3a2987ab3e839652879b8ab023b4a91a55849f08  90-touchscreen-dev.rules
diff --git a/aports/device/device-nokia-rx51/deviceinfo b/aports/device/device-nokia-rx51/deviceinfo
index 574f9b2a..f6282c95 100644
--- a/aports/device/device-nokia-rx51/deviceinfo
+++ b/aports/device/device-nokia-rx51/deviceinfo
@@ -12,7 +12,7 @@ deviceinfo_dtb="omap3-n900"
 deviceinfo_modules_initfs="tsc2005 tsc200x-core omap_wdt twl4030_wdt omap-sham"
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="0xffff"
+deviceinfo_flash_method="0xffff"
 deviceinfo_generate_legacy_uboot_initfs="true"
 deviceinfo_arch="armhf"
 deviceinfo_dev_touchscreen="/dev/input/event3"
diff --git a/aports/device/device-oneplus-bacon/APKBUILD b/aports/device/device-oneplus-bacon/APKBUILD
index c4f96f04..1767a38c 100644
--- a/aports/device/device-oneplus-bacon/APKBUILD
+++ b/aports/device/device-oneplus-bacon/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-oneplus-bacon
 pkgver=1
-pkgrel=6
+pkgrel=7
 pkgdesc="OnePlus One"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -25,6 +25,6 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
-sha512sums="96fb5b0c88b54e755d4065bafe5ac220294234b846a0b90810aedd6ee2fef544c9382c8277b757b4108e6bb05dcca4f1c90c5290a77d9d6c730f3c542066ca69  deviceinfo
+sha512sums="bd471eb7ac9a92deb7c6de63e4b12abb7ae86271c4c39c2e769a8ef576ab5dbcadb165a8a43e6044c50c0fbadbc62938a1c86fc17eba37c1b56fbf0088fa4e04  deviceinfo
 65e9ee7352b1dc39d99ea411eb0ed9c56f9975230907db5add3a1b4146cdf6f227c934052dab38a1937ed67d67585f28fb7410f10a1bec9dd5e4eb69d7253515  90-android-touch-dev.rules
 4f321242005b4da012322a8e9bce14a3734281d6ab410f60e7c9c28a6df905876ccce65c3b914233f351118718ccd81b9be41724ee2099ca36d40b4cfff46b93  weston.ini"
diff --git a/aports/device/device-oneplus-bacon/deviceinfo b/aports/device/device-oneplus-bacon/deviceinfo
index cbb514ec..9d929c57 100644
--- a/aports/device/device-oneplus-bacon/deviceinfo
+++ b/aports/device/device-oneplus-bacon/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="false"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 
 # Splash screen
diff --git a/aports/device/device-oneplus-onyx/APKBUILD b/aports/device/device-oneplus-onyx/APKBUILD
index 77ec7c6f..f4a8d71e 100644
--- a/aports/device/device-oneplus-onyx/APKBUILD
+++ b/aports/device/device-oneplus-onyx/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-oneplus-onyx
 pkgver=1
-pkgrel=0
+pkgrel=1
 pkgdesc="OnePlus X"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -21,6 +21,6 @@ package() {
 
 }
 
-sha512sums="73d7778d8e34c65b0ef04c4d0931af3280dee9ac5bb70941313d666a7ccea71a3c250db110c5203a37d1597681c0cbcbb0adba455934be3a7bdebbcb544a8f18  deviceinfo
+sha512sums="83bdeb4a7fbcbe06dc2c46ab048d1c2661c96cba9e5132fdb45641272e6e2b2edfbb9086773273b6fa173a717529c0387cee9e91dede00051f352a25ab30d93b  deviceinfo
 73963817cab7b798642f91894eb17975212a323d0e8bf8ce4f477fe33ace90b0050180877cbb605a074d07871d640c654cd581f0359532b9edb072013e6346a5  90-android-touch-dev.rules
 1452360bab1146643d8c6e0c881bfc145030cd5e3704765fc17f701dcec3f3e890a93db77e1b6afd6884d48b790e7dfc1013bbeedd619ae798baccaeab118847  fb.modes"
diff --git a/aports/device/device-oneplus-onyx/deviceinfo b/aports/device/device-oneplus-onyx/deviceinfo
index a3de8d05..18fc62f6 100644
--- a/aports/device/device-oneplus-onyx/deviceinfo
+++ b/aports/device/device-oneplus-onyx/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="false"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 
 # Splash screen
diff --git a/aports/device/device-qemu-aarch64/APKBUILD b/aports/device/device-qemu-aarch64/APKBUILD
index b1a6fc82..90885c9c 100644
--- a/aports/device/device-qemu-aarch64/APKBUILD
+++ b/aports/device/device-qemu-aarch64/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-qemu-aarch64
 pkgver=1
-pkgrel=6
+pkgrel=7
 pkgdesc="Simulated device in qemu with vexpress soc"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -18,5 +18,5 @@ package() {
 		"$pkgdir"/etc/network/interfaces
 }
 
-sha512sums="406f7aff4416e58ac38e2240f164435299f42ce1a7d03098bc7ffdd570d02b40c630da89f009bb618d0554af0aedfbe5b26edc9848aa40de09534183d9f77db1  deviceinfo
+sha512sums="8802ad301bffd10d79db938adecf4bbdf8293c8caefe5fce753c56f228a7212330318a0be9853a83442e8971bbc235269796fe66077c501d35a935df1d2ed90c  deviceinfo
 d510ca304066840aa5e6c4fc71ded1b7e83012c93837fa39e37bdb873b3636230030d56f7aa50c93fc688f563cb4cb96c02ad333bbc45a400c1ebee1792a9dd4  interfaces"
diff --git a/aports/device/device-qemu-aarch64/deviceinfo b/aports/device/device-qemu-aarch64/deviceinfo
index 1f2c13d8..e171b4b9 100644
--- a/aports/device/device-qemu-aarch64/deviceinfo
+++ b/aports/device/device-qemu-aarch64/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs="virtio-gpu virtio_net qxl drm_bochs"
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="none"
+deviceinfo_flash_method="none"
 deviceinfo_generate_legacy_uboot_initfs="false"
 deviceinfo_arch="aarch64"
 deviceinfo_kernel_cmdline="console=ttyAMA0,38400n8 console=tty1 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"
diff --git a/aports/device/device-qemu-amd64/APKBUILD b/aports/device/device-qemu-amd64/APKBUILD
index cd99961d..8ea0710a 100644
--- a/aports/device/device-qemu-amd64/APKBUILD
+++ b/aports/device/device-qemu-amd64/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-qemu-amd64
 pkgver=1
-pkgrel=12
+pkgrel=13
 pkgdesc="Simulated device in qemu with an x86 platform"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -30,6 +30,6 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
-sha512sums="b3659499d1c49554e65f7ee8e4b9448c010987a213cd97c19b6d289aaf403f741c01a08cd637de7da3467dffd841055d53ab2ba93833655c10de1644350894d8  deviceinfo
+sha512sums="29e2bf334a04ede2cc48095190cfb9d4cc47d8bf2ff68ea06452bfd1ed26765a2dd39cc525953cdf00f2d6919ac914c5d3a7b3f9d7f0ea2af75ef7c466bf2164  deviceinfo
 d510ca304066840aa5e6c4fc71ded1b7e83012c93837fa39e37bdb873b3636230030d56f7aa50c93fc688f563cb4cb96c02ad333bbc45a400c1ebee1792a9dd4  interfaces
 df0fe900693e5f176076c59f5379e56aaa96c3df16a4120448f15b71f530170730b43e5fe32733c40c118a00ca3581043231a062a8a1eb0a930bfbfbb6c52a47  weston.ini"
diff --git a/aports/device/device-qemu-amd64/deviceinfo b/aports/device/device-qemu-amd64/deviceinfo
index 1055e034..edb325ec 100644
--- a/aports/device/device-qemu-amd64/deviceinfo
+++ b/aports/device/device-qemu-amd64/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs="qxl drm_bochs"
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="none"
+deviceinfo_flash_method="none"
 deviceinfo_generate_legacy_uboot_initfs="false"
 deviceinfo_arch="x86_64"
 deviceinfo_kernel_cmdline="console=tty1 console=ttyS0 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"
diff --git a/aports/device/device-qemu-vexpress/APKBUILD b/aports/device/device-qemu-vexpress/APKBUILD
index c6bd10fd..ad2491be 100644
--- a/aports/device/device-qemu-vexpress/APKBUILD
+++ b/aports/device/device-qemu-vexpress/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-qemu-vexpress
 pkgver=1
-pkgrel=13
+pkgrel=14
 pkgdesc="Simulated device in qemu with vexpress soc"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -18,5 +18,5 @@ package() {
 		"$pkgdir"/etc/network/interfaces
 }
 
-sha512sums="01983e7f52cc48e25e41df8bec91d364bac471c1c602c0b854a800ef4c09048989f894fe4bed35b607f0273d9fa46a25f3a285eeac62b1657867c27e08dd18a3  deviceinfo
+sha512sums="7484da8074e07ac773a73110ac9e7c261d858a8d77a37cbed469d951d09f3cce26920ea1284b34a6f75f5daa38d0d1f2aab7e169d783f38ea1eadf27b21abe2f  deviceinfo
 d510ca304066840aa5e6c4fc71ded1b7e83012c93837fa39e37bdb873b3636230030d56f7aa50c93fc688f563cb4cb96c02ad333bbc45a400c1ebee1792a9dd4  interfaces"
diff --git a/aports/device/device-qemu-vexpress/deviceinfo b/aports/device/device-qemu-vexpress/deviceinfo
index c13abf99..a8d6ae64 100644
--- a/aports/device/device-qemu-vexpress/deviceinfo
+++ b/aports/device/device-qemu-vexpress/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb="vexpress-v2p-ca9"
 deviceinfo_modules_initfs="amba-clcd virtio_net virtio_mmio ambakmi libps2 pcips2 qxl drm_bochs"
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="none"
+deviceinfo_flash_method="none"
 deviceinfo_generate_legacy_uboot_initfs="false"
 deviceinfo_arch="armhf"
 deviceinfo_kernel_cmdline="console=ttyAMA0,38400n8 console=tty1 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"
diff --git a/aports/device/device-samsung-i747m/APKBUILD b/aports/device/device-samsung-i747m/APKBUILD
index ee5dd538..904fe0e7 100644
--- a/aports/device/device-samsung-i747m/APKBUILD
+++ b/aports/device/device-samsung-i747m/APKBUILD
@@ -1,7 +1,7 @@
 pkgname="device-samsung-i747m"
 pkgdesc="Samsing Galaxy SIII (USA/Canada)"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
@@ -18,6 +18,6 @@ package() {
 		"$pkgdir"/etc/fb.modes
 }
 
-sha512sums="c2c4ca148e0a0aad10e1bbfac40271bf6afd0cae35f452846ffa8e2b0e6b76c11d6e7cd2548816a94a26837ccdd0f16a5081179198079502a53252c1b0086f1f  deviceinfo
+sha512sums="049a694e9f88be4a1862e402620abb64210f81860204ff25748bebe6f27090a96430fe5743cca37effd0b86aee2d2278da58031a0bdb9dd8f249d70ad3e67749  deviceinfo
 1ef4aa9206e6aa61cef80dd4fd4dc2d834e3582e40978d2da8a768964bbaa854a4068fb263e4dcc3cb1a745d42ebf5d457084801dd28fa2de50706ed5a5a9c7c  90-android-touch-dev.rules
 bd5aba648930678aea38d2a67e584c94f5ab53d235c8f6ce785bc7e31db00e1cdf08fb84fd3fe78bd7b409a4120b2c7beadf77e028ec8580d4df48248a2c414f  fb.modes"
diff --git a/aports/device/device-samsung-i747m/deviceinfo b/aports/device/device-samsung-i747m/deviceinfo
index fba813f1..b0e1a072 100644
--- a/aports/device/device-samsung-i747m/deviceinfo
+++ b/aports/device/device-samsung-i747m/deviceinfo
@@ -19,7 +19,7 @@ deviceinfo_dev_touchscreen="/dev/input/event4"
 deviceinfo_dev_keyboard=""
 
 # Bootloader related
-deviceinfo_flash_methods="heimdall-bootimg"
+deviceinfo_flash_method="heimdall-bootimg"
 deviceinfo_kernel_cmdline="androidboot.hardware=qcom user_debug=31 zcache buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_flash_offset_base="0x80200000"
diff --git a/aports/device/device-samsung-i9003/APKBUILD b/aports/device/device-samsung-i9003/APKBUILD
index a17e1c9f..601f903c 100644
--- a/aports/device/device-samsung-i9003/APKBUILD
+++ b/aports/device/device-samsung-i9003/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-samsung-i9003
 pkgver=1
-pkgrel=14
+pkgrel=15
 pkgdesc="Samsung Galaxy SI SLC"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -23,5 +23,5 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
-sha512sums="0d9acc4d0e382e5c49b8b88e29cccd6e8833e2c953d96d916871f0b2f0ca039b28aec8af3d9d3494f5e504b290aacb5511a53aa0e8d3bcaf9546817cc27c5a7a  deviceinfo
+sha512sums="3efef91835ec87b4222ff712b4df4e89f76d45ef3e1523294ed4de69331a3c3aed63a8146a8c10578b36fe49171052c264bc19bcf617460ec7bb9682a0ade0a9  deviceinfo
 079336f0a62fe45e839dcaa56479736fb67125ef5adf9bf73fc513c696d5a9fe14cfc9912f4aeb989476aa23bcd1befca25f0163c827691eea7eec1c7b97f303  90-android-touch-dev.rules"
diff --git a/aports/device/device-samsung-i9003/deviceinfo b/aports/device/device-samsung-i9003/deviceinfo
index bfa1dfbf..b76a81ee 100644
--- a/aports/device/device-samsung-i9003/deviceinfo
+++ b/aports/device/device-samsung-i9003/deviceinfo
@@ -10,7 +10,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="heimdall-bootimg"
+deviceinfo_flash_method="heimdall-bootimg"
 deviceinfo_arch="armhf"
 
 # Device related
diff --git a/aports/device/device-samsung-i9070/APKBUILD b/aports/device/device-samsung-i9070/APKBUILD
index 9963e46a..cbb52d2e 100644
--- a/aports/device/device-samsung-i9070/APKBUILD
+++ b/aports/device/device-samsung-i9070/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-i9070
 pkgver=1
-pkgrel=16
+pkgrel=17
 pkgdesc="Samsung Galaxy S Advance"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -36,6 +36,6 @@ mesa() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="4aaa8192110e8480b2f674b81f5e850cf419bfb20675443dce63d7f631dc3a0084dd7354b2cf1352349dc5127548fb6940f1c4b2bc80c44595c53b55e80242e0  deviceinfo
+sha512sums="fe7b2af2abd441775705e5d228eab7904194bb3ef6af08a69593849e3380e6c9fc4905b3eac52e851aff0f2364a4425a79da8e6e48416b7a630754a525df3b9e  deviceinfo
 098187f6ab56d2542f98f1b5fbcf493431f665a4300db05e859357366e39b02a3d508bfd94c1d1bd7c669261e7ef0d4e1aef1fdbb15541fe34f3f48a6caa247f  initfs-hook.sh
 61e8becbf6fa7c1c6c42e481083f5981ae7af33a48cbc53e817d8ac2c6a8e4f67a54b32ae3b8f5f25f7b412165a849dc93a629110dc47b0d16927bf2a12eb7e1  modules-load.conf"
diff --git a/aports/device/device-samsung-i9070/deviceinfo b/aports/device/device-samsung-i9070/deviceinfo
index 37eb12d1..027f4a6d 100644
--- a/aports/device/device-samsung-i9070/deviceinfo
+++ b/aports/device/device-samsung-i9070/deviceinfo
@@ -10,7 +10,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="heimdall-isorec"
+deviceinfo_flash_method="heimdall-isorec"
 deviceinfo_arch="armhf"
 
 # Device related
diff --git a/aports/device/device-samsung-i9100/APKBUILD b/aports/device/device-samsung-i9100/APKBUILD
index 6a76e206..6a4740ee 100644
--- a/aports/device/device-samsung-i9100/APKBUILD
+++ b/aports/device/device-samsung-i9100/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-samsung-i9100
 pkgver=1
-pkgrel=15
+pkgrel=16
 pkgdesc="Samsung Galaxy SII"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -23,6 +23,6 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
-sha512sums="013dcb5105ccec74f45303e458f915c86f7a2c2bc5d9d2496a6388bbf7e944d1ec95e9f224934681bb4c1464b154b79ab16ff90f1d35c5d63927a62d6b66514c  deviceinfo
+sha512sums="dbad2b2fffc0167aa91b5f56219d84557929f0d58da813b7c1277dc6c37ea05c672a4d0643091d18289fb7e7ffb62aefc295efd00dbbeccb695860a125c564a6  deviceinfo
 089635daddd88eec35451bfe98dc3713035e3623c896dd21305b990ecf422e8fbb54e010cf347919bbb3a7385f639ab119280477fe0783df3228168d97d96fc6  90-android-touch-dev.rules
 03da52725e676bc7db371cbf4b60bff8689eca469dae96a02ca7d6c194ed9f8c4ec9d19d1ac9212eeba0b73384fd213e86f2b93da94f37e5abe4cc3339281205  device-samsung-i9100.post-install"
diff --git a/aports/device/device-samsung-i9100/deviceinfo b/aports/device/device-samsung-i9100/deviceinfo
index 4a56ecb8..521c1278 100644
--- a/aports/device/device-samsung-i9100/deviceinfo
+++ b/aports/device/device-samsung-i9100/deviceinfo
@@ -10,7 +10,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="heimdall-isorec"
+deviceinfo_flash_method="heimdall-isorec"
 deviceinfo_arch="armhf"
 
 # Device related
diff --git a/aports/device/device-samsung-i9305/APKBUILD b/aports/device/device-samsung-i9305/APKBUILD
index 3c942aed..e59600fd 100644
--- a/aports/device/device-samsung-i9305/APKBUILD
+++ b/aports/device/device-samsung-i9305/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-samsung-i9305
 pkgver=1
-pkgrel=14
+pkgrel=15
 pkgdesc="Samsung Galaxy SIII LTE"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -23,6 +23,6 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
-sha512sums="4023bebbe3d8b7a34de7576bbd3c0dd615f8053fbb53f3c35dd0a8135602b090e993191ea964e748818a3422644feef2b3859eef57b2aaeac5894e11a80fdf2b  deviceinfo
+sha512sums="43361c58d84463da8bbeab7a5b5756317b890b69253b011549696bda4b25e553217a7af61efd337718e5e791cda9bcc543ffaeba59f9d57245f45aacb8d848af  deviceinfo
 d70a03210458c771f94db920a8d3162a03fc7727f0fbafef4c1575ebc659c937c082f5c7a4dcdd1572925b973d628c6f4cf895c3b8b2a59af8142824468fe7c4  90-android-touch-dev.rules
 03da52725e676bc7db371cbf4b60bff8689eca469dae96a02ca7d6c194ed9f8c4ec9d19d1ac9212eeba0b73384fd213e86f2b93da94f37e5abe4cc3339281205  device-samsung-i9305.post-install"
diff --git a/aports/device/device-samsung-i9305/deviceinfo b/aports/device/device-samsung-i9305/deviceinfo
index 6760254c..e9e255d7 100644
--- a/aports/device/device-samsung-i9305/deviceinfo
+++ b/aports/device/device-samsung-i9305/deviceinfo
@@ -10,7 +10,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="heimdall-bootimg"
+deviceinfo_flash_method="heimdall-bootimg"
 deviceinfo_generate_bootimg="true"
 deviceinfo_arch="armhf"
 
diff --git a/aports/device/device-samsung-i9505/APKBUILD b/aports/device/device-samsung-i9505/APKBUILD
index f6aafa3f..f8ab65c3 100644
--- a/aports/device/device-samsung-i9505/APKBUILD
+++ b/aports/device/device-samsung-i9505/APKBUILD
@@ -1,7 +1,7 @@
 pkgname="device-samsung-i9505"
 pkgdesc="Samsung Galaxy S4 International"
 pkgver=0.4
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
@@ -17,5 +17,5 @@ package() {
 
 }
 
-sha512sums="5b96b607c59d8c9016c1d4609359da7b204e08f426ac360663020733cd6b725dea09f09ebaf6ac5c431f8fb365d65da29ed717f92b66a6104fa0ea21b52cbba2  deviceinfo
+sha512sums="3cf9bdd32bbaa9108dde668fa1c279e5166cd329898cc47d23d951d075feff814b319b5b7c373b16fe16285225ac3082ddc64a74b12a7ce8aa3f872c0bf3b9fd  deviceinfo
 9dd220de9aa0ee4106686d43a4bac858c7b57ca8537488a54176ef13615195dab7945ca3f6896368186e99c7ed78748a2ad25458efe586dbc337190143d5184f  90-android-sec_touchscreen.rules"
diff --git a/aports/device/device-samsung-i9505/deviceinfo b/aports/device/device-samsung-i9505/deviceinfo
index 299bae92..5958a93f 100644
--- a/aports/device/device-samsung-i9505/deviceinfo
+++ b/aports/device/device-samsung-i9505/deviceinfo
@@ -19,7 +19,7 @@ deviceinfo_dev_touchscreen=""
 deviceinfo_dev_keyboard=""
 
 # Bootloader related
-deviceinfo_flash_methods="heimdall-bootimg"
+deviceinfo_flash_method="heimdall-bootimg"
 deviceinfo_kernel_cmdline="androidboot.hardware=qcom user_debug=31 zcache msm_rtb.filter=0x3F ehci-hcd.park=3 buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
diff --git a/aports/device/device-samsung-maguro/APKBUILD b/aports/device/device-samsung-maguro/APKBUILD
index 992bd64b..7e13f94b 100644
--- a/aports/device/device-samsung-maguro/APKBUILD
+++ b/aports/device/device-samsung-maguro/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-maguro
 pkgver=2
-pkgrel=14
+pkgrel=15
 pkgdesc="Google Galaxy Nexus (GSM)"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -27,4 +27,4 @@ mesa() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="dce64fc8cb993e62ffe3e4ad243ba18bf78dbde27f776f0e9dea9e426709cf5498df82eb049864471db6c3c2683a1f7563ab23b823cf96bf37cc6570b869a0b8  deviceinfo"
+sha512sums="e44e78b362c7414eab0031b559732a18f3adf09cc02b3b9a6c05e1553cfebf91abf9f5364bdbb154d3883bdb71e1b3382b398fa38e1a15385ed2749568329c84  deviceinfo"
diff --git a/aports/device/device-samsung-maguro/deviceinfo b/aports/device/device-samsung-maguro/deviceinfo
index e126676e..327bde0f 100644
--- a/aports/device/device-samsung-maguro/deviceinfo
+++ b/aports/device/device-samsung-maguro/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="false"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 deviceinfo_dev_touchscreen="/dev/input/event1"
 
diff --git a/aports/device/device-samsung-n7100/APKBUILD b/aports/device/device-samsung-n7100/APKBUILD
index 0c4d1357..8aaaddda 100644
--- a/aports/device/device-samsung-n7100/APKBUILD
+++ b/aports/device/device-samsung-n7100/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-samsung-n7100
 pkgver=1
-pkgrel=11
+pkgrel=12
 pkgdesc="Samsung Galaxy Note II (GSM)"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -19,5 +19,5 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
-sha512sums="711c4ebdd5ccde16b83504d4d2aedfaaaf00408c1a78091d972e91aaf690cc7e2c650f5bbc7d8ddff402b2cae0d9cb95a2f066da6999ffb482ceb1a1fa50887e  deviceinfo
+sha512sums="e03232727d2b3be371e4df6441eb5aa2c2fae809183b45b53371f99b7d20bb5685e780ca962e2cd26adbad55f7e62fe77f2334eac0b35576593a8df19bedb8f9  deviceinfo
 089635daddd88eec35451bfe98dc3713035e3623c896dd21305b990ecf422e8fbb54e010cf347919bbb3a7385f639ab119280477fe0783df3228168d97d96fc6  90-android-touch-dev.rules"
diff --git a/aports/device/device-samsung-n7100/deviceinfo b/aports/device/device-samsung-n7100/deviceinfo
index 9bf8936d..feb7b5fe 100644
--- a/aports/device/device-samsung-n7100/deviceinfo
+++ b/aports/device/device-samsung-n7100/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="heimdall-bootimg"
+deviceinfo_flash_method="heimdall-bootimg"
 deviceinfo_arch="armhf"
 deviceinfo_generate_bootimg="true"
 
diff --git a/aports/device/device-sony-amami/APKBUILD b/aports/device/device-sony-amami/APKBUILD
index 48016e66..a3512ceb 100644
--- a/aports/device/device-sony-amami/APKBUILD
+++ b/aports/device/device-sony-amami/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-sony-amami
 pkgver=1
-pkgrel=14
+pkgrel=15
 pkgdesc="Sony Xperia Z1 Compact"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -19,5 +19,5 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
-sha512sums="64e3bed1ee54551e6582b5b3f2547fb0cd4d0fab8a8c1beaea4b661113f0bd8d1bb3874ac5d0fcc104806bcf1cf49695c868bec46511bb055662692232d2f3da  deviceinfo
+sha512sums="29e22a8edf9e7efce2231d1ae1de000d65911794ade8317d53b6b26bb1bad022087ec7c5a954c795b85084c622958d0d2a80d41c10c49c5332227d807da4fd7e  deviceinfo
 8b6034c0338ab4c7d648f47983aad6da07e427e7dba47baabf85a1b3ddeeda47c8d7fbcd547a302c9a759b2943ee30d3e82c3b368d8582833a058e4671638a9e  90-android-touch-dev.rules"
diff --git a/aports/device/device-sony-amami/deviceinfo b/aports/device/device-sony-amami/deviceinfo
index b8fe2d58..8732b923 100644
--- a/aports/device/device-sony-amami/deviceinfo
+++ b/aports/device/device-sony-amami/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 deviceinfo_generate_bootimg="true"
 
diff --git a/aports/device/device-sony-aries/APKBUILD b/aports/device/device-sony-aries/APKBUILD
index 8b1c1597..0384ab3f 100644
--- a/aports/device/device-sony-aries/APKBUILD
+++ b/aports/device/device-sony-aries/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-sony-aries
 pkgver=1
-pkgrel=12
+pkgrel=13
 pkgdesc="Sony Xperia Z3 Compact"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -21,6 +21,6 @@ package() {
 		"$pkgdir"/etc/profile.d/fb-workaround.sh
 }
 
-sha512sums="c203e6b25095e8a5eab62d0d55bfa3537b0d6338ea4331d87def21cd6170f8cb8b85d9c74b2f3f2a40b5540f78158f687d0db9fea95f3d4f41ee004f5b9d3400  deviceinfo
+sha512sums="77c00e44a60d78154f68a4ddabe4d9df63496ba7a9ce68c604d58fcafab7169dfdb8eb1781eee51a4803cee5005f6c75a27cbc7b7b1dc44c354ad9a011d7eced  deviceinfo
 8b6034c0338ab4c7d648f47983aad6da07e427e7dba47baabf85a1b3ddeeda47c8d7fbcd547a302c9a759b2943ee30d3e82c3b368d8582833a058e4671638a9e  90-android-touch-dev.rules
 13f36f33cfae5e759b3889bc4e308324fd9bcf1cc7b097bbbe3646f1243b3bc06e1b1594cc8578c52c304a2b5006babd978c5b3f258769892e80552457889f99  fb-workaround.sh"
diff --git a/aports/device/device-sony-aries/deviceinfo b/aports/device/device-sony-aries/deviceinfo
index 5062092e..edd2b839 100644
--- a/aports/device/device-sony-aries/deviceinfo
+++ b/aports/device/device-sony-aries/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 deviceinfo_generate_bootimg="true"
 
diff --git a/aports/device/device-sony-castor-windy/APKBUILD b/aports/device/device-sony-castor-windy/APKBUILD
index a07b17c6..042e8f24 100644
--- a/aports/device/device-sony-castor-windy/APKBUILD
+++ b/aports/device/device-sony-castor-windy/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-sony-castor-windy
 pkgver=1
-pkgrel=9
+pkgrel=10
 pkgdesc="Sony Xperia Z2 Tablet WIFI"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -23,6 +23,6 @@ package() {
 		"$pkgdir"/etc/modules-load.d/00-${pkgname}.conf
 }
 sha512sums="d8ce60ea7acaabf627ddca2f0887a4cda46f313b7aaf7934bef2fef8a6e0798ccefab849e4571e4e3fcd06ae34c1a6efe3b58b401e2e443416f6200e6d4ea769  modules-load.conf
-6975fcf288244f3b369f37e643a5e3b0cc845fdea421170210ed16cd18a7726b6d24fec495073ab32e08f62ee22b7841a777f412483a18315058335642e017b7  deviceinfo
+2472ed5ff56825a195ff82e175813e8e4fc581a04255b74db7babc75efc8fe6424488e412d74e12f8d87dbc0cd2e1a7e678ea905aa97ddfbd7f671085c53f452  deviceinfo
 fa0d8b7a17509f5882424e67e66f5f562705a076a12e8d9dd9363215c858d7801216520cf25373110671958b1e1589080b097170c760d18e621849b0b9090e05  90-android-touch-dev.rules
 b99a1bc0d430a261b6ab0b5ea12f2e996ab24ece6fe40ff57357697f4db976394c655a7c7a63e7c985f6356126a6b1d920eb0077817cb65ae18250f404282a68  brcmfmac4335-sdio.txt"
diff --git a/aports/device/device-sony-castor-windy/deviceinfo b/aports/device/device-sony-castor-windy/deviceinfo
index 2ce6c4b9..99efdb2b 100644
--- a/aports/device/device-sony-castor-windy/deviceinfo
+++ b/aports/device/device-sony-castor-windy/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_external_disk="true"
 deviceinfo_modules_initfs="rmi_core rmi_i2c rmi_spi"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 deviceinfo_dev_touchscreen="/dev/input/event2"
 
diff --git a/aports/device/device-sony-honami/APKBUILD b/aports/device/device-sony-honami/APKBUILD
index adf21d6f..efe6089c 100644
--- a/aports/device/device-sony-honami/APKBUILD
+++ b/aports/device/device-sony-honami/APKBUILD
@@ -1,7 +1,7 @@
 pkgname="device-sony-honami"
 pkgdesc="Sony Xperia Z1"
 pkgver=1.0
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
@@ -16,5 +16,5 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
-sha512sums="38d2efc3dc0db2420e43e26a591e85de6de7b0a4cead18f98796f9cf61ae775f9be84b01a5863b4ccdce5a52ce3376c8671ad4bb9d948c70b8ac92fce9bb0189  deviceinfo
+sha512sums="21e41e8f92ad3b3c996d3c01d2aea2abab4fa88951ef6e3a4e8c3c5e1f05b8cbb91f64336486a11958944dd652f53d71c9b5c45ce0c566b51386f4927dd002c7  deviceinfo
 1651ac9eda3c97fafe55abe0f0ae429e04f73edcbf2c56aa3259f81837f7adde348bcb385daed05c30cfc61415455a459a917ed3acccbfd9b7a1caa32a851d40  90-android-touch-dev.rules"
diff --git a/aports/device/device-sony-honami/deviceinfo b/aports/device/device-sony-honami/deviceinfo
index 440eed85..b5aa81e0 100644
--- a/aports/device/device-sony-honami/deviceinfo
+++ b/aports/device/device-sony-honami/deviceinfo
@@ -17,7 +17,7 @@ deviceinfo_dev_touchscreen="/dev/input/event4"
 deviceinfo_dev_keyboard=""
 
 # Bootloader related
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
diff --git a/aports/device/device-sony-yuga/APKBUILD b/aports/device/device-sony-yuga/APKBUILD
index 2a0ee9b8..3ea484ee 100644
--- a/aports/device/device-sony-yuga/APKBUILD
+++ b/aports/device/device-sony-yuga/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-sony-yuga
 pkgver=1
-pkgrel=5
+pkgrel=6
 pkgdesc="Sony Xperia Z"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -23,7 +23,7 @@ package() {
 		"$pkgdir"/etc/profile.d/00-udev-v4l-hack.sh
 }
 
-sha512sums="61c2309f551ae558387deea13b30d13e3a49af36b10c981e2b498d43f9c094e6821275613b977ade22137b057248112fa71215f696977cd78a076c18d35c430f  deviceinfo
+sha512sums="62023e5656ed6421706dc213a537d1084e2995d8d0d978c2810badc4309f334c25f465ec7fd100cbc7c1e4548fc270aeb87aa0e71a505c3af5fc1f48109bc376  deviceinfo
 8b6034c0338ab4c7d648f47983aad6da07e427e7dba47baabf85a1b3ddeeda47c8d7fbcd547a302c9a759b2943ee30d3e82c3b368d8582833a058e4671638a9e  90-android-touch-dev.rules
 281937447a73c18e8eec195cbf485fcd513aec20b8df559c26b89fbefa5872c41865cba2440e2cc8a9cc76801bca9ab61f9562c536c6f5f10c925e3ca7f372f3  fb-workaround.sh
 4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1  udev-v4l-hack.sh"
diff --git a/aports/device/device-sony-yuga/deviceinfo b/aports/device/device-sony-yuga/deviceinfo
index 599640c0..4765c6b9 100644
--- a/aports/device/device-sony-yuga/deviceinfo
+++ b/aports/device/device-sony-yuga/deviceinfo
@@ -11,7 +11,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 deviceinfo_generate_bootimg="true"
 
diff --git a/aports/device/device-t2m-flame/APKBUILD b/aports/device/device-t2m-flame/APKBUILD
index 0bda7dd9..be0d3414 100644
--- a/aports/device/device-t2m-flame/APKBUILD
+++ b/aports/device/device-t2m-flame/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-t2m-flame
 pkgver=1
-pkgrel=6
+pkgrel=7
 pkgdesc="Mozilla Flame"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -25,7 +25,7 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
-sha512sums="55be27dc159d09931ad5fee519292db21df38180e557ad913339030be41423e107e2848e7374204b19872e1a160168690c1800047556ae1b0ca5a03c396aa318  deviceinfo
+sha512sums="2a674961778b4f9fc5d7fb5186d2fa958ba3659743279f887cbe3008ad7889ff9d9485583637e652b86f94f469bcd0927814c21bc9373228cde97a4f8ffc15e6  deviceinfo
 25256120a19cba6b6f9ae0cda7b2c8c84d168a6457e82afee438d50d2c28b9598bfe690301c15156d866b77cd87652d9b7cc3d9b0637f69414aae09fec159c91  90-android-touch-dev.rules
 4f321242005b4da012322a8e9bce14a3734281d6ab410f60e7c9c28a6df905876ccce65c3b914233f351118718ccd81b9be41724ee2099ca36d40b4cfff46b93  weston.ini
 0a301a723f2a6ad8285fa8c016a73b0d05ae9811a8c96cd73f6db274e85676f7b3d427ede46484665fd613b67ef42330f0b69413328c04c3f489db86c5aa9038  device-t2m-flame.post-install"
diff --git a/aports/device/device-t2m-flame/deviceinfo b/aports/device/device-t2m-flame/deviceinfo
index e42a0f11..11a81206 100644
--- a/aports/device/device-t2m-flame/deviceinfo
+++ b/aports/device/device-t2m-flame/deviceinfo
@@ -9,7 +9,7 @@ deviceinfo_modules=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="true"
 deviceinfo_external_disk_install="true"
-deviceinfo_flash_methods="fastboot"
+deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 
 deviceinfo_screen_width="480"
diff --git a/aports/device/device-wiko-lenny3/APKBUILD b/aports/device/device-wiko-lenny3/APKBUILD
index 4292bec8..7597fa1c 100644
--- a/aports/device/device-wiko-lenny3/APKBUILD
+++ b/aports/device/device-wiko-lenny3/APKBUILD
@@ -1,7 +1,7 @@
 pkgname="device-wiko-lenny3"
 pkgdesc="Lenny 3"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
@@ -14,4 +14,4 @@ package() {
 		"$pkgdir"/etc/deviceinfo
 }
 
-sha512sums="caf71c039f3d1244a0c2305fba718bf629d9a3402d08c55929184b8ead49b9ce16c01dd1efc8ff4e62cb6c1ea9b39f4f212546e022c4b48ab620a9a083cc68ef  deviceinfo"
+sha512sums="fd4abeb2308210f498be77adec0a5eef39edeb38996199944ce45fd877b81f478fa5ffb9ac4994797e239571efa399902a4587255768e0910faf55b2dace4ddc  deviceinfo"
diff --git a/aports/device/device-wiko-lenny3/deviceinfo b/aports/device/device-wiko-lenny3/deviceinfo
index 71eebeac..9a608106 100644
--- a/aports/device/device-wiko-lenny3/deviceinfo
+++ b/aports/device/device-wiko-lenny3/deviceinfo
@@ -18,7 +18,7 @@ deviceinfo_screen_height="1280"
 deviceinfo_dev_touchscreen="/dev/input/event5"
 
 # Bootloader related
-deviceinfo_flash_methods="sp-flash-tool"
+deviceinfo_flash_method="sp-flash-tool"
 deviceinfo_kernel_cmdline="bootopt=64S3,32S1,32S1"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
diff --git a/aports/main/postmarketos-update-kernel/APKBUILD b/aports/main/postmarketos-update-kernel/APKBUILD
index 85cd0b57..7c11ca2c 100644
--- a/aports/main/postmarketos-update-kernel/APKBUILD
+++ b/aports/main/postmarketos-update-kernel/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=postmarketos-update-kernel
-pkgver=0.0.2
+pkgver=0.0.3
 pkgrel=0
 pkgdesc="kernel updater script for postmarketOS"
 url="https://github.com/postmarketOS"
@@ -12,4 +12,4 @@ package() {
 	install -Dm755 "$srcdir/update-kernel.sh" \
 		"$pkgdir/sbin/pmos-update-kernel"
 }
-sha512sums="17fa14327622fcdefa335fccfeac33623a8cf3cb93e6ad833631990f3c88757e81d6eb3b02f0a69177c518b8f45f249e8b9709fe3eb5126a7322da5f7700becb  update-kernel.sh"
+sha512sums="6ff38c0d0a3b37b052c2cc1be61294079dd5c17e3b1b348f7b9865e83cf6b635fb192128d8a10a86c97ea708e73288ec3c5b3335348ff279ff4b8cace67c4c31  update-kernel.sh"
diff --git a/aports/main/postmarketos-update-kernel/update-kernel.sh b/aports/main/postmarketos-update-kernel/update-kernel.sh
index 8ce79bc4..bddde4d5 100755
--- a/aports/main/postmarketos-update-kernel/update-kernel.sh
+++ b/aports/main/postmarketos-update-kernel/update-kernel.sh
@@ -13,7 +13,7 @@ esac
 . /etc/deviceinfo
 
 FLAVOR=$1
-METHOD=${deviceinfo_flash_methods:?}
+METHOD=${deviceinfo_flash_method:?}
 case $METHOD in
 	fastboot|heimdall-bootimg)
 		BOOT_PARTITION=$(findfs PARTLABEL="boot")
diff --git a/pmb/aportgen/device.py b/pmb/aportgen/device.py
index 3d5a5dde..172e6abf 100644
--- a/pmb/aportgen/device.py
+++ b/pmb/aportgen/device.py
@@ -144,7 +144,7 @@ def generate_deviceinfo(args, pkgname, name, manufacturer, arch, has_keyboard,
         deviceinfo_dev_keyboard=""
 
         # Bootloader related
-        deviceinfo_flash_methods=\"""" + flash_method + """\"
+        deviceinfo_flash_method=\"""" + flash_method + """\"
         """
 
     content_heimdall_bootimg = """\
diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py
index f506910e..c0989c68 100644
--- a/pmb/config/__init__.py
+++ b/pmb/config/__init__.py
@@ -217,7 +217,7 @@ deviceinfo_attributes = [
     "modules_initfs",
     "external_disk",
     "external_disk_install",
-    "flash_methods",
+    "flash_method",
     "arch",
 
     # flash
diff --git a/pmb/export/odin.py b/pmb/export/odin.py
index 0210be60..c6a48708 100644
--- a/pmb/export/odin.py
+++ b/pmb/export/odin.py
@@ -34,7 +34,7 @@ def odin(args, flavor, folder):
     suffix = "rootfs_" + args.device
 
     # Validate method
-    method = args.deviceinfo["flash_methods"]
+    method = args.deviceinfo["flash_method"]
     if not method.startswith("heimdall-"):
         raise RuntimeError("An odin flashable tar is not supported for the flash"
                            " method '" + method + "' specified in the current configuration."
diff --git a/pmb/flasher/frontend.py b/pmb/flasher/frontend.py
index 0f2fb97f..b9067699 100644
--- a/pmb/flasher/frontend.py
+++ b/pmb/flasher/frontend.py
@@ -68,7 +68,7 @@ def system(args):
                            " please run 'pmbootstrap install' first.")
 
     # Do not flash if using fastboot & image is too large
-    method = args.flash_method or args.deviceinfo["flash_methods"]
+    method = args.flash_method or args.deviceinfo["flash_method"]
     if method == "fastboot" and args.deviceinfo["flash_fastboot_max_size"]:
         img_size = os.path.getsize(args.work + "/chroot_native" + img_path) / 1024**2
         max_size = int(args.deviceinfo["flash_fastboot_max_size"])
@@ -86,7 +86,7 @@ def list_devices(args):
 
 
 def sideload(args):
-    method = args.flash_method or args.deviceinfo["flash_methods"]
+    method = args.flash_method or args.deviceinfo["flash_method"]
     cfg = pmb.config.flashers[method]
 
     # Install depends
@@ -112,7 +112,7 @@ def sideload(args):
 
 def frontend(args):
     action = args.action_flasher
-    method = args.flash_method or args.deviceinfo["flash_methods"]
+    method = args.flash_method or args.deviceinfo["flash_method"]
 
     if method == "none" and action in ["boot", "flash_kernel", "flash_system"]:
         logging.info("This device doesn't support any flash method.")
diff --git a/pmb/flasher/init.py b/pmb/flasher/init.py
index 6b1aba12..6efc100e 100644
--- a/pmb/flasher/init.py
+++ b/pmb/flasher/init.py
@@ -23,7 +23,7 @@ import pmb.helpers.mount
 
 def init(args):
     # Validate method
-    method = args.deviceinfo["flash_methods"]
+    method = args.deviceinfo["flash_method"]
     if method not in pmb.config.flashers:
         raise RuntimeError("Flash method " + method + " is not supported by the"
                            " current configuration. However, adding a new flash method is "
diff --git a/pmb/flasher/run.py b/pmb/flasher/run.py
index 24d3b6e1..446a6f07 100644
--- a/pmb/flasher/run.py
+++ b/pmb/flasher/run.py
@@ -24,7 +24,7 @@ def run(args, action, flavor=None):
     pmb.flasher.init(args)
 
     # Verify action
-    method = args.flash_method or args.deviceinfo["flash_methods"]
+    method = args.flash_method or args.deviceinfo["flash_method"]
     cfg = pmb.config.flashers[method]
     if action not in cfg["actions"]:
         raise RuntimeError("action " + action + " is not"
diff --git a/pmb/install/install.py b/pmb/install/install.py
index e93caeac..949a50b5 100644
--- a/pmb/install/install.py
+++ b/pmb/install/install.py
@@ -236,7 +236,7 @@ def install_system_image(args):
     logging.info("  Flashes the kernel + initramfs to your device:")
     logging.info("  " + args.work + "/chroot_rootfs_" + args.device +
                  "/boot")
-    method = args.deviceinfo["flash_methods"]
+    method = args.deviceinfo["flash_method"]
     if (method in pmb.config.flashers and "boot" in
             pmb.config.flashers[method]["actions"]):
         logging.info("  (NOTE: " + method + " also supports booting"
diff --git a/pmb/install/recovery.py b/pmb/install/recovery.py
index f2b2dd4f..487ce0d7 100644
--- a/pmb/install/recovery.py
+++ b/pmb/install/recovery.py
@@ -30,7 +30,7 @@ def create_zip(args, suffix):
     zip_root = "/var/lib/postmarketos-android-recovery-installer/"
     rootfs = "/mnt/rootfs_" + args.device
     flavor = pmb.helpers.frontend._parse_flavor(args)
-    method = args.deviceinfo["flash_methods"]
+    method = args.deviceinfo["flash_method"]
     vars = pmb.flasher.variables(args, flavor, method)
 
     # Install recovery installer package in buildroot
diff --git a/pmb/parse/deviceinfo.py b/pmb/parse/deviceinfo.py
index bc27eea7..19fe29ed 100644
--- a/pmb/parse/deviceinfo.py
+++ b/pmb/parse/deviceinfo.py
@@ -60,4 +60,10 @@ def deviceinfo(args, device=None):
         if key not in ret:
             ret[key] = ""
 
+    # Sanity check: "flash_methods" is legacy
+    if "flash_methods" in ret:
+        raise RuntimeError("deviceinfo_flash_methods has been renamed to"
+                           " deviceinfo_flash_method. Please adjust your"
+                           " deviceinfo file: " + path)
+
     return ret
diff --git a/test/test_aportgen_device_wizard.py b/test/test_aportgen_device_wizard.py
index 78f7d9ca..8d0b8f05 100644
--- a/test/test_aportgen_device_wizard.py
+++ b/test/test_aportgen_device_wizard.py
@@ -125,7 +125,7 @@ def test_aportgen_device_wizard(args, monkeypatch):
     assert deviceinfo["arch"] == "armhf"
     assert deviceinfo["keyboard"] == "false"
     assert deviceinfo["external_disk"] == "true"
-    assert deviceinfo["flash_methods"] == "heimdall-isorec"
+    assert deviceinfo["flash_method"] == "heimdall-isorec"
     assert deviceinfo["generate_bootimg"] == ""
     assert deviceinfo["generate_legacy_uboot_initfs"] == ""
 
@@ -147,7 +147,7 @@ def test_aportgen_device_wizard(args, monkeypatch):
     answers["Path"] = ""
     deviceinfo, apkbuild, apkbuild_linux = generate(args, monkeypatch, answers)
     assert apkbuild["depends"] == ["linux-testsuite-testdevice", "mkbootimg"]
-    assert deviceinfo["flash_methods"] == answers["Flash method"]
+    assert deviceinfo["flash_method"] == answers["Flash method"]
     assert deviceinfo["generate_bootimg"] == "true"
 
     # 0xffff (legacy uboot initfs)
diff --git a/test/test_aports_deviceinfo.py b/test/test_aports_deviceinfo.py
new file mode 100644
index 00000000..dfb6d0c9
--- /dev/null
+++ b/test/test_aports_deviceinfo.py
@@ -0,0 +1,50 @@
+"""
+Copyright 2017 Oliver Smith
+
+This file is part of pmbootstrap.
+
+pmbootstrap is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pmbootstrap is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with pmbootstrap.  If not, see <http://www.gnu.org/licenses/>.
+"""
+import os
+import sys
+import glob
+import pytest
+
+# Import from parent directory
+pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
+sys.path.append(pmb_src)
+import pmb.parse.apkindex
+import pmb.parse.apkbuild
+import pmb.helpers.logging
+
+
+@pytest.fixture
+def args(request):
+    import pmb.parse
+    sys.argv = ["pmbootstrap.py", "chroot"]
+    args = pmb.parse.arguments()
+    args.log = args.work + "/log_testsuite.txt"
+    pmb.helpers.logging.init(args)
+    request.addfinalizer(args.logfd.close)
+    return args
+
+
+def test_deviceinfo(args):
+    """
+    Parse all deviceinfo files. When no exception gets raised, we're good.
+    """
+    for folder in glob.glob(args.aports + "/device/device-*"):
+        device = folder.split("-", 1)[1]
+        print(device)
+        pmb.parse.deviceinfo(args, device)