Skip to content

Commit

Permalink
updpatch: toolbox 0.0.99.4-2
Browse files Browse the repository at this point in the history
Fix rotten patch.
  • Loading branch information
hack3ric authored and felixonmars committed Oct 10, 2023
1 parent 7c92322 commit 523cece
Showing 1 changed file with 7 additions and 19 deletions.
26 changes: 7 additions & 19 deletions toolbox/riscv64.patch
Original file line number Diff line number Diff line change
@@ -1,24 +1,12 @@
--- PKGBUILD
+++ PKGBUILD
@@ -11,8 +11,10 @@ license=(APACHE)
depends=(podman bash flatpak)
makedepends=(go shellcheck go-md2man bash-completion ninja git meson podman)
_commit=f7c4c7dedb34be33333065296275869e77464400 #refs/tags/0.0.99.4^{}
-source=("git+$url#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+$url#commit=$_commit"
+ "add_dynamic_linker.patch::https://patch-diff.githubusercontent.com/raw/containers/toolbox/pull/1159.patch")
+sha256sums=('SKIP'
+ 'a9178677c13d15559320ef8e02af8f6961b06d801db091b2c95f741384edd8c7')

pkgver() {
cd toolbox
@@ -25,7 +27,7 @@ prepare() {
git cherry-pick -n 816a7cab9e2f02f2eb828062be54ffef2e3666dc
git cherry-pick -n f555029304415a06bde410deb879cd2cc7dad444
git cherry-pick -n fc5f568c5d82f4a16982268fa67092e52be91fbe
-
+ patch -p1 -Ni "${srcdir}/add_dynamic_linker.patch"
@@ -29,6 +29,9 @@ prepare() {
# Fixes FS#79769
git cherry-pick -n 1cc9e07b7c36fe9f9784b40b58f0a2a3694dd328
git cherry-pick -n 219f5b4be428388f2b8cc12a7480c4a6922b59ca
+
+ # Fix build on riscv64
+ git cherry-pick -n 26bf55ea24d6f821a1cf1bf431f97312d5e35abd
}

build() {

0 comments on commit 523cece

Please sign in to comment.