From 3d28282ac72816c682896edcdb2b3ee6a681d54e Mon Sep 17 00:00:00 2001 From: Newbyte Date: Wed, 14 Sep 2022 18:14:54 +0200 Subject: [PATCH] temp/calamares-extensions: drop (MR 3439) Patch has been moved to Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/38950 --- ...ease-timeout-for-PartitionJob-10-min.patch | 43 ------- temp/calamares-extensions/APKBUILD | 118 ------------------ 2 files changed, 161 deletions(-) delete mode 100644 temp/calamares-extensions/0001-increase-timeout-for-PartitionJob-10-min.patch delete mode 100644 temp/calamares-extensions/APKBUILD diff --git a/temp/calamares-extensions/0001-increase-timeout-for-PartitionJob-10-min.patch b/temp/calamares-extensions/0001-increase-timeout-for-PartitionJob-10-min.patch deleted file mode 100644 index 37f6f993e..000000000 --- a/temp/calamares-extensions/0001-increase-timeout-for-PartitionJob-10-min.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 517ac0278347e1127bb7ba855c75cffee3f56204 Mon Sep 17 00:00:00 2001 -From: Oliver Smith -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:

" -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 - diff --git a/temp/calamares-extensions/APKBUILD b/temp/calamares-extensions/APKBUILD deleted file mode 100644 index 82df30bd6..000000000 --- a/temp/calamares-extensions/APKBUILD +++ /dev/null @@ -1,118 +0,0 @@ -# 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 -"