diff options
| author | Alex S <iwtcex@gmail.com> | 2021-10-28 07:43:33 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2021-10-28 07:43:33 +0000 |
| commit | 2a166ec5f43bcafcecfc3f4172901c831b84482e (patch) | |
| tree | 460c22bb3d8374d5be3e7058963fc21a1a0628e5 | |
| parent | 6cb28f4ba9922703a7eb06ed9630248da69ef466 (diff) | |
| download | ports-2a166ec5f43bcafcecfc3f4172901c831b84482e.tar.gz ports-2a166ec5f43bcafcecfc3f4172901c831b84482e.zip | |
emulators/wine-devel: Adjust pkg32.sh to pkg 1.17.3
After recent changes, given an uninitialized root dir pkg now fails
with:
pkg: Error opening the trusted directory /usr/share/keys/pkg/trusted
pkg: Error loading trusted certificates
This works around it for our WoW setup.
PR: 259404
| -rw-r--r-- | emulators/wine/files/pkg32.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/emulators/wine/files/pkg32.sh b/emulators/wine/files/pkg32.sh index 267fb8b38ca4..d75422997e12 100644 --- a/emulators/wine/files/pkg32.sh +++ b/emulators/wine/files/pkg32.sh @@ -8,7 +8,12 @@ fi I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}" -mkdir -p "$I386_ROOT" +if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ] +then + mkdir -p "$I386_ROOT/usr/share/keys" + ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg" +fi + ABI=$(pkg config ABI | sed s/amd64/i386/) # Show what we're going to do, then do it. echo pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" |