Attachment 249240 Details for Bug 277757 – Fixes creating packages under qemu

[patch] Fixes creating packages under qemu

0003-fixes-creating-packages-under-qemu.patch (text/plain), 1.11 KB, created by Oliver Epper on 2024-03-17 09:59:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Epper

Created: 2024-03-17 09:59:57 UTC

Size: 1.11 KB

patch

obsolete

>From 82add040bb3a6268c01be36b007a2d1d0d4385f3 Mon Sep 17 00:00:00 2001
>From: Oliver Epper <oliver.epper@gmail.com>
>Date: Sat, 16 Mar 2024 23:20:30 +0100
>Subject: [PATCH 3/4] fixes creating packages under qemu
>
>---
> .../files/patch-src_share_poudriere_common.sh          | 10 ++++++++++
> 1 file changed, 10 insertions(+)
> create mode 100644 ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh
>
>diff --git a/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh b/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh
>new file mode 100644
>index 000000000000..b161daf96489
>--- /dev/null
>+++ b/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh
>@@ -0,0 +1,10 @@
>+--- src/share/poudriere/common.sh.orig	2024-03-16 22:15:07 UTC
>++++ src/share/poudriere/common.sh
>+@@ -5691,6 +5691,7 @@ ensure_pkg_installed() {
>+ 		injail_ver=${injail_ver##*/}
>+ 		injail_ver=${injail_ver##*-}
>+ 		injail_ver=${injail_ver%.*}
>++		injail_ver=${injail_ver%_*}
>+ 		host_ver=$(/usr/local/sbin/pkg-static -v)
>+ 		if [ "${host_ver}" = "${injail_ver}" ]; then
>+ 			cp -f /usr/local/sbin/pkg-static "${mnt}/${PKG_BIN}"
>-- 
>2.44.0
>

Actions: View | Diff

Attachments on bug 277757: 249240