Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

main/boot-deploy: use busybox sh (MR 5960)

Browse source 
boot-deploy uses 'local', which technically isn't POSIX-compliant
and if someone has 'sh' from something else that strictly adheres to
POSIX then boot-deploy will fail.
This is a workaround for https://gitlab.postmarketos.org/postmarketOS/boot-deploy/-/issues/38

[ci:skip-build]: already built successfully in CI
This commit is contained in:
Clayton Craft 2024-12-30 14:28:30 -08:00
parent 755132f651
commit dcc527966d
No known key found for this signature in database
GPG key ID: 4A4CED6D7EDF950A
2 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
main/boot-deploy/APKBUILD
View file

@ -1,14 +1,16 @@
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=boot-deploy
pkgver=0.18
pkgrel=2
pkgrel=3
pkgdesc="tool for finalizing and deploying boot related files"
url="https://gitlab.com/postmarketos/boot-deploy"
arch="noarch"
license="GPL-2.0-or-later"
source="
os-customization
https://gitlab.postmarketos.org/postmarketOS/boot-deploy/-/archive/$pkgver/boot-deploy-$pkgver.tar.gz
os-customization
use-busybox-sh.patch
"
check() {
@ -27,6 +29,7 @@ package() {
"$pkgdir"/usr/share/mkinitfs-triggers/boot-deploy
}
sha512sums="
a243975b9850d9933e0f917f7eb38fc4a76ea658c3dcc56f035f60ee6c62d6740c1107143b8210bdc0231d4c9b6b2003e458120985604eb09649322d359ae89f os-customization
e4b059c149a96f896804c7971107f738852bf1dfadd5832e4e2b3ebf2bf00f05570bd45f0f2bea69f54755fbf6bffc9091a1d6baed7b1537679afef5c44a5fd0 boot-deploy-0.18.tar.gz
a243975b9850d9933e0f917f7eb38fc4a76ea658c3dcc56f035f60ee6c62d6740c1107143b8210bdc0231d4c9b6b2003e458120985604eb09649322d359ae89f os-customization
5b3da17fab1b0e76b3686667c0c8c3a3e29a5794406875dd6375d73c5b1b47d60da6cf54720a3d8ad98b79c563af0863fedc87d2506b19055fb3fdea1cbd731d use-busybox-sh.patch
"

20
main/boot-deploy/use-busybox-sh.patch Normal file
View file

@ -0,0 +1,20 @@
diff --git boot-deploy boot-deploy
index df0c7b9..4f2ecfc 100755
--- a/boot-deploy
+++ b/boot-deploy
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/busybox sh
# Copyright 2021 Clayton Craft <clayton@craftyguy.net>
# SPDX-License-Identifier: GPL-3.0-or-later
set -eu
diff --git boot-deploy-functions.sh boot-deploy-functions.sh
index fb50e61..32de0ef 100644
--- a/boot-deploy-functions.sh
+++ b/boot-deploy-functions.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/busybox sh
# Copyright 2021 postmarketOS Contributors
# Copyright 2021 Clayton Craft <clayton@craftyguy.net>
# SPDX-License-Identifier: GPL-3.0-or-later