CODEOWNERS

 # https://docs.gitlab.com/ee/user/project/code_owners.html
 
-device/*/*-pine64-pinephone/        @craftyguy @milesalan
-device/*/*-purism-librem5/          @craftyguy
+device/*/*-pine64-pinephone/        @craftyguy @milesalan @bshah
+device/*/*-purism-librem5/          @craftyguy @bshah
+kde/                                @bshah
 main/osk-sdl/                       @craftyguy
 main/mesa-pvr-dri-classic/          @xc-racer99
-temp/u-boot-librem5/                @craftyguy
+main/postmarketos-ui-plasma-mobile/ @bshah
+temp/u-boot-librem5/                @craftyguy @bshah
 
 # vim: ts=4 sw=4 et

channels.cfg

@@ -3,19 +3,23 @@
 recommended=edge
 
 [edge]
-description=Rolling release channel
+description=Rolling release / Most devices / Occasional breakage: https://postmarketos.org/edge
 branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge
 
-[stable]
-description=Stable release channel (first beta v20.05, does not have many devices yet)
-branch_pmaports=v20.05
-branch_aports=3.12-stable
-mirrordir_alpine=v3.12
-
+# NOTE: "stable", "stable-next" are actually "v20.05" and "v21.03". They will
+# get changed in this file in the near future, keeping the old names for a bit
+# to give everybody time to upgrade to pmbootstrap 1.30.0. More information:
+# https://gitlab.com/postmarketOS/pmbootstrap/-/issues/2015
 [stable-next]
-description=Upcoming second beta v21.03. DO NOT USE.
+description=Latest release / Recommended for best stability
 branch_pmaports=v21.03
 branch_aports=3.13-stable
 mirrordir_alpine=v3.13
+
+[stable]
+description=Old release (unsupported)
+branch_pmaports=v20.05
+branch_aports=3.12-stable
+mirrordir_alpine=v3.12

cross/grub-efi-x86/APKBUILD

@@ -3,10 +3,10 @@
 
 pkgname=grub-efi-x86
 pkgver=2.04
-pkgrel=2
+pkgrel=3
 
 _arch="x86"
-_mirror="http://dl-cdn.alpinelinux.org/alpine/"
+_mirror="http://dl-2.alpinelinux.org/alpine/"
 
 pkgdesc="GRUB $_arch EFI files for every architecture"
 url="https://www.gnu.org/software/grub/"
@@ -21,4 +21,4 @@ package() {
 	rm .PKGINFO .SIGN.*
 }
 
-sha512sums="e14ab6a15a82d66fd38f4e9f99c280124d84fd3e714b261ecf9e7ae0f1b4d08401ecf49de16306fc40459fdd022a724335ab70ef652ff0b8c2f1a9c62531ba94  grub-efi-2.04-r2-x86-edge.apk"
+sha512sums="becaa8f5cacfe9061ff1a34abb2b8530a673d371cc9feb94a8123e114c11087efee0cc5cb024381e37a9d458fc24957a016fda5e7f67dd785c699aebd687be73  grub-efi-2.04-r3-x86-edge.apk"

device/community/device-pine64-pinetab/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-pine64-pinetab
 pkgdesc="PINE64 PineTab"
 pkgver=0.7
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -144,7 +144,7 @@ plasma_mobile() {
 }
 
 sha512sums="8d1ef04911f1cfa7eda8185f4f4d807af23105a7c8f23d8c18f02afeccd8ab124de70c2e2760c154a3128fe3793447039fb0abf37aa496f597d27051e275033e  99-pinetab-keyboard.hwdb
-b04bf42ac8d474320576f0187db6b6a082a4c32c69195f64d7b421583d3d763ae8bc8d9e436d2d4140b580ebef8df980224b6822c70e46eb4114a1527eeb192d  deviceinfo
+a884cdb677d40f733fde5ce57fc2740a29a9f8a4a62d9ac327710a650d0d21d378226653e50d67cd0765f6e6cb81e6a243a92905d0ce8b8d8ab751abb69a79d5  deviceinfo
 6bc22b369b2d9058b702ac7a7862abaefaf8179b43491868bdb008d181b59104f1ded89db1da51a810e1ccdc803a579b924a438674283a65afc3a9c4d2894caf  kirigami-lowpower.sh
 38827d9636c48b133eb333764a6799a6e93454e01ecb0cfde1ecad3ee149606ba59eb1a5e6c8366e3b3891e54bd664a0a5acdd89d38ac3a3551260e9b9a6d3fc  rootston.ini
 9e71c61bfa72b60e749c4dc04f17eb59d25de822765e81e65c937d6be5236d3951a652b69a1ab973abe6add9f34705be5dbaa98bbfa25daf7504dd50b28524c2  sway.conf

device/community/device-pine64-pinetab/deviceinfo

@@ -26,7 +26,7 @@ deviceinfo_dev_internal_storage_repartition="true"
 # Bootloader related
 deviceinfo_flash_method="none"
 deviceinfo_generate_legacy_uboot_initfs="true"
-deviceinfo_sd_embed_firmware="u-boot/pine64-pinephone/u-boot-sunxi-with-spl.bin:8"
+deviceinfo_sd_embed_firmware="u-boot/pine64-pinephone/u-boot-sunxi-with-spl-528.bin:8"
 
 # USB related
 deviceinfo_usb_idVendor="0x1f3a"   # Allwinner Technology Co., Ltd.

device/community/device-purism-librem5/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer:  Clayton Craft <clayton@craftyguy.net>
 pkgname=device-purism-librem5
 pkgdesc="Purism Librem 5 Phone"
-pkgver=1.18
+pkgver=1.19
 pkgrel=0
 _confver=36
 _purismrel=1
@@ -133,7 +133,7 @@ sha512sums="ef2cce6de4e85b14b4a7dee7fe8175d6ca455db38bfe4453b390ac15ad51240dec58
 647cd95872bfa3e533ce2a825f9215315f629c0f2835becd77e3acb07b748a2c662090197de59155ff6e8137165dea877a0b179db4bd8bee3dd3d205f390a656  deviceinfo
 2703c7a4e7f32cf102dfed644a8213497828ae1fe9f3bd789663157f79c8c8ddb05672e5c9a0c6883e9dee42afcfe9578e611dd1d9fe6cd8129d8d7738d28ad2  flash_script.lst
 110630f959e3f3a2acc335d755defeb0f49fb40f46cb2423205511f43d1dfdbb91722271fac34a6cbf04a5f0406e6a34ed77e75555acc3f420041d32224027d6  modprobe.d-ship_mode.conf
-9dc018f0de523cbfe5a49cbe831aa30e975a8dd34635197bb52582f072ac356ef2c02223fc794d970380091a69a83a74c3fbe34520190c8536e77f9ea98c7659  modprobe.d_rsi.conf
+3f62c04eb92d850e32d5e1b17534dec753563342ea6c4f9dc2572700d4f6eeb8ae8cd8e8e4f1b0f5c61f21d87bc61c02212f27313986157220003d78e2d69505  modprobe.d_rsi.conf
 a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f6e65a5d1b1a9099936382c99b49a44303f7b6d77a075a471  modules-load.d_librem5.conf
 8ef4ec7a9e9a4fb801d207e7d94b627aacc9243a93b0ec28e0823a6f44b8102416c040e4ddf499f87bb9dfa960cf6f627b008b79f197f6814b3fd881e18ae8ef  pcscd-librem5-reader.conf
 2618b40eebd3602066ee75ab85cbdbb4cfee498def9879c95a304f05a6eeedf1ab28c5dd9fa5efc8f88c790f49c96458c61d5dfe8a3ca0f96bcc0e244313ab01  pcscd-librem5.initd

device/community/device-purism-librem5/modprobe.d_rsi.conf

@@ -2,4 +2,8 @@
 blacklist rsi_91x
 blacklist rsi_sdio
 # Redpine WIFI module
-options redpine_91x dev_oper_mode=13 rsi_zone_enabled=1 antenna_diversity=1
+# Note: LE coex. disabled, see: https://gitlab.com/postmarketOS/pmaports/-/issues/1042
+options redpine_91x dev_oper_mode=5 rsi_zone_enabled=1 antenna_diversity=1
+# Note: this line re-enables LE, replace above line with this one when LE
+# is fixed:
+# options redpine_91x dev_oper_mode=13 rsi_zone_enabled=1 antenna_diversity=1

device/main/device-pine64-pinephone/APKBUILD

@@ -4,7 +4,7 @@
 # Co-Maintainer: Bart Ribbers <bribbers@disroot.org>
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-pine64-pinephone
-pkgver=0.24
+pkgver=0.25
 pkgrel=0
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
@@ -162,7 +162,7 @@ b53cc6f2531854cc9c1e4c334185a20551d64c8675ee8a8eaa03b99d80808fad421a0f6e99e5be21
 9170da7ac869254644f2fc8d914102f2c16e917dbeb53e33b96c76936711d0540f55fa5c2526d73d5fe244500bc2728bc9d629e2524cf52c573d11e833aee666  60-flashlight.rules
 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5  70-wifi-pm.rules
 7dc2b7c20b4a2b15f597a6417bd01797643dad84a3683b0dee648e030fb6326e9d020307643fdcdf1bb43fc44af9975697e417003bd359610bae2d8ce614fc00  90-modem-eg25.rules
-25cbbda91ea93e1bfe4b1f05d2f50c68e0c23d6392b1c9f437ccb8bf131cb16f7600b42bf3549ccf33aae83432f49c6547c1551c1745f3203961e36100a18a17  deviceinfo
+018deaf7c42753257bb7abbd4e7977bcb74ad8ef6a9ff1fbae12240ccad262c6982454553f5e0073d98a561d5eb1f2150bf24be36cfbe78ad822886b3972cf5a  deviceinfo
 ccbc83b84b5028bc2c8e526759004ce71b50b2675ecffee98f5676c70a3332197a231ff9d2fd46444dd3c0a637ec08ce6125b18240fe6bfc13f624a15192e648  gpsd_device-hook.sh
 1017fc3f325227da58c77abdc59e9735288d91a7ccc63ec784fe0241c523786b617a11ce8045dab2a74ca12a7dd70aaa334af91836418db1e96a3266fecaa4fd  gpsd_pinephone.initd
 3dd6d612c381cb0002049d1974d8fb5aa5a53a1eb4d6bcbf62eb2ad52cfdc45f0f6ad24a699716d3513b0371aa1316f25dc72afc10d7176cc3b99d0965c3f030  hwtest.ini
@@ -173,7 +173,7 @@ f9386dfd902028988c9659bd6e001ba46ea87b35f5dce7723dd4cfbe971928c75f6fef9d706201d6
 cf7d4a611701745762f19746e40d87b6df14a6b24f2d466c4177b7ab5ee87a048bab719a6c66722198020e1aa73d3e12d3715b5588bc33bf207f3e86040dcc44  eg25-pinephone-1.1.toml
 8adeca98002ff8ee850512f72f2e126348cfa817a1aefdd77d103aee76a6b2e6a024deffcbeef1235ee2fcc766003f55b67cedb3eb06ca92a58d5b81f2bf6848  eg25-pinephone-1.2.toml
 f4b5509fd6a8b23f3667f5e7262b3a19c607a37cb9eaf7d0e93eb826d45c26ec12df4810879bacb8e4042bb83cc80b2b436224c8d47b6d67361369a724bbf7ee  sysrq.conf
-b20d4fb9f08a1bbc1c12ce6940e438a00f5c8d400fbc5071e951ffc69f77d2421204472e86f1a7df0488d250f3ec16205b75d4eac8c3cb5521fe9a02ea24865a  uboot-script.cmd
+9d4bcc02c6c501b3a205516c8f276ef4293d88edea61ac725887ec28f9f6788320e9f9edd7f1cf29bbf6122acfad2ef5b3ad5e4b33763fe867bd23d2ac17ed5c  uboot-script.cmd
 de88fc198c11637d9c6465f8a6fb4deab3d0802bdb52ffaa9a08833aa0ef63689b674b12b44cb314f3870d9d21fc3ae55f8db03c9a838860301be60a88e48835  HiFi.conf
 e852b48a687f9b2a0eca444aa3d00a1818aead9f5e5d28e070b51c9d6f8ec648e66f1d88e2bfa94d74533f9ffb9aacc1703da2a06693f85fa04ff97fd7528012  PinePhone.conf
 6c6ffd481a1ac66864f2c713ac4c16c8e112e49a6bc2ff3bb0d492426504cad0e953275a8ed13f247ef8c95bdd1814d9aea934ff76bb4dfada6b1b7b2eedea19  VoiceCall.conf"

device/main/device-pine64-pinephone/deviceinfo

@@ -25,5 +25,5 @@ deviceinfo_dev_internal_storage_repartition="true"
 # Bootloader related
 deviceinfo_flash_method="none"
 deviceinfo_generate_legacy_uboot_initfs="true"
-deviceinfo_sd_embed_firmware="u-boot/pine64-pinephone/u-boot-sunxi-with-spl.bin:8"
+deviceinfo_sd_embed_firmware="u-boot/pine64-pinephone/u-boot-sunxi-with-spl-528.bin:8"
 

device/main/device-pine64-pinephone/uboot-script.cmd

@@ -28,6 +28,11 @@ echo Resizing FDT
 fdt addr ${fdt_addr_r}
 fdt resize
 
+echo Adding FTD RAM clock
+fdt mknode / memory
+fdt set /memory ram_freq ${ram_freq}
+fdt list /memory
+
 echo Booting kernel
 gpio set 116
 gpio clear 98

device/testing/device-amazon-soho/APKBUILD

+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-amazon-soho
+pkgdesc="Amazon Kindle Fire HD (3rd Generation)"
+pkgver=0.1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="postmarketos-base linux-amazon-soho mkbootimg mesa-dri-gallium"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	initfs-hook.sh
+	amazon-omap-boot-hack.sh
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+	install -Dm755 "$srcdir/amazon-omap-boot-hack.sh" "$pkgdir/usr/share/postmarketos-mkinitfs/amazon-omap-boot-hack.sh"
+}
+
+sha512sums="c77494e106caa7c1df36f5b1bc32a178c96eade1f9663d092d59d62935bec30bbe105ba80a591b25335dd3a531800f42bf4cba3a60e063bc093755593d0e7d21  deviceinfo
+1aca985770246b9ca140996a498815b5c9ca3458a6cb84db85825344f01deda8b1de7c88e2e0c610df636ad2179faac7fd90d9992add51186a6449f2d43a3f71  initfs-hook.sh
+8944b00650e0e19bb5d7f6063827b6a8b9627fabe91f770729881813b7492e4c68a58ac14d98d961cade8290e07a44c8e4a162ec3983c6c1ab88149cd4589b34  amazon-omap-boot-hack.sh"

device/testing/device-amazon-soho/amazon-omap-boot-hack.sh

+#!/bin/sh
+
+echo "==> Amending boot.img for Amazon signature verification exploit"
+SOHO_HEADER_DATA='\x50\x03\x00\x00\x00\x25\xe4\x00'
+SOHO_HEADER_SIZE=848
+SOHO_HEADER_OFFSET=52
+tempfile=$(mktemp)
+bootimgfile=$(echo "${1}" | sed 's/initramfs-/boot.img-/g')
+dd if=/dev/zero of="${tempfile}" bs=$SOHO_HEADER_SIZE count=1
+printf "%b" $SOHO_HEADER_DATA | dd of="${tempfile}" bs=$SOHO_HEADER_OFFSET seek=1 conv=notrunc
+cat "${bootimgfile}" >> "${tempfile}"
+mv "${tempfile}" "${bootimgfile}"

device/testing/device-amazon-soho/deviceinfo

+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Amazon Kindle Fire HD (3rd Generation)"
+deviceinfo_manufacturer="Amazon"
+deviceinfo_codename="amazon-soho"
+deviceinfo_year="2013"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="tablet"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="false"
+deviceinfo_screen_width="800"
+deviceinfo_screen_height="1280"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=tty0 mem=1G vmalloc=496M init=/init"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_mkinitfs_postprocess="/usr/share/postmarketos-mkinitfs/amazon-omap-boot-hack.sh"
+deviceinfo_flash_offset_base="0x80000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="2048"

device/testing/device-amazon-soho/initfs-hook.sh

+#!/bin/sh
+
+# Turn overlay0 off and on again to remove bootloader screen
+echo 0 > /sys/devices/platform/omapdss/overlay0/enabled
+echo 1 > /sys/devices/platform/omapdss/overlay0/enabled

device/testing/device-cubietech-cubieboard/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-cubietech-cubieboard
 pkgdesc="Cubietech Cubieboard"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -26,5 +26,5 @@ package() {
 		"$pkgdir"/boot/extlinux/extlinux.conf
 }
 
-sha512sums="90e52b3bfff815a83f3a744a63d4ef0b59368f4227e5fb53a698da89a61a9cd464d63fa8534c3d2693bdd6899b17090b32feaf352d95d3d04cac0b192e151e46  deviceinfo
+sha512sums="1c460057941a34c68f53ad7d63bdfe72e1d83308426920a0fb003da7db51f4a903074ea99281a07671c4bedd5513ee2c279d84278b1973a9935eaf8f91295d45  deviceinfo
 a33dd1a89548eb95d95e07a879bf412985bd01ebfef8e2ddaaa5c3e2d173743c3530148e36a9fc81a07e67b4a35509f06852bd2f652f64a9b6224ce8d7e12d56  extlinux.conf"

device/testing/device-cubietech-cubieboard/deviceinfo

@@ -20,4 +20,4 @@ deviceinfo_getty="ttyS0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_sd_embed_firmware="u-boot/Cubieboard/u-boot-sunxi-with-spl.bin:8"
+deviceinfo_sd_embed_firmware="u-boot/Cubieboard/u-boot-sunxi-with-spl-528.bin:8"

device/testing/device-goclever-gcta741l/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-goclever-gcta741l
 pkgdesc="GoClever Orion 70L"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -56,5 +56,5 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="ae8e102076bb526fdfbe3d507206c0ba253480f545f43cfe9e35a3232b9aed86fde1ef7881fcd5eede57c101012df9d107b29f5e72dffcf6d61d52b16d87f129  deviceinfo
+sha512sums="3b56fc8037e66a25bbbf80b807dcf710ae1d439e3895d3039b9f56a19bf2555eb7c7832e2c1a46535fb2c195e71be36ed3fbd536471afd17145ebdd24e4cccd1  deviceinfo
 26751c01bd998545b60d45f373e6d8356120ee2e49f923e85e1413b34a3aa1bdf9c84a04aac43c487d587e614710f7ade5a293c83a551cf7e3b2a4a90b076420  u-boot-script.cmd"

device/testing/device-goclever-gcta741l/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_screen_height="480"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_sd_embed_firmware="u-boot/goclever-gcta741l/u-boot-sunxi-with-spl.bin:8"
+deviceinfo_sd_embed_firmware="u-boot/goclever-gcta741l/u-boot-sunxi-with-spl-528.bin:8"
 
 # USB related
 deviceinfo_usb_idVendor="0x1f3a"	# Allwinner Technology Co., Ltd.

device/testing/device-lark-freeme-70-2s/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-lark-freeme-70-2s
 pkgdesc="Lark FreeMe 70.2S"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -56,5 +56,5 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="d1560628106729da53886ab98262fdab2cf85c96279274f83451fa783e3e9f0431166971a511259096d44ea34b03fd0394bef88318e2dd337ede550e77a88727  deviceinfo
+sha512sums="4402c2ca3092ecaa99d0e295b3101024ad2d53ad315c0770f6235d53759207c4cfe2b4b269ced92b1f3386dec487e8721f44d4851ded7a0070a42f014de4444c  deviceinfo
 26751c01bd998545b60d45f373e6d8356120ee2e49f923e85e1413b34a3aa1bdf9c84a04aac43c487d587e614710f7ade5a293c83a551cf7e3b2a4a90b076420  u-boot-script.cmd"

device/testing/device-lark-freeme-70-2s/deviceinfo

@@ -21,7 +21,7 @@ deviceinfo_screen_height="480"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_sd_embed_firmware="u-boot/lark-freeme-70-2s/u-boot-sunxi-with-spl.bin:8"
+deviceinfo_sd_embed_firmware="u-boot/lark-freeme-70-2s/u-boot-sunxi-with-spl-528.bin:8"
 
 # USB related
 deviceinfo_usb_idVendor="0x1f3a"	# Allwinner Technology Co., Ltd.