From 14e234264f331cdd1005eb999849320cb7234e19 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@bitmessage.ch>
Date: Tue, 24 Apr 2018 21:09:53 +0000
Subject: [PATCH] msm-fb-refresher: use initfs hook (#1438)
The `msm-fb-refresher` updates the screen for msm based devices. It is
not needed for all devices, so we had some extra code in the initramfs,
that would only add it when the `deviceinfo_msm_refresher` variable was
set. However, we are able now to add files to initramfs hooks, so this
hack can be removed and simplify everything.
Changes:
* Remove `deviceinfo_msm_refresher` from all deviceinfos
* Add sanity check for it
* Move all `deviceinfo` sanity checks to an extra function
* `postmarketos-mkinitfs`: remove code for msm refresher
* `msm-fb-refresher`: add initramfs hook
---
aports/device/device-amazon-thor/APKBUILD | 4 +--
aports/device/device-amazon-thor/deviceinfo | 1 -
aports/device/device-gp-peak/APKBUILD | 4 +--
aports/device/device-gp-peak/deviceinfo | 1 -
aports/device/device-htc-a5ul/APKBUILD | 4 +--
aports/device/device-htc-a5ul/deviceinfo | 1 -
aports/device/device-htc-m8/APKBUILD | 4 +--
aports/device/device-htc-m8/deviceinfo | 1 -
aports/device/device-htc-vivo/APKBUILD | 4 +--
aports/device/device-htc-vivo/deviceinfo | 1 -
aports/device/device-huawei-angler/APKBUILD | 4 +--
aports/device/device-huawei-angler/deviceinfo | 1 -
aports/device/device-jolla-sbj/APKBUILD | 4 +--
aports/device/device-jolla-sbj/deviceinfo | 1 -
aports/device/device-leeco-s2/APKBUILD | 4 +--
aports/device/device-leeco-s2/deviceinfo | 1 -
aports/device/device-lg-bullhead/APKBUILD | 4 +--
aports/device/device-lg-bullhead/deviceinfo | 1 -
aports/device/device-lg-d285/APKBUILD | 4 +--
aports/device/device-lg-d285/deviceinfo | 1 -
aports/device/device-lg-dory/APKBUILD | 4 +--
aports/device/device-lg-dory/deviceinfo | 1 -
aports/device/device-lg-h815/APKBUILD | 4 +--
aports/device/device-lg-h815/deviceinfo | 1 -
aports/device/device-lg-hammerhead/APKBUILD | 4 +--
aports/device/device-lg-hammerhead/deviceinfo | 3 --
aports/device/device-motorola-athene/APKBUILD | 4 +--
.../device/device-motorola-athene/deviceinfo | 1 -
aports/device/device-motorola-falcon/APKBUILD | 4 +--
.../device/device-motorola-falcon/deviceinfo | 1 -
aports/device/device-motorola-harpia/APKBUILD | 4 +--
.../device/device-motorola-harpia/deviceinfo | 1 -
.../device/device-motorola-peregrine/APKBUILD | 4 +--
.../device-motorola-peregrine/deviceinfo | 1 -
aports/device/device-motorola-potter/APKBUILD | 4 +--
.../device/device-motorola-potter/deviceinfo | 1 -
aports/device/device-motorola-shamu/APKBUILD | 4 +--
.../device/device-motorola-shamu/deviceinfo | 1 -
aports/device/device-motorola-titan/APKBUILD | 4 +--
.../device/device-motorola-titan/deviceinfo | 1 -
aports/device/device-nextbit-robin/APKBUILD | 4 +--
aports/device/device-nextbit-robin/deviceinfo | 1 -
.../device/device-oneplus-oneplus2/APKBUILD | 4 +--
.../device/device-oneplus-oneplus2/deviceinfo | 1 -
aports/device/device-oneplus-onyx/APKBUILD | 4 +--
aports/device/device-oneplus-onyx/deviceinfo | 1 -
aports/device/device-samsung-klte/APKBUILD | 4 +--
aports/device/device-samsung-klte/deviceinfo | 1 -
.../device/device-samsung-kylessopen/APKBUILD | 4 +--
.../device-samsung-kylessopen/deviceinfo | 1 -
aports/device/device-semc-anzu/APKBUILD | 4 +--
aports/device/device-semc-anzu/deviceinfo | 1 -
aports/device/device-sony-honami/APKBUILD | 4 +--
aports/device/device-sony-honami/deviceinfo | 1 -
aports/device/device-sony-scorpion/APKBUILD | 4 +--
aports/device/device-sony-scorpion/deviceinfo | 1 -
aports/device/device-xiaomi-armani/APKBUILD | 2 +-
aports/device/device-xiaomi-armani/deviceinfo | 1 -
aports/device/device-xiaomi-santoni/APKBUILD | 4 +--
.../device/device-xiaomi-santoni/deviceinfo | 1 -
.../00-msm-fb-refresher.files | 1 +
.../msm-fb-refresher/00-msm-fb-refresher.sh | 2 ++
aports/main/msm-fb-refresher/APKBUILD | 16 +++++++--
aports/main/postmarketos-mkinitfs/APKBUILD | 8 ++---
aports/main/postmarketos-mkinitfs/init.sh.in | 3 --
.../postmarketos-mkinitfs/init_functions.sh | 7 ----
aports/main/postmarketos-mkinitfs/mkinitfs.sh | 9 -----
pmb/parse/deviceinfo.py | 36 ++++++++++++-------
68 files changed, 103 insertions(+), 129 deletions(-)
create mode 100755 aports/main/msm-fb-refresher/00-msm-fb-refresher.files
create mode 100755 aports/main/msm-fb-refresher/00-msm-fb-refresher.sh
diff --git a/aports/device/device-amazon-thor/APKBUILD b/aports/device/device-amazon-thor/APKBUILD
index 7f54518d2..deb06216f 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=6
+pkgrel=7
pkgdesc="Amazon KFHDX 7inch 2013"
url="https://github.com/postmarketOS"
arch="noarch"
@@ -25,6 +25,6 @@ package() {
"$pkgdir"/etc/fb.modes
}
-sha512sums="03e9e2f3e772bc5678bbd9ffa98ada51a16faa6f1dc7c4ab7aac70b3b788c5bae7a03550666fc9147852112ffdd031c1fcbb2bed6c792ec8a3ac027d5c330b51 deviceinfo
+sha512sums="72f3e47ae416b625d0c82d0450dc3260675978ba3817fd6a157bcae8caacd6ea86364f525a11297bf6d4909846eecbff256119af940cffac99bcf7aa9abb1788 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 b67f0a3ca..8cd57e23a 100755
--- a/aports/device/device-amazon-thor/deviceinfo
+++ b/aports/device/device-amazon-thor/deviceinfo
@@ -18,7 +18,6 @@ deviceinfo_screen_width="1200"
deviceinfo_screen_height="1920"
deviceinfo_dev_touchscreen="/dev/input/event0"
deviceinfo_weston_pixman_type="2"
-deviceinfo_msm_refresher="true"
# Kernel related
deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 buildvariant=userdebug"
diff --git a/aports/device/device-gp-peak/APKBUILD b/aports/device/device-gp-peak/APKBUILD
index 9ead9e5db..8d5e9c68c 100644
--- a/aports/device/device-gp-peak/APKBUILD
+++ b/aports/device/device-gp-peak/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-gp-peak"
pkgdesc="Geeksphone Peak"
pkgver=0.1
-pkgrel=4
+pkgrel=5
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -26,6 +26,6 @@ package() {
install -Dm644 "$srcdir"/fb.modes "$pkgdir"/etc/fb.modes
}
-sha512sums="4838a21f37b722fa57ea3f77575f00742003b79a4eb093701a19ee817f591dbde571289175c51227ba96f8e66117c8a4fb37ed92c379530d42083714214ac674 deviceinfo
+sha512sums="c6680d1fc55e91a698404c4f92485b7ec86b743a907fdbc256accf37ac3b978c6cac7001b8b8a0982ffee4ad349bbe240f7235e42d89020098fa92eb80acde0a deviceinfo
b77fc5191c07bf2b6a5bf5e702351f8de024a6f15d3726c88da1ab2e3d8185cbb468acbea533d07bf595855d53ab8bcd3a48fd9f35d55b78981f1ae23d44bbd8 device-gp-peak.start
3a2c1c53ec67d40639920ace68ebf13ecff5966a8f94a603f625e01e5f403178c511c21c6de841837e256b714045e7c90cc0cb62537a9f0a536ad4b390f9c3c3 fb.modes"
diff --git a/aports/device/device-gp-peak/deviceinfo b/aports/device/device-gp-peak/deviceinfo
index 1a16fa233..341e706a8 100644
--- a/aports/device/device-gp-peak/deviceinfo
+++ b/aports/device/device-gp-peak/deviceinfo
@@ -17,7 +17,6 @@ deviceinfo_screen_height="960"
deviceinfo_dev_touchscreen=""
deviceinfo_dev_touchscreen_calibration=""
deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="true"
deviceinfo_weston_pixman_type="2"
deviceinfo_dev_touchscreen="/dev/input/event2"
diff --git a/aports/device/device-htc-a5ul/APKBUILD b/aports/device/device-htc-a5ul/APKBUILD
index 360d72df9..df44d8043 100644
--- a/aports/device/device-htc-a5ul/APKBUILD
+++ b/aports/device/device-htc-a5ul/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-htc-a5ul"
pkgdesc="hTC Desire 816"
pkgver=0.1
-pkgrel=0
+pkgrel=1
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -21,5 +21,5 @@ package() {
"$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh
}
-sha512sums="37348f3dc8241e7ffd4be55554bb1d4593d5affa5a9db90143b279002c30176d8cbac014891e7e823bc66a84de97d6214ca0e038dc45d5c7a203767f5f8fb463 deviceinfo
+sha512sums="f3a73742194b8fd64f7ea7190cfbc4428ed7e5be78be1de7d050ffc4da523a04b5aeb5dd78436f6a917880a033d0c266cb32399bff9526b34f5456a53bc823eb deviceinfo
765abaad5fda0dfda5e62e1e48414d3eea822198f39d0792171a04d73f86f6273a6e562afab430cbfcdd084412568a0ad03d012e9c40c5564f5cd1b9c0f181eb initfs-hook.sh"
diff --git a/aports/device/device-htc-a5ul/deviceinfo b/aports/device/device-htc-a5ul/deviceinfo
index ec45cf542..e42a8f365 100644
--- a/aports/device/device-htc-a5ul/deviceinfo
+++ b/aports/device/device-htc-a5ul/deviceinfo
@@ -8,7 +8,6 @@ deviceinfo_date=""
deviceinfo_dtb=""
deviceinfo_modules_initfs=""
deviceinfo_arch="armhf"
-deviceinfo_msm_refresher="true"
# Device related
deviceinfo_keyboard="false"
diff --git a/aports/device/device-htc-m8/APKBUILD b/aports/device/device-htc-m8/APKBUILD
index 16d3c0e42..7d0848caa 100644
--- a/aports/device/device-htc-m8/APKBUILD
+++ b/aports/device/device-htc-m8/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-htc-m8"
pkgdesc="HTC One M8"
pkgver=0.1
-pkgrel=0
+pkgrel=1
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -26,6 +26,6 @@ package() {
"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
}
-sha512sums="5bad059537b9c271111c6c023df89d523f596f0432a2b3da1f0843106a6a871c5d9df5445c5311a608d47b418f3e56e7985ae37a85c58ce46ba7b7f27cd8b2fb deviceinfo
+sha512sums="292364ef4b3f6f5132aad207a0e6e0664cba1fa981d714fa862d816bd19cd1141fbdb6f40b47aad34eb0a205a4979303913541a0889188523df274db64b8c4b7 deviceinfo
765abaad5fda0dfda5e62e1e48414d3eea822198f39d0792171a04d73f86f6273a6e562afab430cbfcdd084412568a0ad03d012e9c40c5564f5cd1b9c0f181eb initfs-hook.sh
f0f69ab3b5b3fed11ec5049f37c71c4e9dcf87dc1f238199a3917dd61957d46783a8798d63d400cc5d3983987e750e3fec6d7117561ad5005f28131ae4821d66 90-android-touch-dev.rules"
diff --git a/aports/device/device-htc-m8/deviceinfo b/aports/device/device-htc-m8/deviceinfo
index b92efe1eb..1605c1cf3 100644
--- a/aports/device/device-htc-m8/deviceinfo
+++ b/aports/device/device-htc-m8/deviceinfo
@@ -18,7 +18,6 @@ deviceinfo_screen_height="1920"
deviceinfo_dev_touchscreen=""
deviceinfo_dev_touchscreen_calibration=""
deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="true"
# Bootloader related
deviceinfo_flash_method="fastboot"
diff --git a/aports/device/device-htc-vivo/APKBUILD b/aports/device/device-htc-vivo/APKBUILD
index 139c7be93..5cfb5ea2f 100644
--- a/aports/device/device-htc-vivo/APKBUILD
+++ b/aports/device/device-htc-vivo/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-htc-vivo"
pkgdesc="Incredible S"
pkgver=1
-pkgrel=0
+pkgrel=1
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -21,5 +21,5 @@ package() {
"$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh
}
-sha512sums="3c53bb57a3f98bbf4686453c3120bbe45065e82591a9969370df7369dc91c79860c95bad768e1d5ff3827425f047358ecaf3c2054c22afc8bd6bf3b4f6e6692f deviceinfo
+sha512sums="17b9290a76ff0b892d720f65c2d05b91e54898e7cc4b68ddf244887c6da0bf07113053f0b2782bccd9a382e9aee73da78336158908ca53f6e6921069fb3d3e59 deviceinfo
2d02a02649ee3dc28041045086ffe11c9077067393954295343efb80727432902494da4c3b68f992880f3c0f01a9d164c2517f51519c92445e3ed88872a71e2f initfs-hook.sh"
diff --git a/aports/device/device-htc-vivo/deviceinfo b/aports/device/device-htc-vivo/deviceinfo
index ca809e050..f9ca1cd1e 100644
--- a/aports/device/device-htc-vivo/deviceinfo
+++ b/aports/device/device-htc-vivo/deviceinfo
@@ -8,7 +8,6 @@ deviceinfo_date=""
deviceinfo_dtb=""
deviceinfo_modules_initfs=""
deviceinfo_arch="armhf"
-deviceinfo_msm_refresher="true"
# Device related
deviceinfo_keyboard="false"
diff --git a/aports/device/device-huawei-angler/APKBUILD b/aports/device/device-huawei-angler/APKBUILD
index eb2de8bf4..d698c8676 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=11
+pkgrel=12
pkgdesc="Huawei Nexus 6P"
url="https://github.com/postmarketOS"
arch="noarch"
@@ -35,6 +35,6 @@ nonfree_firmware() {
mkdir "$subpkgdir"
}
-sha512sums="f68642145eea6006c4a141e29f0263f8e40f5c73612ce74d82356ce5a45c15ca67989d80bb6015e854935f46f0cc8fa07e21b2d612bb5e2989dbb98c537de51d deviceinfo
+sha512sums="ac6581bbe87103e79e4b75c886ba577a147af88a79ed084156963ed3397d544c0b301937c81c1debaf1c6d33992357b3aa0698bc04977ed752c15dbdae64c7b0 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 f630db644..6566ee940 100644
--- a/aports/device/device-huawei-angler/deviceinfo
+++ b/aports/device/device-huawei-angler/deviceinfo
@@ -12,7 +12,6 @@ deviceinfo_modules_initfs=""
deviceinfo_external_storage="false"
deviceinfo_flash_method="fastboot"
deviceinfo_arch="aarch64"
-deviceinfo_msm_refresher="true"
# Splash screen
deviceinfo_screen_width="1440"
diff --git a/aports/device/device-jolla-sbj/APKBUILD b/aports/device/device-jolla-sbj/APKBUILD
index 127bba04f..d21e1268c 100644
--- a/aports/device/device-jolla-sbj/APKBUILD
+++ b/aports/device/device-jolla-sbj/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-jolla-sbj"
pkgdesc="Jolla phone"
pkgver=0.1
-pkgrel=2
+pkgrel=3
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -19,4 +19,4 @@ package() {
devicepkg_package $startdir $pkgname
}
-sha512sums="9b697be458d6eb6c5823038e93b46c601d45313ef729f0bbc8d5d583ae76e58b82cb5b58997cbaea313d8ae63748293728274556a6d1ff32258a98a3b581adf6 deviceinfo"
+sha512sums="48cc790203cd79e1801d31ab27725b0917096b581f431fa3d1d67be5adece48201d35bc2ef82ed6835556d47405b0df674fd8acaf23f00f1a80b2eb18ac0fec9 deviceinfo"
diff --git a/aports/device/device-jolla-sbj/deviceinfo b/aports/device/device-jolla-sbj/deviceinfo
index 370943918..5b9ecbebb 100644
--- a/aports/device/device-jolla-sbj/deviceinfo
+++ b/aports/device/device-jolla-sbj/deviceinfo
@@ -17,7 +17,6 @@ deviceinfo_screen_height="960"
deviceinfo_dev_touchscreen="/dev/input/event0"
deviceinfo_dev_touchscreen_calibration=""
deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="true"
# Bootloader related
deviceinfo_flash_method="fastboot"
diff --git a/aports/device/device-leeco-s2/APKBUILD b/aports/device/device-leeco-s2/APKBUILD
index 7e6158b3e..06e603b92 100644
--- a/aports/device/device-leeco-s2/APKBUILD
+++ b/aports/device/device-leeco-s2/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-leeco-s2"
pkgdesc="LeEco Le 2"
pkgver=0.1
-pkgrel=4
+pkgrel=5
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -19,4 +19,4 @@ package() {
devicepkg_package $startdir $pkgname
}
-sha512sums="a1dc5a0d92b1e3ac683bdf62190172bdcf964990ce2efb326217bc23cf089fd74de27bcee4f0264ad07c45238ce09c92903aede77439d7a4c9b1f0fe2b0247a8 deviceinfo"
+sha512sums="558952381513e7886f26dc3f6b32324dda462e4beb62b43f53bae8213b53356807057ce87bc5174abd49efb76ed01a9d9a925b213ee54d016bdd2fa2133b6f83 deviceinfo"
diff --git a/aports/device/device-leeco-s2/deviceinfo b/aports/device/device-leeco-s2/deviceinfo
index 7c0d7fd66..00c9c3710 100644
--- a/aports/device/device-leeco-s2/deviceinfo
+++ b/aports/device/device-leeco-s2/deviceinfo
@@ -17,7 +17,6 @@ deviceinfo_screen_height="1080"
deviceinfo_dev_touchscreen=""
deviceinfo_dev_touchscreen_calibration=""
deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="true"
# Bootloader related
deviceinfo_flash_method="fastboot"
diff --git a/aports/device/device-lg-bullhead/APKBUILD b/aports/device/device-lg-bullhead/APKBUILD
index 73927e9cb..1c8a74336 100644
--- a/aports/device/device-lg-bullhead/APKBUILD
+++ b/aports/device/device-lg-bullhead/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-lg-bullhead"
pkgdesc="Google Nexus 5X"
pkgver=0.1
-pkgrel=2
+pkgrel=3
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -19,4 +19,4 @@ package() {
devicepkg_package $startdir $pkgname
}
-sha512sums="792233d772f12e14d6af9df612ede310e587d58ad4543cc7b0c0bcca42292f56cbf654a30c72db38e755c3ff03ce22f95d059c36185db08e76f7d57eb091b0ef deviceinfo"
+sha512sums="b0087bcd4d0f6167fc84413d54ce17cae56ff65a1ac0c89e2fd3da67bda2030b6b2370b307dea1eb5945e83da7172bd6c8f875031c8b979e54d46a27a86e1245 deviceinfo"
diff --git a/aports/device/device-lg-bullhead/deviceinfo b/aports/device/device-lg-bullhead/deviceinfo
index ffcc0404a..2a1768bc7 100644
--- a/aports/device/device-lg-bullhead/deviceinfo
+++ b/aports/device/device-lg-bullhead/deviceinfo
@@ -17,7 +17,6 @@ deviceinfo_screen_height="1920"
deviceinfo_dev_touchscreen="/dev/input/event0"
deviceinfo_dev_touchscreen_calibration=""
deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="true"
# Bootloader related
deviceinfo_flash_method="fastboot"
diff --git a/aports/device/device-lg-d285/APKBUILD b/aports/device/device-lg-d285/APKBUILD
index fe9d9f5d5..e46f655ff 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=5
+pkgrel=6
pkgdesc="LG L65"
url="https://github.com/postmarketOS"
arch="noarch"
@@ -25,6 +25,6 @@ package() {
"$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh
}
-sha512sums="c4d7826dd0ed3f55845273c03a43eb9a809be87306f03071fbab8936398cd347373fa80679631904164b8d7586b4955600416f5bf0a13b7ff14e098830160f2c deviceinfo
+sha512sums="08371290f50b6758fb3bb57ea9cdc372c0b1a965bb52304a0880748e5dd6465eddccaa4186142236ce9d49c32a14f92cb4940b0af7e33d5cc97814c2fb5e4b98 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 f380cb9bd..71a05e758 100644
--- a/aports/device/device-lg-d285/deviceinfo
+++ b/aports/device/device-lg-d285/deviceinfo
@@ -12,7 +12,6 @@ deviceinfo_modules_initfs=""
deviceinfo_external_storage="true"
deviceinfo_flash_method="fastboot"
deviceinfo_arch="armhf"
-deviceinfo_msm_refresher="true"
# Splash screen
deviceinfo_screen_width="480"
diff --git a/aports/device/device-lg-dory/APKBUILD b/aports/device/device-lg-dory/APKBUILD
index a8261e6e8..efff51989 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=6
+pkgrel=7
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="6f37d7aa7c03bcbd909ddff26f4ba6504664eb4e24d201fb739c419d401f75e954872b080ee7d4336e80d5adf84677a20057abe61fd5b190fc47e6746a390d98 deviceinfo
+sha512sums="7f3f1778ec0683ae337d4f8768336e61146f7546691af24b59fe3868c51e21f0da922a276450f8a732977a00e4fe0d0d4f80be25cb538d9231c477ffb5487de2 deviceinfo
f52a0bfab7e0067c0837662b5297e6c6d3433a1fc1cbdfaf3000227452d88980b99ac196541fda3bd57fd789580cb4ef96299b24e1bdb277f21f42418fcf17fa 90-touchscreen-dev.rules"
diff --git a/aports/device/device-lg-dory/deviceinfo b/aports/device/device-lg-dory/deviceinfo
index a65f91c17..90123c6d1 100644
--- a/aports/device/device-lg-dory/deviceinfo
+++ b/aports/device/device-lg-dory/deviceinfo
@@ -11,7 +11,6 @@ deviceinfo_modules_initfs=""
deviceinfo_external_storage="false"
deviceinfo_flash_method="fastboot"
deviceinfo_arch="armhf"
-deviceinfo_msm_refresher="true"
# Device related
deviceinfo_keyboard="false"
diff --git a/aports/device/device-lg-h815/APKBUILD b/aports/device/device-lg-h815/APKBUILD
index 11f6dbfb3..a5846a1f9 100644
--- a/aports/device/device-lg-h815/APKBUILD
+++ b/aports/device/device-lg-h815/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-lg-h815"
pkgdesc="LG G4 (h815)"
pkgver=0.1
-pkgrel=4
+pkgrel=5
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -19,4 +19,4 @@ package() {
devicepkg_package $startdir $pkgname
}
-sha512sums="6e1bb9c214640a207f0412cec0368d98871672531b5406b1b439493b28dec907790f1f98e66d08e99fd3cbc37a10772740f61d443516e534baf1c138188404e6 deviceinfo"
+sha512sums="6928232324228106d65358c66a61315fd777fbdafd5f180363385a9cbc579be10826a727f45c32b75645afa6413807d45795178f2fa83c3111bbd086b125df23 deviceinfo"
diff --git a/aports/device/device-lg-h815/deviceinfo b/aports/device/device-lg-h815/deviceinfo
index f56a66db9..417a2289c 100644
--- a/aports/device/device-lg-h815/deviceinfo
+++ b/aports/device/device-lg-h815/deviceinfo
@@ -30,4 +30,3 @@ deviceinfo_flash_offset_second="0x00f00000"
deviceinfo_flash_offset_tags="0x00000100"
deviceinfo_flash_pagesize="4096"
-deviceinfo_msm_refresher="true"
diff --git a/aports/device/device-lg-hammerhead/APKBUILD b/aports/device/device-lg-hammerhead/APKBUILD
index f40ba9221..3abb5602e 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=22
+pkgrel=23
pkgdesc="Google Nexus 5"
url="https://github.com/postmarketOS"
arch="noarch"
@@ -52,7 +52,7 @@ nonfree_firmware() {
mkdir "$subpkgdir"
}
-sha512sums="159c70204858ddf1463a5d3c2672e62d75d5d0425bec81c25326bab290479d672b98848070af4fc75932e71e1342096cff77d7df1e4161b51f082c7d8ce19ae5 deviceinfo
+sha512sums="d91d248da5e8567a36f48e0ca0cd8d63e2bdb52bdb407b6c57717db68b64e9e1526a408912f7818aea81ce455606ab24949f6ba8aa79c7612672a996c5e81c82 deviceinfo
d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306 profile.sh
bdf89f09e1ab82ac0da273c9ebca21755855d497f9dc0d6f7af99fd56157f98d72d70118504db8b2c20c0b818cbc5d344c70463334a60d924671a8acbda41dff weston.ini
f86ef35730b89bcc8160c08db7a7fcd0970adf60c0b77af68bac397de49c0d1783e6b8db1762380c9bf874aff2d030c6f44ecb75c803d69e79ede11376409369 xorg.conf
diff --git a/aports/device/device-lg-hammerhead/deviceinfo b/aports/device/device-lg-hammerhead/deviceinfo
index ca66e99b0..dec38c937 100644
--- a/aports/device/device-lg-hammerhead/deviceinfo
+++ b/aports/device/device-lg-hammerhead/deviceinfo
@@ -17,9 +17,6 @@ deviceinfo_arch="armhf"
deviceinfo_screen_width="1080"
deviceinfo_screen_height="1920"
-# Display related
-deviceinfo_msm_refresher="false"
-
# Fastboot related
deviceinfo_generate_bootimg="true"
deviceinfo_flash_offset_base="0"
diff --git a/aports/device/device-motorola-athene/APKBUILD b/aports/device/device-motorola-athene/APKBUILD
index f3bf4c815..9cd8bc8e3 100644
--- a/aports/device/device-motorola-athene/APKBUILD
+++ b/aports/device/device-motorola-athene/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-motorola-athene"
pkgdesc="Motorola Moto G4"
pkgver=0.1
-pkgrel=0
+pkgrel=1
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -19,4 +19,4 @@ package() {
devicepkg_package $startdir $pkgname
}
-sha512sums="78457259b7417ea48dce44502b6f3dbca494bae4d364d8bf8c6bc2a891b9d1f7cde4d8766989bd672ef177a5392621fbcebff362b5bd0f022ac4625fc2ff3be5 deviceinfo"
+sha512sums="4a1c06b52b0faf000e89e08e1f8c006434b6d4f670ad952a808f7d3688c7ec14893fc765ddd05b8e6cbe757d9228f4d7e38e9fb3188cd9a860d5ebcb9d942b1a deviceinfo"
diff --git a/aports/device/device-motorola-athene/deviceinfo b/aports/device/device-motorola-athene/deviceinfo
index 6596b06ad..a5ea36bea 100644
--- a/aports/device/device-motorola-athene/deviceinfo
+++ b/aports/device/device-motorola-athene/deviceinfo
@@ -17,7 +17,6 @@ deviceinfo_screen_height="1920"
deviceinfo_dev_touchscreen="/dev/input/event2"
deviceinfo_dev_touchscreen_calibration=""
deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="true"
# Bootloader related
deviceinfo_flash_method="fastboot"
diff --git a/aports/device/device-motorola-falcon/APKBUILD b/aports/device/device-motorola-falcon/APKBUILD
index b6c3ca709..9508836a4 100644
--- a/aports/device/device-motorola-falcon/APKBUILD
+++ b/aports/device/device-motorola-falcon/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-motorola-falcon"
pkgdesc="Moto G (2013)"
pkgver=0.1
-pkgrel=2
+pkgrel=3
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -19,4 +19,4 @@ package() {
devicepkg_package $startdir $pkgname
}
-sha512sums="f47817e8c9827ac7cc82a500f70d386c4308ee7e6b22fe344949ed8627a29023b52919a8528aac6af7621119f5708908d6077d76c523bd050f0e1bc1cbf1e756 deviceinfo"
+sha512sums="bb4ceca7e8c02555a723aadaee36e7dbb628cafeddb3f7390655c261adb8cc93bac5623cbebd1fa2c55f80503c79a9fb8d3ef824b2bdc3db50ff322e0fdc3f8f deviceinfo"
diff --git a/aports/device/device-motorola-falcon/deviceinfo b/aports/device/device-motorola-falcon/deviceinfo
index 79954e22a..c851b47e3 100644
--- a/aports/device/device-motorola-falcon/deviceinfo
+++ b/aports/device/device-motorola-falcon/deviceinfo
@@ -33,5 +33,4 @@ deviceinfo_flash_sparse=true
# Make the display output work
deviceinfo_weston_pixman_type="2"
-deviceinfo_msm_refresher="true"
diff --git a/aports/device/device-motorola-harpia/APKBUILD b/aports/device/device-motorola-harpia/APKBUILD
index 7e9984d8a..56c3bed5d 100644
--- a/aports/device/device-motorola-harpia/APKBUILD
+++ b/aports/device/device-motorola-harpia/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-motorola-harpia"
pkgdesc="Motorola Moto G4 Play"
pkgver=0.1
-pkgrel=0
+pkgrel=1
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -25,5 +25,5 @@ package() {
"$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh
}
-sha512sums="6c1485882a4712e5d03fafc9a0ce4840f019a604c7c4ed4e6da765487f352a4f8163ca8f880e7f7f40bfe4b229af5c8d9c4b9b605c8b4255a18631cbdfd71671 deviceinfo
+sha512sums="6008cc900a0ee49169ea405add7fb589367905b0f58306750e227739f79dabf9b6dd46b457c8991e6114dda76e8039ac86dfbbce6810e657de7663ac53a73263 deviceinfo
17dabb0190a9191173454ac12c5c8ad8744b922d20807bd9465bc26d485c0f2d34e968d40b8e886a32640f0c36635cde083c4dc7e4122b55c3cff1f9d1b34af6 initfs-hook.sh"
diff --git a/aports/device/device-motorola-harpia/deviceinfo b/aports/device/device-motorola-harpia/deviceinfo
index d5f2083b4..8116ea51e 100644
--- a/aports/device/device-motorola-harpia/deviceinfo
+++ b/aports/device/device-motorola-harpia/deviceinfo
@@ -17,7 +17,6 @@ deviceinfo_screen_height="1280"
deviceinfo_dev_touchscreen="/dev/input/event1"
deviceinfo_dev_touchscreen_calibration="1 0 0 0 1 0"
deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="true"
# Bootloader related
deviceinfo_flash_method="fastboot"
diff --git a/aports/device/device-motorola-peregrine/APKBUILD b/aports/device/device-motorola-peregrine/APKBUILD
index 3c3962a3d..5c76b5774 100644
--- a/aports/device/device-motorola-peregrine/APKBUILD
+++ b/aports/device/device-motorola-peregrine/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-motorola-peregrine"
pkgdesc="Moto G 4G (2013)"
pkgver=0.1
-pkgrel=2
+pkgrel=3
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -36,5 +36,5 @@ nonfree_firmware() {
mkdir "$subpkgdir"
}
-sha512sums="572091b996d55ce7f6a1b10b67cbd55677a251b4fdba209b6085d4cc00db411df35926fecf22c2dc62bca3c7472118643ed0956b479aa97a469d75f4b410feb7 deviceinfo
+sha512sums="8ef3a5ea08b6128e16137224d6bdd8315547c86afff5f3220e0c733caccadbfa2f3aaba2dfa196ce37da3f7892a932f6e7f7319ea6c7b079983cddb9d9f4c27c deviceinfo
f86ef35730b89bcc8160c08db7a7fcd0970adf60c0b77af68bac397de49c0d1783e6b8db1762380c9bf874aff2d030c6f44ecb75c803d69e79ede11376409369 xorg.conf"
diff --git a/aports/device/device-motorola-peregrine/deviceinfo b/aports/device/device-motorola-peregrine/deviceinfo
index 4ee0943c9..fc24a8f33 100644
--- a/aports/device/device-motorola-peregrine/deviceinfo
+++ b/aports/device/device-motorola-peregrine/deviceinfo
@@ -32,4 +32,3 @@ deviceinfo_flash_pagesize="2048"
# Make the display output work
deviceinfo_weston_pixman_type="2"
-deviceinfo_msm_refresher="true"
diff --git a/aports/device/device-motorola-potter/APKBUILD b/aports/device/device-motorola-potter/APKBUILD
index a56ea167d..1fdf7e8c7 100644
--- a/aports/device/device-motorola-potter/APKBUILD
+++ b/aports/device/device-motorola-potter/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-motorola-potter"
pkgdesc="Motorola Moto G5 Plus"
pkgver=0.1
-pkgrel=4
+pkgrel=5
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -19,4 +19,4 @@ package() {
devicepkg_package $startdir $pkgname
}
-sha512sums="782e416f8387556eb62d65b44ec1128ec981cb8fa0fb12401aaeaaea57b2547a6abd907c2b14c4ae6310c9ea47f8d1cd581a36f3818b53df358f82d27399e61f deviceinfo"
+sha512sums="4927ebeb9585207afa432cfe360e051aa2a8e6d7126b0f469371c0463aa9d7b7fcec8c8965abe087a9a039e6de0998e8b1b3a51f987936284cd452f124ec638b deviceinfo"
diff --git a/aports/device/device-motorola-potter/deviceinfo b/aports/device/device-motorola-potter/deviceinfo
index c0a5fe622..48e34c46b 100644
--- a/aports/device/device-motorola-potter/deviceinfo
+++ b/aports/device/device-motorola-potter/deviceinfo
@@ -17,7 +17,6 @@ deviceinfo_screen_height="1920"
deviceinfo_dev_touchscreen=""
deviceinfo_dev_touchscreen_calibration=""
deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="true"
# Bootloader related
deviceinfo_flash_method="fastboot"
diff --git a/aports/device/device-motorola-shamu/APKBUILD b/aports/device/device-motorola-shamu/APKBUILD
index 71bfa2c6f..ddd8ba4ac 100644
--- a/aports/device/device-motorola-shamu/APKBUILD
+++ b/aports/device/device-motorola-shamu/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-motorola-shamu"
pkgdesc="Motorola Google Nexus 6"
pkgver=0.3
-pkgrel=3
+pkgrel=4
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -21,5 +21,5 @@ package() {
"$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh
}
-sha512sums="9d1862f7732dc92c99caa388c616ae9de9507a1c4bfb7d7bf7d5d8bc0b2f7801e32af033927e3e6d8a823787dc819426105e298172c2a5df11d708966e2ed901 deviceinfo
+sha512sums="28d0e960b9795ce8b93016ed37852d2e616182d3dcd204e8cec25673779f1d4064562b377bb0a420807ce1bc58f37db8a97bd7d71589e557934fa54a26778aa2 deviceinfo
c4f4785a9fea1d8b461e1de4dcd04daae45bd9df94f8123655b981de5ac5718f082a59169c39c506aa996c1642f465249fbc8b6e1c0463aeca6abf74ff523d9c initfs-hook.sh"
diff --git a/aports/device/device-motorola-shamu/deviceinfo b/aports/device/device-motorola-shamu/deviceinfo
index d2ac08a6b..13c488395 100644
--- a/aports/device/device-motorola-shamu/deviceinfo
+++ b/aports/device/device-motorola-shamu/deviceinfo
@@ -17,7 +17,6 @@ deviceinfo_screen_height="2560"
deviceinfo_dev_touchscreen="/dev/input/event0"
deviceinfo_dev_touchscreen_calibration=""
deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="true"
# Bootloader related
deviceinfo_flash_method="fastboot"
diff --git a/aports/device/device-motorola-titan/APKBUILD b/aports/device/device-motorola-titan/APKBUILD
index 03c9ada61..6c8481411 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=24
+pkgrel=25
pkgdesc="Motorola Moto G 2014"
url="https://github.com/postmarketOS"
arch="noarch"
@@ -37,7 +37,7 @@ nonfree_firmware() {
mkdir "$subpkgdir"
}
-sha512sums="faae9fb1484f832d009c375d962e5fdae5fcf6c5565a360f3e9d142740f45a41f865310d8d9d6be32db0f0f4cda15a0ae394551d06b9bac32348ee8d36a6b64e deviceinfo
+sha512sums="af094982d9977208b2a25b0830cf89aeadfd7a7e3467d6dad3492c17be26743a6570f630594b3c96544a2167a9cde6c0c3d7f3382690405a4a365325ebe544d0 deviceinfo
8406968cd554393ea1e350967c80810d059de2b1d33ea1302e265780c1f0110d64cf15a68c2f374981a88906d0317315e0a71995c85fd5eaf93bb47ed427529c 90-android-touch-dev.rules
d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306 profile.sh
4f321242005b4da012322a8e9bce14a3734281d6ab410f60e7c9c28a6df905876ccce65c3b914233f351118718ccd81b9be41724ee2099ca36d40b4cfff46b93 weston.ini"
diff --git a/aports/device/device-motorola-titan/deviceinfo b/aports/device/device-motorola-titan/deviceinfo
index 42e660de4..4d0f87646 100644
--- a/aports/device/device-motorola-titan/deviceinfo
+++ b/aports/device/device-motorola-titan/deviceinfo
@@ -12,7 +12,6 @@ deviceinfo_modules_initfs=""
deviceinfo_external_storage="false"
deviceinfo_flash_method="fastboot"
deviceinfo_arch="armhf"
-deviceinfo_msm_refresher="true"
# Splash screen
deviceinfo_screen_width="720"
diff --git a/aports/device/device-nextbit-robin/APKBUILD b/aports/device/device-nextbit-robin/APKBUILD
index df8c2b339..958340f23 100644
--- a/aports/device/device-nextbit-robin/APKBUILD
+++ b/aports/device/device-nextbit-robin/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-nextbit-robin"
pkgdesc="Nextbit Robin"
pkgver=0.1
-pkgrel=3
+pkgrel=4
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -19,4 +19,4 @@ package() {
devicepkg_package $startdir $pkgname
}
-sha512sums="5619a32226c4d69782e671813ab3ca1432e87382674aa4aa0af7da1b8a46cb77646892ac3edfbdca0b346deb8ae0ee52aa63bc21ac04c34096a0524ecc3ab954 deviceinfo"
+sha512sums="313776f670f202dcbc375befd4544b5e97836c0678c8135d046ec443d3a4767ca771b5d3894e89f257b38a6492a9a9c20a01baeefb02ede9a98a2d82a69a7f0a deviceinfo"
diff --git a/aports/device/device-nextbit-robin/deviceinfo b/aports/device/device-nextbit-robin/deviceinfo
index 12e094cd2..8e996c77a 100644
--- a/aports/device/device-nextbit-robin/deviceinfo
+++ b/aports/device/device-nextbit-robin/deviceinfo
@@ -19,7 +19,6 @@ deviceinfo_dev_touchscreen_calibration=""
deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="true"
# Bootloader related
deviceinfo_flash_method="fastboot"
diff --git a/aports/device/device-oneplus-oneplus2/APKBUILD b/aports/device/device-oneplus-oneplus2/APKBUILD
index 2c66af38b..b23566854 100644
--- a/aports/device/device-oneplus-oneplus2/APKBUILD
+++ b/aports/device/device-oneplus-oneplus2/APKBUILD
@@ -1,7 +1,7 @@
pkgname="device-oneplus-oneplus2"
pkgdesc="OnePlus 2"
pkgver=0.1
-pkgrel=0
+pkgrel=1
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -24,5 +24,5 @@ package() {
devicepkg_package $startdir $pkgname
}
-sha512sums="c473372edda7405de3a27f555300e8511d722d1996cff822b540f776cd92dbc8afbe0a508e09aa78e822cfc759965728846a2e6136d1e334f619b092a3c9bc8a deviceinfo
+sha512sums="322bd1fa1698d96178e1c68b804735fd19ce04d096d16c74dc5cc4b7556a91c8ef613d9b1a2f9b58a77cb0f6b69b35e7234f0d9e81288e9a8257b14e06a3e750 deviceinfo
abf299888a7a2eafc483a0077b0a60ff04a9c85e54c09758896a15d5d4fe0359765d078797d6791acd0ca5ede2f46dac2674fadbbbf0905d81e9a01e97d8b470 initfs-hook.sh"
diff --git a/aports/device/device-oneplus-oneplus2/deviceinfo b/aports/device/device-oneplus-oneplus2/deviceinfo
index 768d0c420..895975350 100644
--- a/aports/device/device-oneplus-oneplus2/deviceinfo
+++ b/aports/device/device-oneplus-oneplus2/deviceinfo
@@ -14,7 +14,6 @@ deviceinfo_keyboard="false"
deviceinfo_external_storage="false"
deviceinfo_screen_width="1080"
deviceinfo_screen_height="1920"
-deviceinfo_msm_refresher="true"
deviceinfo_dev_touchscreen="/dev/input/event6"
deviceinfo_dev_keyboard=""
diff --git a/aports/device/device-oneplus-onyx/APKBUILD b/aports/device/device-oneplus-onyx/APKBUILD
index 8af81ee87..b6c62360b 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=5
+pkgrel=6
pkgdesc="OnePlus X"
url="https://github.com/postmarketOS"
arch="noarch"
@@ -21,6 +21,6 @@ package() {
}
-sha512sums="5e8e08d691f31e3099e873921e39e044b8fe9281a3c58428459a1101350262821183947c0f987633ffed78b7e16dc3994b653e7a65d61fb6e826f943f9f020b2 deviceinfo
+sha512sums="b2d7186ca0c2b397267ade5316c4c42064c1cfee8f3402e760c67443fbff99c823e3c07427e5a6ce4035f029f74ee4f0f2156e55bd42f1b4e8c1068450ed38e7 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 d8a960caa..e1de47072 100644
--- a/aports/device/device-oneplus-onyx/deviceinfo
+++ b/aports/device/device-oneplus-onyx/deviceinfo
@@ -17,7 +17,6 @@ deviceinfo_arch="armhf"
deviceinfo_screen_width="1080"
deviceinfo_screen_height="1920"
-deviceinfo_msm_refresher="true"
# Fastboot related
deviceinfo_generate_bootimg="true"
diff --git a/aports/device/device-samsung-klte/APKBUILD b/aports/device/device-samsung-klte/APKBUILD
index 6a77749ff..a1cd4855d 100644
--- a/aports/device/device-samsung-klte/APKBUILD
+++ b/aports/device/device-samsung-klte/APKBUILD
@@ -1,7 +1,7 @@
pkgname="device-samsung-klte"
pkgdesc="Samsung Galaxy S5"
pkgver=0.1
-pkgrel=2
+pkgrel=3
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -18,4 +18,4 @@ package() {
devicepkg_package $startdir $pkgname
}
-sha512sums="fa896579275844f534fbc61b977ac5a20755f5475c8d73f34dcdf26896b90ec5e9582f45e2d339e8a694ed2489400961675ca8f50f3a82e77f4d87509adb91e0 deviceinfo"
+sha512sums="fc39550299d6ffee33c1b984671a91a5da9a4f24db5994cfd8650a75f96416bc30c3b169353ea3939c765df6a5801ee9647808c82d46a00190a0c1db44708b73 deviceinfo"
diff --git a/aports/device/device-samsung-klte/deviceinfo b/aports/device/device-samsung-klte/deviceinfo
index dce3cb251..f04ff34ae 100644
--- a/aports/device/device-samsung-klte/deviceinfo
+++ b/aports/device/device-samsung-klte/deviceinfo
@@ -16,7 +16,6 @@ deviceinfo_screen_width="1080"
deviceinfo_screen_height="1920"
deviceinfo_dev_touchscreen="/dev/input/event2"
deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="true"
# Bootloader related
deviceinfo_flash_method="heimdall-bootimg"
diff --git a/aports/device/device-samsung-kylessopen/APKBUILD b/aports/device/device-samsung-kylessopen/APKBUILD
index df390c989..ce5cc2a07 100644
--- a/aports/device/device-samsung-kylessopen/APKBUILD
+++ b/aports/device/device-samsung-kylessopen/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-samsung-kylessopen"
pkgdesc="Galaxy Trend"
pkgver=0.1
-pkgrel=0
+pkgrel=1
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -19,4 +19,4 @@ package() {
devicepkg_package $startdir $pkgname
}
-sha512sums="724d8417ddb631f02789efa388cca790271767716b4c2d072d81d5def02eb339255f52514cfda3987d6318105767bbbf5f98714d3a3da1639bd807b4507ecfc1 deviceinfo"
+sha512sums="110e3da1e36e1a2a0d9e9b99bf688a03534553f0c2b1507245e5d7956ae9e71e1e8547b9a6101f6c5477eddc792d9f3349efb56f81716352a192c791e48536ab deviceinfo"
diff --git a/aports/device/device-samsung-kylessopen/deviceinfo b/aports/device/device-samsung-kylessopen/deviceinfo
index 20aab0743..19363cbae 100644
--- a/aports/device/device-samsung-kylessopen/deviceinfo
+++ b/aports/device/device-samsung-kylessopen/deviceinfo
@@ -18,7 +18,6 @@ deviceinfo_screen_height="800"
deviceinfo_dev_touchscreen="/dev/input/event0"
deviceinfo_dev_touchscreen_calibration=""
deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="true"
# Bootloader related
deviceinfo_flash_method="heimdall-bootimg"
diff --git a/aports/device/device-semc-anzu/APKBUILD b/aports/device/device-semc-anzu/APKBUILD
index f5632df18..7c63f71da 100644
--- a/aports/device/device-semc-anzu/APKBUILD
+++ b/aports/device/device-semc-anzu/APKBUILD
@@ -2,7 +2,7 @@
pkgname=device-semc-anzu
pkgdesc="Xperia Arc"
pkgver=1
-pkgrel=4
+pkgrel=5
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -31,5 +31,5 @@ nonfree_firmware() {
mkdir "$subpkgdir"
}
-sha512sums="ee38d5feebdbaebfbbacc41072cf8a5b2393fcd12c2a6888d73727ce9f810d6b995e3a37874e31c834e7f4e0f511757c539e9fe84ed1df5170639d404d094551 deviceinfo
+sha512sums="1385106ad7ebf3ac64505a46a6087c3f7bc656771326bbf4cdced26d83e394b013b262e0ee95bc487dd86e4fb23069ebcb279e2844dcd5027ed9b6d7ed22aa57 deviceinfo
fc2241310bfc9777cd2240857d9176c48dbc8bdbd871b280e2703a2dce7c3810c0a36b78557088d81a161900c74ece2015c40b3c7e72f7970b46a3991e7856c2 modules-load.conf"
diff --git a/aports/device/device-semc-anzu/deviceinfo b/aports/device/device-semc-anzu/deviceinfo
index 09dae3700..82e3c8047 100644
--- a/aports/device/device-semc-anzu/deviceinfo
+++ b/aports/device/device-semc-anzu/deviceinfo
@@ -17,7 +17,6 @@ deviceinfo_screen_height="854"
deviceinfo_dev_touchscreen="/dev/input/event2"
deviceinfo_dev_touchscreen_calibration=""
deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="true"
deviceinfo_weston_pixman_type="2"
# Bootloader related
diff --git a/aports/device/device-sony-honami/APKBUILD b/aports/device/device-sony-honami/APKBUILD
index 665e04dea..009fca482 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=5
+pkgrel=6
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -23,5 +23,5 @@ nonfree_firmware() {
mkdir "$subpkgdir"
}
-sha512sums="ab6f4e1cf3bc2cac803e17e69aded76215fbacd5b337d5b43a3a4509108cc73445e76b307566210154009d373f1540b3e3ff2385df16f8503780712157a42106 deviceinfo
+sha512sums="52b9887c14a52ed5b059f673e51a68974b87a2a9d6c9e600087f0df490b1c5c4f8ae12b48dcd536a9616cf6888330b2c2a474b437f2af95a1b16d0bc11ef4adf deviceinfo
1651ac9eda3c97fafe55abe0f0ae429e04f73edcbf2c56aa3259f81837f7adde348bcb385daed05c30cfc61415455a459a917ed3acccbfd9b7a1caa32a851d40 90-android-touch-dev.rules"
diff --git a/aports/device/device-sony-honami/deviceinfo b/aports/device/device-sony-honami/deviceinfo
index 82df30514..fae72f0f8 100644
--- a/aports/device/device-sony-honami/deviceinfo
+++ b/aports/device/device-sony-honami/deviceinfo
@@ -5,7 +5,6 @@ deviceinfo_format_version="0"
deviceinfo_name="Sony Xperia Z1"
deviceinfo_manufacturer="Sony"
deviceinfo_arch="armhf"
-deviceinfo_msm_refresher="true"
# Device related
deviceinfo_keyboard="false"
diff --git a/aports/device/device-sony-scorpion/APKBUILD b/aports/device/device-sony-scorpion/APKBUILD
index d16733900..8a571f37c 100644
--- a/aports/device/device-sony-scorpion/APKBUILD
+++ b/aports/device/device-sony-scorpion/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-sony-scorpion"
pkgdesc="Xperia Z3 Tablet Compact"
pkgver=0.1
-pkgrel=2
+pkgrel=3
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -19,4 +19,4 @@ package() {
devicepkg_package $startdir $pkgname
}
-sha512sums="3ea4b8b13824b0a921d41d9c7289d4b34d1399aa73361da9e9d878300a0e8badfb1037c555e6b5fa91f14a43ddec44d5573600bb9873a4daec3b8f5a3c8b3475 deviceinfo"
+sha512sums="159509c424c55764edbee52ecded5a2e60d7a929df1230702b97e20b37061c633310c7f466e0898b356c60fd134cb1336ba30ab66a20f94b7abc73b0c1158179 deviceinfo"
diff --git a/aports/device/device-sony-scorpion/deviceinfo b/aports/device/device-sony-scorpion/deviceinfo
index bbee01be8..2a9bf547d 100644
--- a/aports/device/device-sony-scorpion/deviceinfo
+++ b/aports/device/device-sony-scorpion/deviceinfo
@@ -18,7 +18,6 @@ deviceinfo_dev_touchscreen="/dev/input/event2"
deviceinfo_dev_touchscreen_calibration=""
deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="true"
# Bootloader related
deviceinfo_flash_method="fastboot"
diff --git a/aports/device/device-xiaomi-armani/APKBUILD b/aports/device/device-xiaomi-armani/APKBUILD
index 941f515c9..ef1a8afe2 100644
--- a/aports/device/device-xiaomi-armani/APKBUILD
+++ b/aports/device/device-xiaomi-armani/APKBUILD
@@ -42,7 +42,7 @@ nonfree_firmware() {
mkdir "$subpkgdir"
}
-sha512sums="849f41cd11aea8816b111c4b1033a25f76e078573fe4a7301115badd8b2b4471dbad5b399802977d1acd48cb329000bae11f240b552602d7f060f943430f555a deviceinfo
+sha512sums="19c971c3e4356892eb414f7992e20897db88b94591a8140fd1919f5cb1998a54dfd938388cd2cba0b89b53cbc14ce4abd7bbca4d873c658cd63b9c76fc336da9 deviceinfo
abf694ebe949025268630457ad14ae69f6a33c151236c1a193da32c27f836591e932517f011f6eb7ce750ab74d2f1e9a70724fed7150210d4da1b80a6e86a801 90-touchscreen.rules
862f9a8d81af74c0a1c99c6255d4ec9d4bdd7828636ee29fbaf4b3ceef53f236fd2b2078e3150baf0f1d78a3da87d7b3a5b975fef33014238eb7658428642571 100-charging.rules
cf82b3bf37c4975668d7bb6f0e573fa5b44ed596d80a7ac2cdfa78dd619b7dc58c085fe1a0703953a143a46a4d917abf94f658e268578fe1c40664fa639959d3 armani_battery_charging.sh
diff --git a/aports/device/device-xiaomi-armani/deviceinfo b/aports/device/device-xiaomi-armani/deviceinfo
index 6813a2621..4a01dbd34 100644
--- a/aports/device/device-xiaomi-armani/deviceinfo
+++ b/aports/device/device-xiaomi-armani/deviceinfo
@@ -17,7 +17,6 @@ deviceinfo_screen_height="1280"
deviceinfo_dev_touchscreen=""
deviceinfo_dev_touchscreen_calibration=""
deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="true"
# Bootloader related
deviceinfo_flash_method="fastboot"
diff --git a/aports/device/device-xiaomi-santoni/APKBUILD b/aports/device/device-xiaomi-santoni/APKBUILD
index 012b54848..1de428343 100644
--- a/aports/device/device-xiaomi-santoni/APKBUILD
+++ b/aports/device/device-xiaomi-santoni/APKBUILD
@@ -2,7 +2,7 @@
pkgname="device-xiaomi-santoni"
pkgdesc="Xiaomi Redmi 4X"
pkgver=0.1
-pkgrel=0
+pkgrel=1
url="https://postmarketos.org"
license="MIT"
arch="noarch"
@@ -19,4 +19,4 @@ package() {
devicepkg_package $startdir $pkgname
}
-sha512sums="5eb1a32d4001c3b417285939596b2aabda3ae9a48e2455a21e27e7966fbae165718924fa5f966c0a20398fffd4b3abc68f55fafd39fb6c32cf09bc9a4d584eb5 deviceinfo"
+sha512sums="b46850d048f2f135deabc7f81099a357180e0ae888e4b71feafea5d3531f0e48f6fb96c7aecc802c8abe943fae1985c1e4f99b6368745ef5ca314e41c83f24c5 deviceinfo"
diff --git a/aports/device/device-xiaomi-santoni/deviceinfo b/aports/device/device-xiaomi-santoni/deviceinfo
index 7873c88f4..889b15ec4 100644
--- a/aports/device/device-xiaomi-santoni/deviceinfo
+++ b/aports/device/device-xiaomi-santoni/deviceinfo
@@ -14,7 +14,6 @@ deviceinfo_keyboard="false"
deviceinfo_external_storage="true"
deviceinfo_screen_width="1280"
deviceinfo_screen_height="720"
-deviceinfo_msm_refresher="true"
deviceinfo_dev_touchscreen=""
deviceinfo_dev_touchscreen_calibration=""
deviceinfo_dev_touchscreen="/dev/input/event1"
diff --git a/aports/main/msm-fb-refresher/00-msm-fb-refresher.files b/aports/main/msm-fb-refresher/00-msm-fb-refresher.files
new file mode 100755
index 000000000..ed8710768
--- /dev/null
+++ b/aports/main/msm-fb-refresher/00-msm-fb-refresher.files
@@ -0,0 +1 @@
+/usr/sbin/msm-fb-refresher
diff --git a/aports/main/msm-fb-refresher/00-msm-fb-refresher.sh b/aports/main/msm-fb-refresher/00-msm-fb-refresher.sh
new file mode 100755
index 000000000..07479caa4
--- /dev/null
+++ b/aports/main/msm-fb-refresher/00-msm-fb-refresher.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/sbin/msm-fb-refresher --loop &
diff --git a/aports/main/msm-fb-refresher/APKBUILD b/aports/main/msm-fb-refresher/APKBUILD
index 6ea1eeedb..af32fdf7a 100644
--- a/aports/main/msm-fb-refresher/APKBUILD
+++ b/aports/main/msm-fb-refresher/APKBUILD
@@ -1,6 +1,6 @@
pkgname=msm-fb-refresher
pkgver=0.1
-pkgrel=1
+pkgrel=2
pkgdesc="Display refresher for Qualcomm devices"
arch="all"
url="https://github.com/AsteroidOS/msm-fb-refresher"
@@ -10,6 +10,8 @@ install="$pkgname.post-install"
source="
${pkgname}-${pkgver}.tar.gz::https://github.com/AsteroidOS/msm-fb-refresher/archive/v${pkgver}.tar.gz
msm-fb-refresher.init
+ 00-msm-fb-refresher.sh
+ 00-msm-fb-refresher.files
"
builddir="${srcdir}/${pkgname}-${pkgver}"
@@ -24,6 +26,16 @@ package() {
"${pkgdir}/usr/sbin/msm-fb-refresher"
install -Dm755 "${srcdir}/msm-fb-refresher.init" \
"${pkgdir}/etc/init.d/msm-fb-refresher"
+
+ # Initramfs hook
+ local initfsdir="$pkgdir/etc/postmarketos-mkinitfs/"
+ mkdir -p "$initfsdir/hooks" "$initfsdir/files"
+ install -Dm755 "$srcdir/00-msm-fb-refresher.sh" \
+ "$initfsdir/hooks/00-msm-fb-refersher.sh"
+ install -Dm755 "$srcdir/00-msm-fb-refresher.files" \
+ "$initfsdir/files/00-msm-fb-refersher.files"
}
sha512sums="6c39f2a2eccf5c4b4dc89e91b69385ad89cfd3fdef3121d32e88f2811b3a6df1ca15c5f8df8df7eced7133e99abdf54034bc82e9d871f40bfc4271b9a0474e15 msm-fb-refresher-0.1.tar.gz
-5820e02dcb1cd927bcd6c8548307936a12f0dde1b92f15a931134b8d4a41f4b5e8811c6969d9b11a6a31d40da218b24ee274614936f6e50bcd6e794346f99c13 msm-fb-refresher.init"
+5820e02dcb1cd927bcd6c8548307936a12f0dde1b92f15a931134b8d4a41f4b5e8811c6969d9b11a6a31d40da218b24ee274614936f6e50bcd6e794346f99c13 msm-fb-refresher.init
+1b6168037293db465a5a55d5c263cb60ac46cccb601329b193110bbdffc23207b3d38419d2ad128020bf4ddbcdb868e8fa2f561764adf02c7db0526b0177ee5a 00-msm-fb-refresher.sh
+906c0d672682a9f0e3e8e07e207a557b8a1659e2e6021cb95c4b9886aed3b9ea477638c00ce9e4193b52dcfab7da317d9840cc576f29c7c7158cc11fd368be84 00-msm-fb-refresher.files"
diff --git a/aports/main/postmarketos-mkinitfs/APKBUILD b/aports/main/postmarketos-mkinitfs/APKBUILD
index 4f04cec70..3e3861e10 100644
--- a/aports/main/postmarketos-mkinitfs/APKBUILD
+++ b/aports/main/postmarketos-mkinitfs/APKBUILD
@@ -1,5 +1,5 @@
pkgname=postmarketos-mkinitfs
-pkgver=0.6.3
+pkgver=0.6.4
pkgrel=0
pkgdesc="Tool to generate initramfs images for postmarketOS"
url="https://github.com/postmarketOS"
@@ -23,6 +23,6 @@ package() {
"$pkgdir/sbin/mkinitfs"
mkdir -p "$pkgdir/etc/postmarketos-mkinitfs/hooks/"
}
-sha512sums="a09a48026a5cac308fa54e37c72e89fd7901e749f73720f3e8d3ec11a4d1527dbc1e5011aff53b1beffb6ff444c8df11a56e43d27ac0180ce8ddc79332be1d0d init.sh.in
-f45548b295393cb078e4c456acef0eaac11705c4b5bc33981c320580c843231589fdfc78b25e182cd202435381d1be37085df01b6e272eee0af2ca0f89b3b4f5 init_functions.sh
-b80a773efe22a6fe33ffb6f92ff279e425ff7034a4946497a628ea6c4e2300112adcde7d09d790a04b851610d3f17271001b6e3d36ba39321dba69f48b393f89 mkinitfs.sh"
+sha512sums="d5abfe9a1298069e6722555c6e16223b09b36af65d879feb64d540aa6cbc009a3aa7f00528bcf656370ec37cc64f925c72ebb77813961cd6ebf22107b57ea029 init.sh.in
+3e0aee0f73db0087c1efc68b8e2855705b35bde8a55491b6b5ca8118f91fd15fd07a69d6dacdaf9dc372761f1ee9d330d5c4d51a797dcb5ae4ee1d6a893bff63 init_functions.sh
+631007eb45fb2ec79532f746cda9d2f98e3d0853c0b0bdaed82e8f931fe3ddf9127274f200726fab8d3e41dbe0dfbab2c3ad359584218b04c2b07ef54f8b332b mkinitfs.sh"
diff --git a/aports/main/postmarketos-mkinitfs/init.sh.in b/aports/main/postmarketos-mkinitfs/init.sh.in
index 26fde66ad..40ba357f1 100644
--- a/aports/main/postmarketos-mkinitfs/init.sh.in
+++ b/aports/main/postmarketos-mkinitfs/init.sh.in
@@ -15,9 +15,6 @@ setup_log
setup_mdev
mount_subpartitions
-# Start msm-fb-refresher workaround for qualcomm devices
-start_msm_refresher
-
# Fix for framebuffer drivers, which do not have a default mode
set_framebuffer_mode
diff --git a/aports/main/postmarketos-mkinitfs/init_functions.sh b/aports/main/postmarketos-mkinitfs/init_functions.sh
index e9cf27e18..8dc348949 100644
--- a/aports/main/postmarketos-mkinitfs/init_functions.sh
+++ b/aports/main/postmarketos-mkinitfs/init_functions.sh
@@ -313,13 +313,6 @@ show_splash() {
fbsplash -s /tmp/splash.ppm
}
-start_msm_refresher() {
- # shellcheck disable=SC2154,SC2086
- if [ "${deviceinfo_msm_refresher}" = "true" ]; then
- /usr/sbin/msm-fb-refresher --loop &
- fi
-}
-
set_framebuffer_mode() {
[ -e "/sys/class/graphics/fb0/modes" ] || return
[ -z "$(cat /sys/class/graphics/fb0/mode)" ] || return
diff --git a/aports/main/postmarketos-mkinitfs/mkinitfs.sh b/aports/main/postmarketos-mkinitfs/mkinitfs.sh
index 098b250eb..d05c51bf4 100644
--- a/aports/main/postmarketos-mkinitfs/mkinitfs.sh
+++ b/aports/main/postmarketos-mkinitfs/mkinitfs.sh
@@ -123,9 +123,6 @@ BINARIES_EXTRA="
"
get_binaries()
{
- if [ "${deviceinfo_msm_refresher}" == "true" ]; then
- BINARIES="${BINARIES} /usr/sbin/msm-fb-refresher"
- fi
for file in "/etc/postmarketos-mkinitfs/files"/*.files; do
[ -f "$file" ] || continue
while IFS= read -r line; do
@@ -406,12 +403,6 @@ check_hook_files
echo "==> initramfs: creating $outfile"
tmpdir=$(mktemp -d /tmp/mkinitfs.XXXXXX)
-if [ "${deviceinfo_msm_refresher}" == "true" ] && ! [ -e /usr/sbin/msm-fb-refresher ]; then
- echo "ERROR: Please add msm-fb-refresher as dependency to your device package,"
- echo "or set msm_refresher to false in your deviceinfo!"
- exit 1
-fi
-
# set up initfs in temp folder
create_folders
copy_files "$(get_modules)" "$tmpdir"
diff --git a/pmb/parse/deviceinfo.py b/pmb/parse/deviceinfo.py
index 0f75a0061..10d0f1d27 100644
--- a/pmb/parse/deviceinfo.py
+++ b/pmb/parse/deviceinfo.py
@@ -21,6 +21,28 @@ import os
import pmb.config
+def sanity_check(info, path):
+ # "flash_methods" is legacy
+ if "flash_methods" in info:
+ raise RuntimeError("deviceinfo_flash_methods has been renamed to"
+ " deviceinfo_flash_method. Please adjust your"
+ " deviceinfo file: " + path)
+
+ # "external_disk*" is legacy
+ if "external_disk" in info or "external_disk_install" in info:
+ raise RuntimeError("Instead of deviceinfo_external_disk and"
+ " deviceinfo_external_disk_install, please use the"
+ " new variable deviceinfo_external_storage in your"
+ " deviceinfo file: " + path)
+
+ # "msm_refresher" is legacy
+ if "msm_refresher" in info:
+ raise RuntimeError("It is enough to specify 'msm-fb-refresher' in the"
+ " depends of your device's package now. Please"
+ " delete the deviceinfo_msm_refresher line in: " +
+ path)
+
+
def deviceinfo(args, device=None):
"""
:param device: defaults to args.device
@@ -60,17 +82,5 @@ 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)
-
- # Sanity check: "external_disk*" is legacy
- if "external_disk" in ret or "external_disk_install" in ret:
- raise RuntimeError("Instead of deviceinfo_external_disk and"
- " deviceinfo_external_disk_install, please use the"
- " new variable deviceinfo_external_storage in your"
- " deviceinfo file: " + path)
-
+ sanity_check(ret, path)
return ret
--
GitLab