From d6ee231f334b97fa589fea31f6ec0cb9a8f3f23b Mon Sep 17 00:00:00 2001 From: Antonio Huete Jimenez Date: Thu, 29 Feb 2024 23:40:01 +0000 Subject: [PATCH] dashboard: fix env/dragonfly-amd64 build Due to several factors as an old pkg version in the ISO, or the amount of changes that have gone to the binary packages since 6.4.0 was released, a bit of a workaround is needed in phase2.sh For golang/go#64684. Change-Id: I233fcfb77c3cc2f0b04331ad7bfee5892193622a GitHub-Last-Rev: 76b78fd935c844285823c63a1eeb9a95b075eb06 GitHub-Pull-Request: golang/build#88 Reviewed-on: https://go-review.googlesource.com/c/build/+/568315 LUCI-TryBot-Result: Go LUCI Auto-Submit: Ian Lance Taylor Reviewed-by: Dmitri Shuralyov Reviewed-by: Carlos Amedee Reviewed-by: Dmitri Shuralyov --- env/dragonfly-amd64/phase2.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/env/dragonfly-amd64/phase2.sh b/env/dragonfly-amd64/phase2.sh index 72665652..eb56f71f 100644 --- a/env/dragonfly-amd64/phase2.sh +++ b/env/dragonfly-amd64/phase2.sh @@ -22,7 +22,17 @@ q' | ed /etc/rc.d/pfi # pfi startup does not have full path that a root login does. export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:/usr/pkg/sbin:/usr/pkg/bin:/root/bin +# Upgrade pkg first +pkg update +pkg upgrade -y pkg || true + +# pkg 1.14 had a bug +[ ! -f /usr/local/etc/pkg/repos/df-latest.conf ] && \ + cp /usr/local/etc/pkg/repos/df-latest.conf.sample /usr/local/etc/pkg/repos/df-latest.conf + # Update pkg database and install extras we need. +pkg update +pkg upgrade -fy pkg install -y bash curl git gdb echo 'DONE WITH PHASE 2.'