a7y18lte-pmos/pmos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement cache for generated splash screens (#620)

Browse Source
This commit is contained in:
drebrez 2017-09-24 16:24:56 +02:00 committed by Oliver Smith
parent fa8b21b53f
commit fbc909b7f4
2 changed files with 54 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/postmarketos-mkinitfs/APKBUILD
View File

@ -1,5 +1,5 @@
pkgname=postmarketos-mkinitfs pkgname=postmarketos-mkinitfs
pkgver=0.3.7 pkgver=0.3.8
pkgrel=0 pkgrel=0
pkgdesc="Tool to generate initramfs images for postmarketOS" pkgdesc="Tool to generate initramfs images for postmarketOS"
url="https://github.com/postmarketOS" url="https://github.com/postmarketOS"
@ -11,10 +11,6 @@ arch="noarch"
license="GPL2" license="GPL2"
provides="mkinitfs=0.0.1" provides="mkinitfs=0.0.1"
build() {
return 0
}
package() { package() {
mkdir -p "$pkgdir/usr/share/postmarketos-mkinitfs/" mkdir -p "$pkgdir/usr/share/postmarketos-mkinitfs/"
for file in init.sh.in init_functions.sh; do for file in init.sh.in init_functions.sh; do
@ -27,4 +23,4 @@ package() {
} }
sha512sums="91860e61cc42b77c02522ab273cf4793b78ee595a75c026c057522a5e6d1fdcc7ec868cbdaea5912c90dea61483468dc609dc69144a6d8e68ef47c9d1459fdb6 init.sh.in sha512sums="91860e61cc42b77c02522ab273cf4793b78ee595a75c026c057522a5e6d1fdcc7ec868cbdaea5912c90dea61483468dc609dc69144a6d8e68ef47c9d1459fdb6 init.sh.in
32cd3e1a931cc4ae6f7cab7ccfa19231dcfb5c967026059b090b1b97781c29ef6d168478767031e57a010b84505f016f474c178c64221cdf8896865bbe470413 init_functions.sh 32cd3e1a931cc4ae6f7cab7ccfa19231dcfb5c967026059b090b1b97781c29ef6d168478767031e57a010b84505f016f474c178c64221cdf8896865bbe470413 init_functions.sh
8aae74c95df0f0c1cff317d0038c897d7406f29622d9657115b6cab02c6e79ec00b66df8270a1dc62f50ff65483cca96e30810915b24a70fb643ac5a101d65d2 mkinitfs.sh" e7768173dddd67a7c06a26ccacbc9e1528c5ae652a504df75128def591235e6383e2f6824147629845cac28c270e6c4d9810fd57c5676c8f2b54ad940b6bd42f mkinitfs.sh"

72
main/postmarketos-mkinitfs/mkinitfs.sh
View File

@ -198,34 +198,66 @@ create_bootimg()
} }
# Create splash screens # Create splash screens
# $1: "false" to skip clearing the cache if one image is missing
generate_splash_screens() generate_splash_screens()
{ {
width=${deviceinfo_screen_width:-720} [ "$1" != "false" ] && clean="true" || clean="false"
height=${deviceinfo_screen_height:-1280}
pmos-make-splash --text="On-screen keyboard is not implemented yet, plug in a USB cable and run on your PC:\ntelnet 172.16.42.1" \ splash_version=$(apk info -v | grep postmarketos-splash)
--config /etc/postmarketos/splash.ini "$width" "$height" "${tmpdir}/splash-telnet.ppm" splash_config="/etc/postmarketos/splash.ini"
gzip "${tmpdir}/splash-telnet.ppm" splash_config_hash=$(md5sum "$splash_config")
splash_width=${deviceinfo_screen_width:-720}
splash_height=${deviceinfo_screen_height:-1280}
splash_cache_dir="/var/cache/postmarketos-splashes"
pmos-make-splash --text="Loading..." --center \ # Overwrite $@ to easily iterate over the splash screens. Format:
--config /etc/postmarketos/splash.ini "$width" "$height" "${tmpdir}/splash-loading.ppm" # $1: splash_name
gzip "${tmpdir}/splash-loading.ppm" # $2: text
# $3: arguments
set -- "splash-telnet" "On-screen keyboard is not implemented yet, plug in a USB cable and run on your PC:\\ntelnet 172.16.42.1" "" \
"splash-loading" "Loading..." "--center" \
"splash-noboot" "boot partition not found\\nhttps://postmarketos.org/troubleshooting" "--center" \
"splash-noinitramfsextra" "initramfs-extra not found\\nhttps://postmarketos.org/troubleshooting" "--center" \
"splash-nosystem" "system partition not found\\nhttps://postmarketos.org/troubleshooting" "--center" \
"splash-mounterror" "unable to mount root partition\\nhttps://postmarketos.org/troubleshooting" "--center"
pmos-make-splash --text="boot partition not found\nhttps://postmarketos.org/troubleshooting" --center \ # Ensure cache folder exists
--config /etc/postmarketos/splash.ini "$width" "$height" "${tmpdir}/splash-noboot.ppm" mkdir -p "${splash_cache_dir}"
gzip "${tmpdir}/splash-noboot.ppm"
pmos-make-splash --text="initramfs-extra not found\nhttps://postmarketos.org/troubleshooting" --center \ # Loop through the splash screens definitions
--config /etc/postmarketos/splash.ini "$width" "$height" "${tmpdir}/splash-noinitramfsextra.ppm" while [ $# -gt 2 ]
gzip "${tmpdir}/splash-noinitramfsextra.ppm" do
splash_name=$1
splash_text=$2
splash_args=$3
# Compute hash using the following values concatenated:
# - postmarketos-splash package version
# - splash config file
# - device resolution
# - text to be displayed
splash_hash_string="${splash_version}#${splash_config_hash}#${splash_width}#${splash_height}#${splash_text}"
splash_hash="$(echo "${splash_hash_string}" | md5sum | awk '{ print $1 }')"
pmos-make-splash --text="system partition not found\nhttps://postmarketos.org/troubleshooting" --center \ if ! [ -e "${splash_cache_dir}/${splash_name}_${splash_hash}.ppm.gz" ]; then
--config /etc/postmarketos/splash.ini "$width" "$height" "${tmpdir}/splash-nosystem.ppm"
gzip "${tmpdir}/splash-nosystem.ppm"
pmos-make-splash --text="unable to mount root partition\nhttps://postmarketos.org/troubleshooting" --center \ # If a cached file is missing, clear the whole cache and start again skipping this step
--config /etc/postmarketos/splash.ini "$width" "$height" "${tmpdir}/splash-mounterror.ppm" if [ "$clean" = "true" ]; then
gzip "${tmpdir}/splash-mounterror.ppm" rm -f ${splash_cache_dir}/*
generate_splash_screens false
return
fi
# shellcheck disable=SC2086
pmos-make-splash --text="${splash_text}" $splash_args --config "${splash_config}" \
"$splash_width" "$splash_height" "${splash_cache_dir}/${splash_name}_${splash_hash}.ppm"
gzip "${splash_cache_dir}/${splash_name}_${splash_hash}.ppm"
fi
cp "${splash_cache_dir}/${splash_name}_${splash_hash}.ppm.gz" "${tmpdir}/${splash_name}.ppm.gz"
shift 3 # move to the next 3 arguments
done
} }
# Append the correct device tree to the linux image file # Append the correct device tree to the linux image file