channels.cfg

@@ -15,7 +15,7 @@ branch_aports=3.16-stable
 mirrordir_alpine=v3.16
 
 [v21.12]
-description=Old release (supported until 2022-07-12)
+description=Old release (unsupported)
 branch_pmaports=v21.12
 branch_aports=3.15-stable
 mirrordir_alpine=v3.15

device/community/device-pine64-pinephonepro/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
-pkgver=3.0
-pkgrel=2
+pkgver=3.2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -112,8 +112,8 @@ nonfree_firmware() {
 
 sha512sums="
 fdfa807c0de33aee3deb09ee25c37a58fa970ce71483e52f21793717cb89adeb74f251ff1a2c2086361e3e58877f8b2e5643f24186b1a537acf9c16e3419313c  90-modem-eg25.rules
-195ea87f346e09b781d7925bcb7752a25d27f4396e1512ae15582526c062261516f918703c633730f56becb9f5c94020cc46ef6dc9d960b4a29208f03e3b70b8  deviceinfo
-e69752fc7f2b8552ba2e1e6da5b6bec0e284c7f14bc09576c862faeb5154a44522535a919ae5aca33a22fd14557e802595a7c96c59b9362c5ac5b991a8eac5fc  grub.cfg
+e591572d0bfc4d7d990fcc15bc82e78e60404becf62a38283b4ceee6f49a812b63eebbc5c304907330e33dce5f023edba26c9b86f1375affa3cf6b49fbd06539  deviceinfo
+eeddbd3712c7385ef8daea252d71f9f91f8be03be43dea4ce036ae7d7b8a38d199a709ae87b9aa8fe8a63f0201224dbda704fd4b95c8c7d3b4f9852ae4e95c11  grub.cfg
 0f9357d4eea089628fbceb1e3e96d21a3f4329aeb6743158a6f877f967ef274506404eba949d5f01b7e1adea149f9a3aef992a5e8cd4181f93ab00909b1c5ecd  grub_early.cfg
 1684514a6b814a83473e9da8855fd776cf3f31a2be1f8834c370f710428b4ee305559e275be52894d167ccd1e32f8f1c8586f8a072f19e44b46caec9f504d453  HiFi.conf
 9c6edbe7ea387baf9bfa6c4a46b28c4fe274ab0994e0a1640012048407e6679c437de43cc50e6778c9a852132eaa680de3fd4e0256d36455d1dd57aa729ac8be  PINE64-PinePhonePro-.conf

device/community/device-pine64-pinephonepro/deviceinfo

@@ -19,7 +19,7 @@ deviceinfo_screen_height="1440"
 deviceinfo_getty="ttyS2;115200"
 
 # Installer related
-deviceinfo_dev_internal_storage="/dev/mmcblk2"
+deviceinfo_dev_internal_storage="/dev/mmcblk0"
 deviceinfo_dev_internal_storage_repartition="true"
 
 # Bootloader related

device/community/device-pine64-pinephonepro/grub.cfg

 timeout=0
 
 menuentry "postmarketOS" {
-	linux ($root)/vmlinuz console=tty0 earlycon=uart8250,mmio32,0xff1a0000 console=ttyS2,115200 panic=10 coherent_pool=1M loglevel=5 mem_sleep_default=s2idle PMOS_NO_OUTPUT_REDIRECT fw_devlink=off 
+	linux ($root)/vmlinuz console=tty0 earlycon=uart8250,mmio32,0xff1a0000 console=ttyS2,115200 panic=10 coherent_pool=1M loglevel=1 mem_sleep_default=s2idle PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE fw_devlink=off
 	initrd ($root)/initramfs
 }

device/main/device-qemu-aarch64/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 # Co-Maintainer: Daniele Debernardi <drebrez@gmail.com>
 pkgname=device-qemu-aarch64
-pkgver=2.4
-pkgrel=3
+pkgver=3
+pkgrel=0
 pkgdesc="Simulated device in QEMU (aarch64)"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -13,6 +13,8 @@ makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-kernel-lts:kernel_lts
 	$pkgname-kernel-virt:kernel_virt
+	$pkgname-kernel-edge:kernel_edge
+	$pkgname-kernel-edge4virt:kernel_edge4virt
 	$pkgname-mce
 	$pkgname-sway
 	$pkgname-weston
@@ -64,6 +66,18 @@ kernel_lts() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
+kernel_edge() {
+	pkgdesc="Alpine Edge kernel"
+	depends="linux-edge linux-firmware-none"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_edge4virt() {
+	pkgdesc="Alpine Edge4Virt kernel"
+	depends="linux-edge4virt linux-firmware-none"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 sha512sums="
 7dbe34f2aa8f30ab5284007d43c49e2a3c74135dcabcf1f5915afbceb645277152099c808dac5c004db51be9abb34b2976c7336d0f52ed143b23c4d6cdeb061e  deviceinfo
 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad  mce-display-blanking.conf

device/main/device-qemu-amd64/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 # Co-Maintainer: Daniele Debernardi <drebrez@gmail.com>
 pkgname=device-qemu-amd64
-pkgver=2.5
-pkgrel=3
+pkgver=3
+pkgrel=0
 pkgdesc="Simulated device in QEMU (x86_64)"
 url="https://postmarketos.org"
 arch="x86_64"
@@ -13,6 +13,8 @@ makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-kernel-lts:kernel_lts
 	$pkgname-kernel-virt:kernel_virt
+	$pkgname-kernel-edge:kernel_edge
+	$pkgname-kernel-edge4virt:kernel_edge4virt
 	$pkgname-mce
 	$pkgname-sway
 	$pkgname-weston
@@ -63,6 +65,18 @@ kernel_lts() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
+kernel_edge() {
+	pkgdesc="Alpine Edge kernel"
+	depends="linux-edge linux-firmware-none"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_edge4virt() {
+	pkgdesc="Alpine Edge4Virt kernel"
+	depends="linux-edge4virt linux-firmware-none"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 sha512sums="
 0c9b4b50073dc6bf6bfecb07370254f0dd8a277acbc1d90a605c7891e7d00c1c211545b296b7a1a7a6e00bce05a4197102fcfa449f113f2b500d8879ad29c6bf  deviceinfo
 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad  mce-display-blanking.conf

device/testing/device-samsung-d2vzw/APKBUILD

+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-samsung-d2vzw
+pkgdesc="Samsung Galaxy S III (Verizon)"
+pkgver=0.1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="postmarketos-base linux-samsung-d2vzw mkbootimg mesa-dri-gallium"
+makedepends="devicepkg-dev"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+da8f0dae9288c57809d88ea20ecf0718e84cef86d80ccddec4d5d5dacd4c16943d6add13b7a3d4ca6878688cc1af524c37498d7b5c93616bb01d8278efe8a96e  deviceinfo
+"

device/testing/device-samsung-d2vzw/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="Samsung Galaxy S III (Verizon)"
+deviceinfo_manufacturer="Samsung"
+deviceinfo_codename="samsung-d2vzw"
+deviceinfo_year="2012"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="720"
+deviceinfo_screen_height="1280"
+
+# Bootloader related
+deviceinfo_flash_method="heimdall-bootimg"
+deviceinfo_kernel_cmdline="androidboot.hardware=qcom user_debug=31 zcache buildvariant=userdebug"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_offset_base="0x80200000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01500000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="2048"
+deviceinfo_flash_heimdall_partition_kernel="BOOT"
+deviceinfo_flash_heimdall_partition_system="SYSTEM"

device/testing/linux-samsung-d2vzw/APKBUILD

+# Reference: <https://postmarketos.org/vendorkernel>
+
+pkgname=linux-samsung-d2vzw
+pkgver=3.4.112
+pkgrel=0
+pkgdesc="Samsung Galaxy S III (Verizon) kernel fork"
+arch="armv7"
+_carch="arm"
+_flavor="samsung-d2vzw"
+url="https://kernel.org"
+license="GPL-2.0-only"
+options="!strip !check !tracedeps pmb:cross-native"
+makedepends="bash bc bison devicepkg-dev flex gcc6 openssl-dev perl xz"
+
+# Compiler: GCC 6 (doesn't compile successfully when using newer versions)
+if [ "${CC:0:5}" != "gcc6-" ]; then
+	CC="gcc6-$CC"
+	HOSTCC="gcc6-gcc"
+	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
+fi
+
+# Source
+_repository="android_kernel_samsung_d2"
+_commit="716f00ee2e86adfd507842c5f193a738b57d3c49"
+_config="config-$_flavor.$arch"
+source="
+	$pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz
+	$_config
+	gcc7-give-up-on-ilog2-const-optimizations.patch
+	gcc8-fix-put-user.patch
+	kernel-use-the-gnu89-standard-explicitly.patch
+"
+builddir="$srcdir/$_repository-$_commit"
+_outdir="out"
+
+prepare() {
+	default_prepare
+	. downstreamkernel_prepare
+}
+
+build() {
+	unset LDFLAGS
+	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
+}
+
+package() {
+	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
+}
+
+sha512sums="
+6850231f0596dd272b4f963d20c77aee6ed16a1ba47261dbafe11ffccac695427db54efa71d070525c519885b795395e9ac6ca97fa06ccc36131aba1f95aa715  linux-samsung-d2vzw-716f00ee2e86adfd507842c5f193a738b57d3c49.tar.gz
+63c3c77b8cbb2a1837eb13a6e40a0bb43e83306febbdaec068d0cd45264147f788a3b5e79ef1235d7379c205095550795dbc8aeead8e066792f4b96c40261cae  config-samsung-d2vzw.armv7
+77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
+197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
+ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c  kernel-use-the-gnu89-standard-explicitly.patch
+"

device/testing/linux-samsung-d2vzw/gcc7-give-up-on-ilog2-const-optimizations.patch

+../../.shared-patches/linux/gcc7-give-up-on-ilog2-const-optimizations.patch
\ No newline at end of file

device/testing/linux-samsung-d2vzw/gcc8-fix-put-user.patch

+../../.shared-patches/linux/gcc8-fix-put-user.patch
\ No newline at end of file

device/testing/linux-samsung-d2vzw/kernel-use-the-gnu89-standard-explicitly.patch

+../../.shared-patches/linux/kernel-use-the-gnu89-standard-explicitly.patch
\ No newline at end of file

main/postmarketos-ondev/APKBUILD

 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-ondev
-pkgver=0.7.4
-pkgrel=1
+pkgver=0.8.1
+pkgrel=0
 pkgdesc="Calamares based on-device installer"
 url="https://postmarketos.org"
 # armhf blocked by qt5-qtdeclarative
@@ -48,5 +48,5 @@ package() {
 }
 
 sha512sums="
-57abb9c22a9eddf6369dcb96b5a86e518d3f10396b622b5358e718eec898fff1c133f30bb55471d0615eaa69b835679dbece336221f3ea17f5cef5a7a904bd9c  postmarketos-ondev-0.7.4.tar.gz
+259c1d771edf4722b3ef2959c0cb381e684f7db54079012d7ed76e389f7671106c7c5cea27e9e33c2fbd8bcac1cded9c43913639c98772465648df505c5495c3  postmarketos-ondev-0.8.1.tar.gz
 "

temp/calamares-extensions/0001-increase-timeout-for-PartitionJob-10-min.patch

+From 517ac0278347e1127bb7ba855c75cffee3f56204 Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Mon, 11 Jul 2022 08:05:11 +0200
+Subject: [PATCH] increase timeout for PartitionJob: 10 min
+
+Increase the PartitionJob's timeout from 2 min to 10 min, as there was
+an report of hitting the timeout with the PinePhone Pro's 128 GiB eMMC.
+
+Related: https://gitlab.com/postmarketOS/pmaports/-/merge_requests/3280#note_1021536268
+---
+ modules/mobile/PartitionJob.cpp | 2 +-
+ modules/mobile/wait.qml         | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/mobile/PartitionJob.cpp b/modules/mobile/PartitionJob.cpp
+index 38ca1ae..db2e5bb 100644
+--- a/modules/mobile/PartitionJob.cpp
++++ b/modules/mobile/PartitionJob.cpp
+@@ -118,7 +118,7 @@ PartitionJob::exec()
+         const QString pathRoot = "/";
+ 
+         ProcessResult res
+-            = System::runCommand( System::RunLocation::RunInHost, args, pathRoot, stdInput, chrono::seconds( 120 ) );
++            = System::runCommand( System::RunLocation::RunInHost, args, pathRoot, stdInput, chrono::seconds( 600 ) );
+         if ( res.getExitCode() )
+         {
+             return JobResult::error( "Command failed:<br><br>"
+diff --git a/modules/mobile/wait.qml b/modules/mobile/wait.qml
+index 9bf561d..0978764 100644
+--- a/modules/mobile/wait.qml
++++ b/modules/mobile/wait.qml
+@@ -38,7 +38,7 @@ Page
+             anchors.topMargin: 150
+             wrapMode: Text.WordWrap
+             text: "Formatting and mounting target partition. This may" +
+-                  " take up to two minutes, please be patient."
++                  " take up to ten minutes, please be patient."
+             width: 500
+         }
+     }
+-- 
+2.30.2
+

temp/calamares-extensions/APKBUILD

+# Forked from Alpine to temporarily add a patch to increase timeout. Remove
+# this fork and update the alpine package once the PR is merged and a new
+# calamares-extensions release is tagged.
+# https://github.com/calamares/calamares-extensions/pull/20
+
+# Do not change arch to noarch, until this bug is resolved:
+# https://gitlab.alpinelinux.org/alpine/abuild/-/issues/10022
+pkgname=calamares-extensions
+pkgver=1.2.1
+pkgrel=2
+# armhf blocked by qt5-qtdeclarative
+# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> calamares
+arch="all !armhf !ppc64le !s390x !riscv64"
+url="https://github.com/calamares/calamares-extensions"
+pkgdesc="Calamares Branding and Module Examples"
+license="GPL-3.0-or-later"
+makedepends="
+	calamares-dev
+	qt5-qtsvg-dev
+	qt5-qtdeclarative-dev
+	"
+source="
+	https://github.com/calamares/calamares-extensions/releases/download/v$pkgver/calamares-extensions-$pkgver.tar.gz
+	0001-increase-timeout-for-PartitionJob-10-min.patch
+	"
+options="!check" # has no tests
+
+# Modules and brandings to build:
+# https://github.com/calamares/calamares-extensions/tree/calamares/modules
+# https://github.com/calamares/calamares-extensions/tree/calamares/branding
+_modules="
+	mobile
+	"
+_brandings="
+	default-mobile
+	"
+
+for i in $_modules; do
+	subpackages="$pkgname-mod-$i:_module $subpackages"
+done
+for i in $_brandings; do
+	subpackages="$pkgname-brand-$i:_branding $subpackages"
+done
+
+# Check if one module/branding is enabled
+# $1: name of module/branding
+# $2: either $_modules or $_brandings
+is_enabled() {
+	local i
+	for i in $2; do
+		[ "$i" = "$1" ] && return 0
+	done
+	return 1
+}
+
+# Check if string $1 is in CMakeLists.txt and comment it out
+comment_out() {
+	sed -i "s~$1~#&~g" "$builddir/CMakeLists.txt"
+}
+
+prepare() {
+	default_prepare
+
+	local i
+
+	msg "disabled modules:"
+	cd "$builddir/modules"
+	for i in *; do
+		if ! [ -d "$i" ] || is_enabled "$i" "$_modules"; then
+			continue
+		fi
+		echo " - $i"
+		comment_out "calamares_add_module_subdirectory( modules/$i "
+	done
+
+	msg "disabled brandings:"
+	cd "$builddir/branding"
+	for i in *; do
+		if ! [ -d "$i" ] || is_enabled "$i" "$_brandings"; then
+			continue
+		fi
+		echo " - $i"
+		comment_out "calamares_add_branding_subdirectory( branding/$i "
+	done
+}
+
+build() {
+	cmake -B build \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib
+	cmake --build build
+}
+
+_module() {
+	local module=${subpkgname##calamares-extensions-mod-}
+	local path="usr/lib/calamares/modules"
+
+	mkdir -p "$subpkgdir/$path"
+	mv "$pkgdir/$path/$module" "$subpkgdir/$path/$module"
+}
+
+_branding() {
+	local branding=${subpkgname##calamares-extensions-brand-}
+	local path="usr/share/calamares/branding"
+
+	mkdir -p "$subpkgdir/$path"
+	mv "$pkgdir/$path/$branding" "$subpkgdir/$path/$branding"
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+dae305835656b88fd17a306c21ec49b904ee77d9db34144d29702fb4de9f7cb3eed93e694e0d047722b4ff949f44e99b0e2054eb2d5b4a1645b2e5ead8e81893  calamares-extensions-1.2.1.tar.gz
+bf5ba15b6a1a59540f826274056b2aa4d71242882d89ae161babee542c0bdc5c85ffd348957918e96f1cfb93b6007a1b3c5aa0894985a8a80babd7c3907c45f9  0001-increase-timeout-for-PartitionJob-10-min.patch
+"