diff --git a/device/testing/device-google-burnet/APKBUILD b/device/testing/device-google-burnet/APKBUILD index 413cfab64..f7bb3d60d 100644 --- a/device/testing/device-google-burnet/APKBUILD +++ b/device/testing/device-google-burnet/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jenneron pkgname=device-google-burnet pkgdesc="HP Chromebook x360 11MK G3 EE" -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -41,6 +41,6 @@ nonfree_firmware() { } sha512sums=" -5514c588d76bef7a9fa8c8f7ad012efd5da34422f4808f819a795ea753f232322a63bbc68a648adc939ad9ade57d60e736ce5ebdcf6ea4173864978579460e2b deviceinfo +7a39024e1f4b697b2bde13794cdc51e269b9883322e17a608349489ffed0a10db9e785ec3d3291abe0860c7e6bed31e7cb9508f4532f9d05866077a9e012992c deviceinfo bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed sound.conf " diff --git a/device/testing/device-google-burnet/deviceinfo b/device/testing/device-google-burnet/deviceinfo index 69d2bae35..293314c76 100644 --- a/device/testing/device-google-burnet/deviceinfo +++ b/device/testing/device-google-burnet/deviceinfo @@ -25,4 +25,5 @@ deviceinfo_flash_method="none" deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" deviceinfo_cgpt_kpart_size="65536" +deviceinfo_depthcharge_board="burnet" deviceinfo_generate_depthcharge_image="true" diff --git a/device/testing/device-google-cozmo/APKBUILD b/device/testing/device-google-cozmo/APKBUILD index 2ae050f34..0aecf2e03 100644 --- a/device/testing/device-google-cozmo/APKBUILD +++ b/device/testing/device-google-cozmo/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jenneron pkgname=device-google-cozmo pkgdesc="Acer Chromebook 314 (CB314-2H / CB314-2HT)" -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -41,6 +41,6 @@ nonfree_firmware() { } sha512sums=" -dd1c4b2dacf03ccb81a51838bc4ebc7ce6114070f5d8a8035b9693bccf2a2aebd026df36f5cb9ec38ca93237026d7e1d5671be8c8d9e3c5821772e10bb2f4302 deviceinfo +41a90f9abe98eb1442f6d1e68acfda7d50f5d025df9de2bf8b2658fdd5e79de4804bc9e4c3c890d81ec6bc0c2715f0e73155a0288dd5635476a6915b9dcccd75 deviceinfo bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed sound.conf " diff --git a/device/testing/device-google-cozmo/deviceinfo b/device/testing/device-google-cozmo/deviceinfo index 0d52a5ee1..9b096da58 100644 --- a/device/testing/device-google-cozmo/deviceinfo +++ b/device/testing/device-google-cozmo/deviceinfo @@ -25,4 +25,5 @@ deviceinfo_flash_method="none" deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" deviceinfo_cgpt_kpart_size="65536" +deviceinfo_depthcharge_board="cozmo" deviceinfo_generate_depthcharge_image="true" diff --git a/device/testing/device-google-damu/APKBUILD b/device/testing/device-google-damu/APKBUILD index 445e7ae23..01f8b0b3b 100644 --- a/device/testing/device-google-damu/APKBUILD +++ b/device/testing/device-google-damu/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jenneron pkgname=device-google-damu pkgdesc="ASUS Chromebook Flip CM3 (CM3200, MT8183)" -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -41,6 +41,6 @@ nonfree_firmware() { } sha512sums=" -8172d3d8c7095b1155509e46c991d91fa2160462ba982a415421cb09a600b36ebf38f42eb12d30ed14995b06253a9b16005594a9cefd3e8581357096bdc696b6 deviceinfo +06fb84b1c7c144fe3511dda65530441d42073b62a95e36c50e53eb1d1dafcee58974cd74287c407c0839f9ecc6065f5cc3fd6bf518d8faf98698b63def540959 deviceinfo 37f11d243c4ecfd07bfb74e2d34e4c261db3a6aff755bf2dd08dad998de47e511c21082ca0d181e77e093e6f940fc570d8aef87fbc3a73ba55cb9f34b8c510f2 sound.conf " diff --git a/device/testing/device-google-damu/deviceinfo b/device/testing/device-google-damu/deviceinfo index b003b53d9..c14968ce0 100644 --- a/device/testing/device-google-damu/deviceinfo +++ b/device/testing/device-google-damu/deviceinfo @@ -25,4 +25,5 @@ deviceinfo_flash_method="none" deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" deviceinfo_cgpt_kpart_size="65536" +deviceinfo_depthcharge_board="damu" deviceinfo_generate_depthcharge_image="true" diff --git a/device/testing/device-google-elm/APKBUILD b/device/testing/device-google-elm/APKBUILD index acab79f3b..0ec20d9dc 100644 --- a/device/testing/device-google-elm/APKBUILD +++ b/device/testing/device-google-elm/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jenneron pkgname=device-google-elm pkgdesc="Acer Chromebook R13" -pkgver=1 -pkgrel=2 +pkgver=2 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -34,5 +34,5 @@ nonfree_firmware() { } sha512sums=" -baca81e238cf5d272204f34b0189cb3504421b9fa86022de78c31d8631b929ebfa3e5fbe5262a69952df3d00a0e2da31af40857fdbcf1fe48e4681d25a76ca96 deviceinfo +c318dbbd023cee698a0fcf32fd994bc88d26d907b5eedd77eb2edab3b252064211738fce0e5e5ecac449a01cf4533b0c40f30617921166899b1a29837ce99090 deviceinfo " diff --git a/device/testing/device-google-elm/deviceinfo b/device/testing/device-google-elm/deviceinfo index 87947d59b..ea96df10a 100644 --- a/device/testing/device-google-elm/deviceinfo +++ b/device/testing/device-google-elm/deviceinfo @@ -24,4 +24,5 @@ deviceinfo_kernel_cmdline="console=null" deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" deviceinfo_cgpt_kpart_size="65536" +deviceinfo_depthcharge_board="elm" deviceinfo_generate_depthcharge_image="true" diff --git a/device/testing/device-google-fennel/APKBUILD b/device/testing/device-google-fennel/APKBUILD index 2bafef1f1..e640f973d 100644 --- a/device/testing/device-google-fennel/APKBUILD +++ b/device/testing/device-google-fennel/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jenneron pkgname=device-google-fennel pkgdesc="Lenovo IdeaPad Flex 3 Chromebook (MT8183)" -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -70,7 +70,7 @@ kernel_sku7() { } sha512sums=" -e11742515a9820be610be39beb20e8c427fedbc84ca4eee38a21ef90ecc61c85c14f56510d69811336398fdf23ade644264ea4216b367e7a5e40ac249b4d7bea deviceinfo +4baf53df10fd495caa6bbc89018518377217f06d0b05dc0a08428e569ce8cccf7f01d7b236885355d4ed7c38079824435a0d02af220ad642c0370c5aa987e47c deviceinfo 37f11d243c4ecfd07bfb74e2d34e4c261db3a6aff755bf2dd08dad998de47e511c21082ca0d181e77e093e6f940fc570d8aef87fbc3a73ba55cb9f34b8c510f2 sound.conf.sku1.sku6 bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed sound.conf.sku7 " diff --git a/device/testing/device-google-fennel/deviceinfo b/device/testing/device-google-fennel/deviceinfo index a3a1c06a4..f3df8175c 100644 --- a/device/testing/device-google-fennel/deviceinfo +++ b/device/testing/device-google-fennel/deviceinfo @@ -27,4 +27,5 @@ deviceinfo_flash_method="none" deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" deviceinfo_cgpt_kpart_size="65536" +deviceinfo_depthcharge_board="fennel" deviceinfo_generate_depthcharge_image="true" diff --git a/device/testing/device-google-fennel14/APKBUILD b/device/testing/device-google-fennel14/APKBUILD index d07adcab6..e3ce2bcdf 100644 --- a/device/testing/device-google-fennel14/APKBUILD +++ b/device/testing/device-google-fennel14/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jenneron pkgname=device-google-fennel14 pkgdesc="Lenovo IdeaPad 3 Chromebook (MT8183)" -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -60,7 +60,7 @@ kernel_sku2() { } sha512sums=" -ca56d4b4c3331e232f4bb22ede08ce7ae675db3e3662a1f0bd3e105f4a5892339bf395e49029ccdfc0daa05f2324efdbef45b4f18c8350c5919b1b0de028db73 deviceinfo +e88e0e58e3d3529c3dbb3ef28345aead4d3250400f80b0f664b43c4185996ee46aebc02218555ba9ca1d493432b572366f0eb6957f6176b1821f6faa767696d9 deviceinfo 37f11d243c4ecfd07bfb74e2d34e4c261db3a6aff755bf2dd08dad998de47e511c21082ca0d181e77e093e6f940fc570d8aef87fbc3a73ba55cb9f34b8c510f2 sound.conf.sku0 bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed sound.conf.sku2 " diff --git a/device/testing/device-google-fennel14/deviceinfo b/device/testing/device-google-fennel14/deviceinfo index e926c73f9..a738fbcbb 100644 --- a/device/testing/device-google-fennel14/deviceinfo +++ b/device/testing/device-google-fennel14/deviceinfo @@ -26,4 +26,5 @@ deviceinfo_flash_method="none" deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" deviceinfo_cgpt_kpart_size="65536" +deviceinfo_depthcharge_board="fennel14" deviceinfo_generate_depthcharge_image="true" diff --git a/device/testing/device-google-hana/APKBUILD b/device/testing/device-google-hana/APKBUILD index 2682277b4..23164220c 100644 --- a/device/testing/device-google-hana/APKBUILD +++ b/device/testing/device-google-hana/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jenneron pkgname=device-google-hana pkgdesc="Google Hana Chromebooks" -pkgver=1 -pkgrel=2 +pkgver=2 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -11,16 +11,13 @@ options="!check !archcheck" depends=" alsa-utils depthcharge-tools + linux-postmarketos-mediatek-mt8173 postmarketos-base postmarketos-update-depthcharge-kernel " makedepends="devicepkg-dev" source="deviceinfo" -subpackages=" - $pkgname-kernel-hana:kernel_hana - $pkgname-kernel-hana-rev7:kernel_hana_rev7 - $pkgname-nonfree-firmware:nonfree_firmware -" +subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -30,18 +27,6 @@ package() { devicepkg_package $startdir $pkgname } -kernel_hana() { - pkgdesc="Google Hana Rev 1-6" - depends="linux-postmarketos-mediatek-mt8173" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_hana_rev7() { - pkgdesc="Google Hana Rev 7" - depends="linux-postmarketos-mediatek-mt8173" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - nonfree_firmware() { pkgdesc="WiFi/BT and GPU firmware" depends="linux-firmware-mrvl linux-firmware-mediatek firmware-powervr-gx6250" @@ -49,5 +34,5 @@ nonfree_firmware() { } sha512sums=" -a6bcef8552c7b64d966701b774c91c977a432813af217aa72fd2e2b2378dd93e2290becbf6cd38275e92082157b9757eddd7af606caa69036a5aea113ba4789d deviceinfo +86e687aa69807136aeb3c6dc1013c142b4405ac001e9e3e66db21da2912deb517d76593849b747d5f24fddcae586f15a8912a417202ed883266ebc6a749b835d deviceinfo " diff --git a/device/testing/device-google-hana/deviceinfo b/device/testing/device-google-hana/deviceinfo index 1161c6f11..4e394b8ff 100644 --- a/device/testing/device-google-hana/deviceinfo +++ b/device/testing/device-google-hana/deviceinfo @@ -7,8 +7,7 @@ deviceinfo_name="Google Hana Chromebook" deviceinfo_manufacturer="Google" deviceinfo_codename="google-hana" deviceinfo_year="2017" -deviceinfo_dtb_hana="mediatek/mt8173-elm-hana" -deviceinfo_dtb_hana_rev7="mediatek/mt8173-elm-hana-rev7" +deviceinfo_dtb="mediatek/mt8173-elm-hana mediatek/mt8173-elm-hana-rev7" deviceinfo_modules_initfs="hid-i2c-of hid-multitouch elants-i2c elan-i2c elan-i2c-core melfas-mip4 cros-ec-keyb" deviceinfo_arch="aarch64" @@ -25,4 +24,5 @@ deviceinfo_kernel_cmdline="console=null" deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" deviceinfo_cgpt_kpart_size="65536" +deviceinfo_depthcharge_board="hana" deviceinfo_generate_depthcharge_image="true" diff --git a/device/testing/device-google-juniper/APKBUILD b/device/testing/device-google-juniper/APKBUILD index 17a926038..b74dc1b85 100644 --- a/device/testing/device-google-juniper/APKBUILD +++ b/device/testing/device-google-juniper/APKBUILD @@ -3,8 +3,8 @@ # Co-Maintainer: Jenneron pkgname=device-google-juniper pkgdesc="Acer Chromebook Spin 311" -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -17,7 +17,6 @@ depends=" postmarketos-update-depthcharge-kernel soc-mediatek-mt8183 " - makedepends="devicepkg-dev" source=" deviceinfo @@ -43,6 +42,6 @@ nonfree_firmware() { } sha512sums=" -f0cdce2360b8d93c4d3d421c524be036450ba35f3eb5dee14d6070ec00e29166c799ecf392c60fd01678a58fb3c773fe12a620a9ce91f4dd18c22335189e9f90 deviceinfo +c8909d33923fe7c3248aed6f7d4bfa3aae29fd269a9155f5379803213a6d4d8f3f4a3427a6ea5336ba4907bcbed80b8a85819eaca525b7bca6262a1a8cbb78aa deviceinfo bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed sound.conf " diff --git a/device/testing/device-google-juniper/deviceinfo b/device/testing/device-google-juniper/deviceinfo index dd96805d9..edd451775 100644 --- a/device/testing/device-google-juniper/deviceinfo +++ b/device/testing/device-google-juniper/deviceinfo @@ -25,4 +25,5 @@ deviceinfo_flash_method="none" deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" deviceinfo_cgpt_kpart_size="65536" +deviceinfo_depthcharge_board="juniper" deviceinfo_generate_depthcharge_image="true" diff --git a/device/testing/device-google-kakadu/APKBUILD b/device/testing/device-google-kakadu/APKBUILD index 30dd36196..cbfcc4142 100644 --- a/device/testing/device-google-kakadu/APKBUILD +++ b/device/testing/device-google-kakadu/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jenneron pkgname=device-google-kakadu pkgdesc="ASUS Chromebook Detachable CM3 (CM3000)" -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -60,7 +60,7 @@ kernel_kakadu_sku22() { } sha512sums=" -09507acaa2ae9dc7a33ed5d75bc5dd7ace1bbba5267a68e9d9c29f3a8c5cd902d9b96196ce820a7ca0f71a1d38c0f3b8d762951b029493f888f4baf2458547c7 deviceinfo +973065514b393e318b782e920ce6469ce9e28afe30db205a8108adbd32fb5c5386a641da3c7568edc55c06bfc3e1fe95f5a60c07f6b53a97234de78d646d19cf deviceinfo 37f11d243c4ecfd07bfb74e2d34e4c261db3a6aff755bf2dd08dad998de47e511c21082ca0d181e77e093e6f940fc570d8aef87fbc3a73ba55cb9f34b8c510f2 sound.conf bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed sound.conf.sku22 " diff --git a/device/testing/device-google-kakadu/deviceinfo b/device/testing/device-google-kakadu/deviceinfo index eebeed853..682ce59fd 100644 --- a/device/testing/device-google-kakadu/deviceinfo +++ b/device/testing/device-google-kakadu/deviceinfo @@ -26,4 +26,5 @@ deviceinfo_flash_method="none" deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" deviceinfo_cgpt_kpart_size="65536" +deviceinfo_depthcharge_board="kakadu" deviceinfo_generate_depthcharge_image="true" diff --git a/device/testing/device-google-kappa/APKBUILD b/device/testing/device-google-kappa/APKBUILD index f88d5de1f..e16620511 100644 --- a/device/testing/device-google-kappa/APKBUILD +++ b/device/testing/device-google-kappa/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jenneron pkgname=device-google-kappa pkgdesc="HP Chromebook 11a" -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -41,6 +41,6 @@ nonfree_firmware() { } sha512sums=" -a61e3482fb7ddac2e7f032630a24b6e54951c680227387b2d5c9295e1e743218185434ede169b5b4cc1798f451cc5994e5b7d2c8e1aa86964876d13ae4e40375 deviceinfo +caf3c6f16a4fb085c6261842b91eb27b20afb01bbb2999de0daf56d973a323d07fe0713cecf152a6616e60232174ccd7d9f27ae988ff5e6398faa7396e00b2b2 deviceinfo bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed sound.conf " diff --git a/device/testing/device-google-kappa/deviceinfo b/device/testing/device-google-kappa/deviceinfo index be6b9a725..9ce968da4 100644 --- a/device/testing/device-google-kappa/deviceinfo +++ b/device/testing/device-google-kappa/deviceinfo @@ -25,4 +25,5 @@ deviceinfo_flash_method="none" deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" deviceinfo_cgpt_kpart_size="65536" +deviceinfo_depthcharge_board="kappa" deviceinfo_generate_depthcharge_image="true" diff --git a/device/testing/device-google-kenzo/APKBUILD b/device/testing/device-google-kenzo/APKBUILD index 257454646..1a79f8bd9 100644 --- a/device/testing/device-google-kenzo/APKBUILD +++ b/device/testing/device-google-kenzo/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jenneron pkgname=device-google-kenzo pkgdesc="Acer Chromebook 311 (CB311-11H / CB311-11HT)" -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -41,6 +41,6 @@ nonfree_firmware() { } sha512sums=" -4cb67b7d6603a100e1888e161668f82251b78c2a695ba433d7b9a6ce33f27b552764649786b46d5c3b458b1af86096e7b89a09ea79be417d6753f595fcac6633 deviceinfo +9254f78c303b25480f619b9530b4ea7f3a8107049c25fad4a560c05cbe886af499eb0f695045265c653ff5bdc57d681b7291283716dd806c3386e3550987231b deviceinfo bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed sound.conf " diff --git a/device/testing/device-google-kenzo/deviceinfo b/device/testing/device-google-kenzo/deviceinfo index bffa93545..5fbfac6dd 100644 --- a/device/testing/device-google-kenzo/deviceinfo +++ b/device/testing/device-google-kenzo/deviceinfo @@ -25,4 +25,5 @@ deviceinfo_flash_method="none" deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" deviceinfo_cgpt_kpart_size="65536" +deviceinfo_depthcharge_board="kenzo" deviceinfo_generate_depthcharge_image="true" diff --git a/device/testing/device-google-kevin/APKBUILD b/device/testing/device-google-kevin/APKBUILD index 7a27ef68f..dec0e55a3 100644 --- a/device/testing/device-google-kevin/APKBUILD +++ b/device/testing/device-google-kevin/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jenneron pkgname=device-google-kevin pkgdesc="Samsung Chromebook Plus" -pkgver=1 -pkgrel=1 +pkgver=2 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -54,7 +54,7 @@ phosh() { } sha512sums=" -89aa4e11906a99af3c0b6606c085cc8d4ac16d92d108aae0ca29f077215e61aed126f0e8c9a223807c5145efc51b9adfe9c242af8af6d23b54549aaac602a435 deviceinfo +a701e9adf943691061612e0d14241c467dc1b06757ac857cad6e0733867b3cbba5f5cda13cdb0b6973e45cc7466b6ac94104dfd727e39a7163b07d61573227d8 deviceinfo e8186b97016b49f810cce60c1c08d703ae0d91c25f776ed804f20f3f5e477693086c83a1ec5849a6cb5c9f0f2503b88d5fcac7c68ff0d6018812e43557839808 phoc.ini 1ba29c50747458b68ed98706c008cfaeea9eff56d2977a23e060f3a9fcf306c9d62d162e2906472d24a6c25596af95e26722c6b55ca97a031b2d5c8db2661390 accel.conf 926b662d7836046c7be53e75cf05989d6ab12296f1ad0fea61f7718adb360abbd4cf96666e9e154526a1fe179ce5b08391d85d01a4b17fca37b6615d2e6b3b0d pointercal diff --git a/device/testing/device-google-kevin/deviceinfo b/device/testing/device-google-kevin/deviceinfo index 6975f8a60..9ee076ee8 100644 --- a/device/testing/device-google-kevin/deviceinfo +++ b/device/testing/device-google-kevin/deviceinfo @@ -25,4 +25,5 @@ deviceinfo_kernel_cmdline="console=null" deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" deviceinfo_cgpt_kpart_size="65536" +deviceinfo_depthcharge_board="kevin" deviceinfo_generate_depthcharge_image="true" diff --git a/device/testing/device-google-kodama/APKBUILD b/device/testing/device-google-kodama/APKBUILD index c3c6a36a6..bbd2309d7 100644 --- a/device/testing/device-google-kodama/APKBUILD +++ b/device/testing/device-google-kodama/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jenneron pkgname=device-google-kodama pkgdesc="Lenovo 10e Chromebook Tablet" -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -11,6 +11,7 @@ options="!check !archcheck" depends=" alsa-ucm-conf-google-kukui depthcharge-tools + linux-postmarketos-mediatek-mt8183 postmarketos-base postmarketos-update-depthcharge-kernel soc-mediatek-mt8183 @@ -20,13 +21,7 @@ source=" deviceinfo modules-load.d/sound.conf " -subpackages=" - $pkgname-kernel-sku16:kernel_sku16 - $pkgname-kernel-sku32:kernel_sku32 - $pkgname-kernel-sku272:kernel_sku272 - $pkgname-kernel-sku288:kernel_sku288 - $pkgname-nonfree-firmware:nonfree_firmware -" +subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -45,31 +40,7 @@ nonfree_firmware() { mkdir "$subpkgdir" } -kernel_sku16() { - pkgdesc="Google Kodama Sku 16" - depends="linux-postmarketos-mediatek-mt8183" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_sku32() { - pkgdesc="Google Kodama Sku 32" - depends="linux-postmarketos-mediatek-mt8183" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_sku272() { - pkgdesc="Google Kodama Sku 272" - depends="linux-postmarketos-mediatek-mt8183" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_sku288() { - pkgdesc="Google Kodama Sku 288" - depends="linux-postmarketos-mediatek-mt8183" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - sha512sums=" -8cd59c8d3fb45fbd5e4520dfb01c037e273b264090550f479dab1622f594cf715563945f82ba08c97da455ca0e749aaeab27c45a5d366d08ab24a7077465b262 deviceinfo +78a2288faf43dc60c6c236bb91ef479cff42d7441dadccc67bc35a83dded4c21f082e49851ad7d68dc8b2c8a3002d4a0e1acfb39a506da5ee702e48c6c3141cd deviceinfo bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed sound.conf " diff --git a/device/testing/device-google-kodama/deviceinfo b/device/testing/device-google-kodama/deviceinfo index 1efbf47bb..f429bf82c 100644 --- a/device/testing/device-google-kodama/deviceinfo +++ b/device/testing/device-google-kodama/deviceinfo @@ -7,10 +7,7 @@ deviceinfo_name="Lenovo 10e Chromebook Tablet" deviceinfo_manufacturer="Lenovo" deviceinfo_codename="google-kodama" deviceinfo_year="2020" -deviceinfo_dtb_sku16="mediatek/mt8183-kukui-kodama-sku16" -deviceinfo_dtb_sku32="mediatek/mt8183-kukui-kodama-sku32" -deviceinfo_dtb_sku272="mediatek/mt8183-kukui-kodama-sku272" -deviceinfo_dtb_sku288="mediatek/mt8183-kukui-kodama-sku288" +deviceinfo_dtb="mediatek/mt8183-kukui-kodama-sku16 mediatek/mt8183-kukui-kodama-sku32 mediatek/mt8183-kukui-kodama-sku272 mediatek/mt8183-kukui-kodama-sku288" deviceinfo_modules_initfs="gpu-sched i2c-hid-of hid-multitouch cros-ec-keyb sbs-battery" deviceinfo_arch="aarch64" @@ -28,4 +25,5 @@ deviceinfo_flash_method="none" deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" deviceinfo_cgpt_kpart_size="65536" +deviceinfo_depthcharge_board="kodama" deviceinfo_generate_depthcharge_image="true" diff --git a/device/testing/device-google-krane/APKBUILD b/device/testing/device-google-krane/APKBUILD index a38aac3f6..99046b3aa 100644 --- a/device/testing/device-google-krane/APKBUILD +++ b/device/testing/device-google-krane/APKBUILD @@ -3,8 +3,8 @@ # Co-Maintainer: Jenneron pkgname=device-google-krane pkgdesc="Lenovo IdeaPad Duet Chromebook" -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -12,6 +12,7 @@ options="!check !archcheck" depends=" alsa-ucm-conf-google-kukui depthcharge-tools + linux-postmarketos-mediatek-mt8183 postmarketos-base postmarketos-update-depthcharge-kernel soc-mediatek-mt8183 @@ -21,11 +22,7 @@ source=" deviceinfo modules-load.d/sound.conf " -subpackages=" - $pkgname-kernel-sku0:kernel_sku0 - $pkgname-kernel-sku176:kernel_sku176 - $pkgname-nonfree-firmware:nonfree_firmware -" +subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -44,20 +41,7 @@ nonfree_firmware() { mkdir "$subpkgdir" } -kernel_sku0() { - pkgdesc="Google Krane Sku 0" - depends="linux-postmarketos-mediatek-mt8183" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_sku176() { - pkgdesc="Google Krane Sku 176" - depends="linux-postmarketos-mediatek-mt8183" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - - sha512sums=" -9f54b26fbbb4184dc54727b767b7756ce98bd409e2fbf8566e3d484eadd37b0e99d6383099e29af7d14905756f88b4f14c45d0fe2fd138be37405745c7a8bb34 deviceinfo +3cee30adc42daa052e0cca078c5cdad5b936fb639d240b747382b7c0e4c2a184578cbdf097c24cb792f500e414ee92dc614c7f7fc30ae28aeb8d625639d03542 deviceinfo bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed sound.conf " diff --git a/device/testing/device-google-krane/deviceinfo b/device/testing/device-google-krane/deviceinfo index fa36aa1f2..ffacecfe3 100644 --- a/device/testing/device-google-krane/deviceinfo +++ b/device/testing/device-google-krane/deviceinfo @@ -7,8 +7,7 @@ deviceinfo_name="Lenovo IdeaPad Duet Chromebook" deviceinfo_manufacturer="Lenovo" deviceinfo_codename="google-krane" deviceinfo_year="2020" -deviceinfo_dtb_sku0="mediatek/mt8183-kukui-krane-sku0" -deviceinfo_dtb_sku176="mediatek/mt8183-kukui-krane-sku176" +deviceinfo_dtb="mediatek/mt8183-kukui-krane-sku0 mediatek/mt8183-kukui-krane-sku176" deviceinfo_modules_initfs="gpu-sched i2c-hid-of hid-multitouch cros-ec-keyb sbs-battery" deviceinfo_arch="aarch64" @@ -26,4 +25,5 @@ deviceinfo_flash_method="none" deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" deviceinfo_cgpt_kpart_size="65536" +deviceinfo_depthcharge_board="krane" deviceinfo_generate_depthcharge_image="true" diff --git a/device/testing/device-google-willow/APKBUILD b/device/testing/device-google-willow/APKBUILD index 558410dc8..16d771d7a 100644 --- a/device/testing/device-google-willow/APKBUILD +++ b/device/testing/device-google-willow/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jenneron pkgname=device-google-willow pkgdesc="Acer Chromebook 311 (C722/C722T)" -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -60,7 +60,7 @@ kernel_sku1() { } sha512sums=" -3f36890256150756686085c1de922827d621f402f525eb7a28cc522e24fcf521b740cbe8436a20f6e982647a7060401077beac3a2e3e23f9a61a893e8751687e deviceinfo +a19ddaeb4922df889b851d248a4ac1b3ce7d473b4d67317c8cf20d7a2b655bc17e3c03e2629eaa5c163d7421bce68dc6843a0985d2c9bbd7916eb1806adf436d deviceinfo 37f11d243c4ecfd07bfb74e2d34e4c261db3a6aff755bf2dd08dad998de47e511c21082ca0d181e77e093e6f940fc570d8aef87fbc3a73ba55cb9f34b8c510f2 sound.conf.sku0 bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed sound.conf.sku1 " diff --git a/device/testing/device-google-willow/deviceinfo b/device/testing/device-google-willow/deviceinfo index 5bcca1145..aebeb2af7 100644 --- a/device/testing/device-google-willow/deviceinfo +++ b/device/testing/device-google-willow/deviceinfo @@ -26,4 +26,5 @@ deviceinfo_flash_method="none" deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart" deviceinfo_cgpt_kpart_start="8192" deviceinfo_cgpt_kpart_size="65536" +deviceinfo_depthcharge_board="willow" deviceinfo_generate_depthcharge_image="true"