From 330420c64850c6ff1c0c2bd50e39dea97b6fc7f1 Mon Sep 17 00:00:00 2001 From: Anton Bambura Date: Wed, 12 Oct 2022 02:31:49 +0300 Subject: [PATCH] veyron chromebooks: use linux-google-veyron (MR 3524) [ci:skip-build] Already built successfuly on CI in MR --- device/testing/device-google-veyron-jerry/APKBUILD | 8 ++++---- device/testing/device-google-veyron-jerry/extlinux.conf | 2 +- device/testing/device-google-veyron-minnie/APKBUILD | 8 ++++---- device/testing/device-google-veyron-minnie/grub.cfg | 2 +- device/testing/device-google-veyron-speedy/APKBUILD | 8 ++++---- device/testing/device-google-veyron-speedy/grub.cfg | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/device/testing/device-google-veyron-jerry/APKBUILD b/device/testing/device-google-veyron-jerry/APKBUILD index e33516883..167a77602 100644 --- a/device/testing/device-google-veyron-jerry/APKBUILD +++ b/device/testing/device-google-veyron-jerry/APKBUILD @@ -3,15 +3,15 @@ # Co-Maintainer: Jenneron pkgname=device-google-veyron-jerry pkgdesc="Google Veyron Jerry Chromebook" -pkgver=0.6 -pkgrel=2 +pkgver=1 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends=" alsa-ucm-conf>=1.2.7.1-r0 - linux-postmarketos-rockchip + linux-google-veyron postmarketos-base " makedepends="devicepkg-dev" @@ -39,5 +39,5 @@ nonfree_firmware() { sha512sums=" f03a663bdf5af04b0270a4c004877cc80496e9a11c6a144e62f5bffb93f8eaef0a0b9b55c6b3a85e13e2539f0e24781148c9676e1c8be50961aaf49fed224424 deviceinfo -9633b95a87d74a6668d2f2c30aaf187149a3a72c8c5734c5fb4094bcbc2fa9a519d35f6b8992a402aa3e003ce94b430b43ad5a8be774bfb2b4a353701c807f28 extlinux.conf +9a61a6c2fa0ef67db8d745f6db1ffc9ebcd6275279fd42a1466bf8d96b2b4a73c366a41d3986b535f8d287b70a76970f89fbd60ef3da773c2f7aaf02937fdcbe extlinux.conf " diff --git a/device/testing/device-google-veyron-jerry/extlinux.conf b/device/testing/device-google-veyron-jerry/extlinux.conf index ab0653706..6d6c65760 100644 --- a/device/testing/device-google-veyron-jerry/extlinux.conf +++ b/device/testing/device-google-veyron-jerry/extlinux.conf @@ -4,7 +4,7 @@ menu title boot prev kernel label POSTMARKETOS kernel /vmlinuz - fdt /dtbs-postmarketos-rockchip/rk3288-veyron-jerry.dtb + fdt /dtbs/rk3288-veyron-jerry.dtb initrd /initramfs append console=ttyS2,115200n8 earlyprintk=ttyS2,115200n8 console=tty1 nosplash panic=10 loglevel=5 diff --git a/device/testing/device-google-veyron-minnie/APKBUILD b/device/testing/device-google-veyron-minnie/APKBUILD index fd6bad19a..dcc827c66 100644 --- a/device/testing/device-google-veyron-minnie/APKBUILD +++ b/device/testing/device-google-veyron-minnie/APKBUILD @@ -3,8 +3,8 @@ # Co-Maintainer: Jenneron pkgname=device-google-veyron-minnie pkgdesc="ASUS Chromebook Flip C100" -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" @@ -12,7 +12,7 @@ arch="armv7" options="!check !archcheck pmb:strict" depends=" alsa-ucm-conf>=1.2.7.1-r0 - linux-postmarketos-rockchip + linux-google-veyron u-boot-veyron-minnie postmarketos-base " @@ -85,7 +85,7 @@ phosh() { sha512sums=" d41d4e356cb8723a5cb5d3bd7f221f0892bc0d8a5b7daece67058f8308a7edd9ca8ac16a1305b4667b2964ec5685d7dadbf2a96f4ea81789f8a885a4ec6f3525 deviceinfo e53ca475830930ecfc1fd537702e850e2abcb66fbed521cb6c3a2918d762649254bd0244ec93a47b20dfc593ec3afc9bdebdec1759a7bc96dcbe4800f40893da 90-tap-to-click.conf -12111792627ec074b0c0300d79d903dcf48b17556407e8d3f9aa50a99b6f31767b754ff9f5ff7da0ce1020d49ba8a648f66f559ed71ce505d8c99d472ab0427e grub.cfg +21624192f017b03ce0619deab6eb743592b7dd12dc4e288068c7354e887169e2a4cb3b2f069e95728ec4dfa3d5304a031a961cb247b4efc3ee31a4ce6a08f505 grub.cfg bd63cfc97d37e81dd9559dad60f330c10dc280afd20081495c6302960fcacf32954e3edab53294fcd5278e86c53c47a95b345a8d9e18807d88fe4313d519d259 phoc.ini 754eb3c09aadf552aaea3ade7cddf737769f800ddeafbf0665b61141397a58bea4595652ec3d7d1803863257cd163114a330f040a3f2352051b2215f7efa46a6 pointercal " diff --git a/device/testing/device-google-veyron-minnie/grub.cfg b/device/testing/device-google-veyron-minnie/grub.cfg index caa0dddc6..e0997cee0 100644 --- a/device/testing/device-google-veyron-minnie/grub.cfg +++ b/device/testing/device-google-veyron-minnie/grub.cfg @@ -3,5 +3,5 @@ timeout=0 menuentry "postmarketOS" { linux /vmlinuz console=null initrd /initramfs - devicetree /dtbs-postmarketos-rockchip/rk3288-veyron-minnie.dtb + devicetree /dtbs/rk3288-veyron-minnie.dtb } diff --git a/device/testing/device-google-veyron-speedy/APKBUILD b/device/testing/device-google-veyron-speedy/APKBUILD index 868857309..0a15ec9e4 100644 --- a/device/testing/device-google-veyron-speedy/APKBUILD +++ b/device/testing/device-google-veyron-speedy/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jenneron pkgname=device-google-veyron-speedy pkgdesc="ASUS Chromebook C201" -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" @@ -11,7 +11,7 @@ arch="armv7" options="!check !archcheck pmb:strict" depends=" alsa-ucm-conf>=1.2.7.1-r0 - linux-postmarketos-rockchip + linux-google-veyron u-boot-veyron-speedy postmarketos-base " @@ -80,6 +80,6 @@ phosh() { sha512sums=" 104a29143e44713c28ef576c96f3ae856041fd2e05dbff0505fcc85da3a1931f79e6854fbc9dd3e48182d08bb152194d1e4077d1c6a05fda3b10928c8b2bb789 deviceinfo e53ca475830930ecfc1fd537702e850e2abcb66fbed521cb6c3a2918d762649254bd0244ec93a47b20dfc593ec3afc9bdebdec1759a7bc96dcbe4800f40893da 90-tap-to-click.conf -0e3cbcd1a61209c60d3df594deea70c71aa41ba5af9e971e55f44b3a1a557bff37970442c881e8f4ea45240a1ed71845b8031373ba0c213c493ad1d9a2ccf1c8 grub.cfg +8c40a36932830871dcc406efc35fc7535c834ece0a0540cd0af6b57795b9ed0aff7d41d765ef83b38c1bcd3f215827244b9d74bc29e65f33dc1dafc96416ceeb grub.cfg bd63cfc97d37e81dd9559dad60f330c10dc280afd20081495c6302960fcacf32954e3edab53294fcd5278e86c53c47a95b345a8d9e18807d88fe4313d519d259 phoc.ini " diff --git a/device/testing/device-google-veyron-speedy/grub.cfg b/device/testing/device-google-veyron-speedy/grub.cfg index 1f1e02d64..df0f897cb 100644 --- a/device/testing/device-google-veyron-speedy/grub.cfg +++ b/device/testing/device-google-veyron-speedy/grub.cfg @@ -3,5 +3,5 @@ timeout=0 menuentry "postmarketOS" { linux /vmlinuz console=null initrd /initramfs - devicetree /dtbs-postmarketos-rockchip/rk3288-veyron-speedy.dtb + devicetree /dtbs/rk3288-veyron-speedy.dtb }