diff --git a/device/testing/device-asus-sparrow/APKBUILD b/device/testing/device-asus-sparrow/APKBUILD
index 5ba867e85..028d098aa 100644
--- a/device/testing/device-asus-sparrow/APKBUILD
+++ b/device/testing/device-asus-sparrow/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-asus-sparrow
 pkgdesc="ASUS ZenWatch 2"
-pkgver=1
-pkgrel=3
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -46,5 +46,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-8ab382e2c83d0d1014f9c77cf580f37c354329da9ec10511ce6db635489037cf62f941ce6ca00814548513fe13c490cdf18cc4731a0afa3ef26135351519ffe0  deviceinfo
+4602de536a4fdf37338302be92a6fbe2c5b7ac7c5a526c953e3d174ec54e276794854e3c1f1cd236f6314cc5fc26da932225d12be32c449ce999aa883a44952d  deviceinfo
 "
diff --git a/device/testing/device-asus-sparrow/deviceinfo b/device/testing/device-asus-sparrow/deviceinfo
index 6f563c3df..e5fcca20a 100644
--- a/device/testing/device-asus-sparrow/deviceinfo
+++ b/device/testing/device-asus-sparrow/deviceinfo
@@ -24,6 +24,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline_mainline="maxcpus=1"
 deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=sparrow user_debug=31 maxcpus=4 msm_rtb.filter=0x3F"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
diff --git a/device/testing/device-htc-memul/APKBUILD b/device/testing/device-htc-memul/APKBUILD
index c2acf9189..7490b959d 100644
--- a/device/testing/device-htc-memul/APKBUILD
+++ b/device/testing/device-htc-memul/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-htc-memul
 pkgdesc="HTC One Mini 2"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -54,7 +54,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-29594cfc61a16e92a5a22cc65ee316ecb1da7a1f4493e15626cc5059a843f5e11965e02d89616784b5edb95dc5cd531ef4028610b4ee700840a58e7de1254351  deviceinfo
+5917cf95d3a8aec92590d7634858fa9fb0b10ea5eb0cc5cbed71d1577ff77de543339c8d43e06d24583d78d4e46f3881f2239ef12db2ae62b820cec2f6803d7b  deviceinfo
 765abaad5fda0dfda5e62e1e48414d3eea822198f39d0792171a04d73f86f6273a6e562afab430cbfcdd084412568a0ad03d012e9c40c5564f5cd1b9c0f181eb  initfs-hook.sh
 9ebe6ca9e371b5091e4e47ecbe3ec0c72d055e4bc2281880119eb0dee4c56b71f20f7d3cf1f1cb62e6814604e745fb17bbbfcfed2fec42398871e50b17685533  modules-initfs.mainline
 "
diff --git a/device/testing/device-htc-memul/deviceinfo b/device/testing/device-htc-memul/deviceinfo
index 2be8710e2..2bd35dfb0 100644
--- a/device/testing/device-htc-memul/deviceinfo
+++ b/device/testing/device-htc-memul/deviceinfo
@@ -23,6 +23,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline_mainline="msm.allow_vram_carveout=1"
 deviceinfo_kernel_cmdline_downstream="console=none androidboot.hardware=qcom user_debug=31 ehci-hcd.park=3 zcache buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt_downstream="true"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
diff --git a/device/testing/device-huawei-sturgeon/APKBUILD b/device/testing/device-huawei-sturgeon/APKBUILD
index 626efc0cc..507f3c76c 100644
--- a/device/testing/device-huawei-sturgeon/APKBUILD
+++ b/device/testing/device-huawei-sturgeon/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-huawei-sturgeon
 pkgdesc="Huawei Watch"
-pkgver=1
-pkgrel=4
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -52,6 +52,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-7b0067ccb44d6c7db971fe40e654e898be5faab3233dc65a8a6a20043c89c26106bc94704d5fa77c51da06b3f32c01b5e89a17a7ff39300d7678a86838706319  deviceinfo
+37eecfb41db305882acb599afee61c9b067816780716e3615dda0cbfd5a72a335cc09f5acb14504178a946d26e37531b9569d4296749235864711fb6eea1da94  deviceinfo
 a19923f30ac1d328a85ab1162e44442da28dd1ae45529fb73e21d8004594487f61c8f5372e5bbaadfefd27fe27c8a22ce430b81891ac1965e5704bbfec108b82  networkmanager.conf
 "
diff --git a/device/testing/device-huawei-sturgeon/deviceinfo b/device/testing/device-huawei-sturgeon/deviceinfo
index dde6b6970..6499e1eaf 100644
--- a/device/testing/device-huawei-sturgeon/deviceinfo
+++ b/device/testing/device-huawei-sturgeon/deviceinfo
@@ -24,6 +24,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline_mainline="maxcpus=1"
 deviceinfo_kernel_cmdline_downstream="androidboot.hardware=sturgeon user_debug=31 maxcpus=4 msm_rtb.filter=0x3F pm_levels.sleep_disabled=1 selinux=0"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
diff --git a/device/testing/device-lg-lenok/APKBUILD b/device/testing/device-lg-lenok/APKBUILD
index aeb72303a..5fe49a70a 100644
--- a/device/testing/device-lg-lenok/APKBUILD
+++ b/device/testing/device-lg-lenok/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-lenok
 pkgdesc="LG G Watch R"
-pkgver=3
-pkgrel=3
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -68,7 +68,7 @@ nonfree_firmware() {
 
 sha512sums="
 a36ba9017df3b4be233783096c303abafa873dcdf50f6357b82f3c5526fd161a1914dafe143377cb5982955108b987890638b51911d0dd339172554e39a82d9f  90-android-touch-dev.rules
-259ee3aeb023d811aba1cfea23011c683cd7f062ed2bf841a1cf68850b035b49dcc91d846e1ddaaf48eeeeb3ef900ebe426212d3b6c0af349c33bd1cde544fe1  deviceinfo
+eefa3337f1f1f1b6e2e3b22b4321f368736fc3ef4ca38729d400c84d433a5d33b091298e7ac272b9005f5b564f2123448c8b436ed37e1d4be76a3f934818cc92  deviceinfo
 1fc5a7609d8f79f74f29d55ce492dc6b77bb247da1b79abc1361e5e9072b5283816cef02c4cc283300031d708733c5fdbed94f539ae1c16b1dca96bf4d512234  fb_fix.sh
 d29105805adcd79d4f73c2f2c4483a2c627dc7b70acb77f43d085742ef930407c9b1423f7020c34f38e8a09f40cadd991b9acae23e936c90d6a4c0900250da22  initfs-hook.sh
 81cf2c20d2efa0f71f18116efeda11ae4f18fee96ba998dc4d6a36205626dce496cb36711af5c4e3215578b174942e721290cfcff8db6fb1c998b90b7345244d  machine.conf
diff --git a/device/testing/device-lg-lenok/deviceinfo b/device/testing/device-lg-lenok/deviceinfo
index cccce3c0b..924362fa6 100644
--- a/device/testing/device-lg-lenok/deviceinfo
+++ b/device/testing/device-lg-lenok/deviceinfo
@@ -22,6 +22,7 @@ deviceinfo_flash_method="fastboot"
 # limit to single-core until we have cpufreq to avoid fast overheating
 deviceinfo_kernel_cmdline_mainline="maxcpus=1 msm.allow_vram_carveout=1 video=320x320,reflect_y"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_kernel="0x0000000"
 deviceinfo_flash_offset_ramdisk="0x02000000"
diff --git a/device/testing/device-motorola-peregrine/APKBUILD b/device/testing/device-motorola-peregrine/APKBUILD
index acf4f8da4..582ca243f 100644
--- a/device/testing/device-motorola-peregrine/APKBUILD
+++ b/device/testing/device-motorola-peregrine/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-peregrine
 pkgdesc="Moto G 4G (2013)"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -58,7 +58,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-7ab781baeaae9dc8a87d52943c16f3875d290db0bd0855cbeccbfd45b08a98eab3f1f4071399cecd9bfd570fbcdb4f954a9c9b173f633e77458506e9e7ec3149  deviceinfo
+80b37878e8468fc5002364da68bc7eb18d711c710d9ee8cae0ccd838a61643f79ae49d2875a0abffda78953474a7ca8da3ed1373b09ec66bfff926e5447a160a  deviceinfo
 f86ef35730b89bcc8160c08db7a7fcd0970adf60c0b77af68bac397de49c0d1783e6b8db1762380c9bf874aff2d030c6f44ecb75c803d69e79ede11376409369  xorg.conf
 01b3f81f77732b7bc32e01e1c242a30f03b7c02da3aa830e3eb21b6f10458616cc8752d532405c66cd54f488c53962cf1901ebe30019ddcd572ea13445e6d28b  modules-initfs.mainline
 "
diff --git a/device/testing/device-motorola-peregrine/deviceinfo b/device/testing/device-motorola-peregrine/deviceinfo
index 6e426f5e2..f1a15dffd 100644
--- a/device/testing/device-motorola-peregrine/deviceinfo
+++ b/device/testing/device-motorola-peregrine/deviceinfo
@@ -22,6 +22,7 @@ deviceinfo_dev_touchscreen="/dev/input/event3"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline_downstream="androidboot.bootdevice=msm_sdcc.1 androidboot.hardware=qcom vmalloc=400M androidboot.selinux=permissive"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt_downstream="true"
 deviceinfo_flash_offset_base="0x10000000"
 deviceinfo_flash_offset_kernel="0x00008000"
diff --git a/device/testing/device-samsung-matisselte/APKBUILD b/device/testing/device-samsung-matisselte/APKBUILD
index 77ec7f854..1cd11d93c 100644
--- a/device/testing/device-samsung-matisselte/APKBUILD
+++ b/device/testing/device-samsung-matisselte/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-matisselte
 pkgdesc="Samsung Galaxy Tab 4 10.1 LTE"
-pkgver=1
-pkgrel=2
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,5 +21,5 @@ package() {
 
 
 sha512sums="
-8da1ac7d40d28d311e8f704f0d12985e593bff98272323e1c5e62744057aa707b7831a1a42aa73fa0d0423ba223a9d2849e8133e883af98ca7ff470f499da90a  deviceinfo
+0a484a9e6db6ae9c4efda71a40671f3f19ecb8ddf77f684126d5d0943b6be626a7e8b8566fd21abf7006b821f8b77ab55be039cd456795fb9e4b19b063288705  deviceinfo
 "
diff --git a/device/testing/device-samsung-matisselte/deviceinfo b/device/testing/device-samsung-matisselte/deviceinfo
index 92b3d798f..c75f1ee30 100644
--- a/device/testing/device-samsung-matisselte/deviceinfo
+++ b/device/testing/device-samsung-matisselte/deviceinfo
@@ -25,6 +25,7 @@ deviceinfo_no_framebuffer="true"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
diff --git a/device/testing/device-samsung-milletwifi/APKBUILD b/device/testing/device-samsung-milletwifi/APKBUILD
index 1bca61b0c..114b4dbca 100644
--- a/device/testing/device-samsung-milletwifi/APKBUILD
+++ b/device/testing/device-samsung-milletwifi/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-milletwifi
 pkgdesc="Samsung Galaxy Tab 4 8.0 Wi-Fi"
-pkgver=1
-pkgrel=3
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -27,6 +27,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-7f18715d199734594523319384ca5458a9ae54fff55db8337d6d74b1678695cd9db8a75666c22b41922a05e4af479d938ee53137d02fcd7fd5df3637527a8018  deviceinfo
+2eae9739d0a4278189e045aea21b2ad43a5b6d5f9c2fc16142063ba875e22d290b8b1dde5ad4f4a5d011ec3ef68b13646f8a5694db3c5cb7da3c9edd119d338e  deviceinfo
 566fbcbd958c465fa546068095c51678b6635a247dd7ef1d6c7f4c5fd527a21f41ed4daf8f63a1342433f150d3437b102e523bfa63d17ff64a0ebe48eb7b9ae6  modules-initfs
 "
diff --git a/device/testing/device-samsung-milletwifi/deviceinfo b/device/testing/device-samsung-milletwifi/deviceinfo
index 3f96fe921..e621cdb24 100644
--- a/device/testing/device-samsung-milletwifi/deviceinfo
+++ b/device/testing/device-samsung-milletwifi/deviceinfo
@@ -21,6 +21,7 @@ deviceinfo_screen_height="1280"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="msm.allow_vram_carveout=1 clk_ignore_unused pd_ignore_unused"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"