From 02b6e3039d5b0af0c8076c959916c118ea85d963 Mon Sep 17 00:00:00 2001 From: fossdd Date: Sat, 26 Jul 2025 23:53:56 +0200 Subject: [PATCH] Revert "testing/merge-usr: upgrade to git20250725" This version is broken therefore reverting to the last working state. This reverts commit 359cb25e626fe157fbfcd29f3e5ce76f0c9b5cb4. --- testing/merge-usr/APKBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testing/merge-usr/APKBUILD b/testing/merge-usr/APKBUILD index 2a5ac8e0b0b..1083facba8b 100644 --- a/testing/merge-usr/APKBUILD +++ b/testing/merge-usr/APKBUILD @@ -1,9 +1,9 @@ # Co-Maintainer: Pablo Correa Gomez # Maintainer: Clayton Craft pkgname=merge-usr -pkgver=0_git20250725 -pkgrel=0 -_commit="f6d5a52ed5aa37a0505a9d9a6d8af3a3133728d1" +pkgver=0_git20250703 +pkgrel=1 +_commit="03e1aaad3b425cfe2fcad401de5ea3ec96702ced" pkgdesc="Script to produce a merged-usr system" url="https://gitlab.alpinelinux.org/postmarketos/merge-usr" arch="all" @@ -28,5 +28,5 @@ package() { DESTDIR="$pkgdir" make install } sha512sums=" -6522a8c063c08610b3101e18403e94eab8ab2d5ca737608444e546a9ed7f6c98b370457ecc9765c830a6e493ed7a86fd3acc836a8b5bff3747cac7f7ee27a753 f6d5a52ed5aa37a0505a9d9a6d8af3a3133728d1.tar.gz +535b15d47aa223553be6658d96f5b1b339f5ed7ffa728e9faa9859831345c115de8143f196502458ca4d857c3a75f35cfa3804e4acf1a94a81634ee2312a16e2 03e1aaad3b425cfe2fcad401de5ea3ec96702ced.tar.gz "