forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

main/postmarketos-mkinitfs: add deviceinfo_framebuffer_landscape (!546)

Browse source 
Use deviceinfo_framebuffer_landscape during splash screen generation.
Also add the postmarketos-splash arguments variable to the computation
of the hash for the cache.

Adjust device-pine-pinetab to use the new variable, and therefore rotate
its splash screen.

[ci:skip-build]: already built successfully in CI
This commit is contained in:
Daniele Debernardi 2019-08-05 23:22:23 +02:00 committed by Oliver Smith
parent 29e53f44ee
commit e4e38c2001
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
device/device-pine-pinetab/APKBUILD
View file

@ -2,7 +2,7 @@
pkgname="device-pine-pinetab" pkgname="device-pine-pinetab"
pkgdesc="Pine64 Pinetab" pkgdesc="Pine64 Pinetab"
pkgver=0.1 pkgver=0.1
pkgrel=0 pkgrel=1
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
@ -44,6 +44,6 @@ package() {
} }
sha512sums="ae788279ad03c48ae5846b81c0c544ba3da9f17d044d3e74cde8fb0d5b33259bf8ded6507542389d9e506a8ca38f76866a7291458d630d2de11adb6ddf85c5f4 deviceinfo sha512sums="78b3414f198f2efbfcb12d6240e26a34cd48f00f75a0469c57c372a84aaac75a8f5ddd23f8cb1c16b9a9de6b2a11a8f537a1cd486f75dfbce213541f6890211b deviceinfo
2aabfeff137e6ecbbb2cf9353d6ae69a0c4fe3f75064164c5e9edde750b035b9d7ab9c10000bb93d1a71cc9b357d469c86d7b9b3ffa0466da8ee229ac59e6c56 uboot-script.cmd 2aabfeff137e6ecbbb2cf9353d6ae69a0c4fe3f75064164c5e9edde750b035b9d7ab9c10000bb93d1a71cc9b357d469c86d7b9b3ffa0466da8ee229ac59e6c56 uboot-script.cmd
9e71c61bfa72b60e749c4dc04f17eb59d25de822765e81e65c937d6be5236d3951a652b69a1ab973abe6add9f34705be5dbaa98bbfa25daf7504dd50b28524c2 sway.conf" 9e71c61bfa72b60e749c4dc04f17eb59d25de822765e81e65c937d6be5236d3951a652b69a1ab973abe6add9f34705be5dbaa98bbfa25daf7504dd50b28524c2 sway.conf"

1
device/device-pine-pinetab/deviceinfo
View file

@ -18,6 +18,7 @@ deviceinfo_screen_height="800"
deviceinfo_dev_touchscreen="" deviceinfo_dev_touchscreen=""
deviceinfo_dev_touchscreen_calibration="" deviceinfo_dev_touchscreen_calibration=""
deviceinfo_dev_keyboard="" deviceinfo_dev_keyboard=""
deviceinfo_framebuffer_landscape="true"
# Bootloader related # Bootloader related
deviceinfo_flash_method="none" deviceinfo_flash_method="none"

4
main/postmarketos-mkinitfs/APKBUILD
View file

@ -1,5 +1,5 @@
pkgname=postmarketos-mkinitfs pkgname=postmarketos-mkinitfs
pkgver=0.7.11 pkgver=0.7.12
pkgrel=0 pkgrel=0
pkgdesc="Tool to generate initramfs images for postmarketOS" pkgdesc="Tool to generate initramfs images for postmarketOS"
url="https://postmarketos.org" url="https://postmarketos.org"
@ -26,4 +26,4 @@ package() {
sha512sums="3b7d697381a45a6a165d195d25a26e71773794ebc4a0d8b425321e5bb68a02405028d9712848982b2573474b7b1ee2560091c41f7f51b9e2e962eeb5204a72aa init.sh.in sha512sums="3b7d697381a45a6a165d195d25a26e71773794ebc4a0d8b425321e5bb68a02405028d9712848982b2573474b7b1ee2560091c41f7f51b9e2e962eeb5204a72aa init.sh.in
9632fe7960d72da7efe9b765de72600ed8c5e38441652d7687c03138b53347f09d9f9dd66b16405b8c46969d5ea672f30c00a861841e5cdc7249182e2fdf9b27 init_functions.sh 9632fe7960d72da7efe9b765de72600ed8c5e38441652d7687c03138b53347f09d9f9dd66b16405b8c46969d5ea672f30c00a861841e5cdc7249182e2fdf9b27 init_functions.sh
6e0e6a08d17c5b6f22d049d51692819ebb9a86d4ef7307e384077a868ace61aaa0a59b9166cb8494142ddf150cd1d204f13889b3afd5108b2a4a95a8ecda9444 mkinitfs.sh" 278af467f0e5396d0adacce75fde6e31dea4eae9e418fd1a7f9e64b878a5cbf1db6dc0d557b84f94eb84a691a608dcfc5d4654c9d1bfe67f25c9e928a7d5608b mkinitfs.sh"

7
main/postmarketos-mkinitfs/mkinitfs.sh
View file

@ -327,12 +327,17 @@ generate_splash_screens()
splash_text=$2 splash_text=$2
splash_args=$3 splash_args=$3
if [ "${deviceinfo_framebuffer_landscape}" == "true" ]; then
splash_args="${splash_args} --landscape"
fi
# Compute hash using the following values concatenated: # Compute hash using the following values concatenated:
# - postmarketos-splash package version # - postmarketos-splash package version
# - splash config file # - splash config file
# - device resolution # - device resolution
# - text to be displayed # - text to be displayed
splash_hash_string="${splash_version}#${splash_config_hash}#${splash_width}#${splash_height}#${splash_text}" # - extra arguments
splash_hash_string="${splash_version}#${splash_config_hash}#${splash_width}#${splash_height}#${splash_text}#${splash_args}"
splash_hash="$(echo "${splash_hash_string}" | md5sum | awk '{ print $1 }')" splash_hash="$(echo "${splash_hash_string}" | md5sum | awk '{ print $1 }')"
if ! [ -e "${splash_cache_dir}/${splash_name}_${splash_hash}.ppm.gz" ]; then if ! [ -e "${splash_cache_dir}/${splash_name}_${splash_hash}.ppm.gz" ]; then