[Bug 283679] in release, make ftp fails, because DISTDIR in base conflicts with DISTDIR in ports

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283679

--- Comment #5 from Ed Maste <emaste@freebsd.org> ---
> Can you double check whether commit 41adc5f29ba6955e09f46e4d2c25da6fcd263ba2

It looks like etcupdate's extract_tree (or similar) is failing in NO_ROOT mode.
In NO_ROOT mode we place METALOG in `mktemp -d
$WORKDIR/etcupdate-XXXXXXXX`/$DISTDIR/METALOG -- with DISTDIR unset this
"works."

Maybe etcupdate should explicitly set DISTDIR when it invokes targets that use
METALOG, something like:

diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh
index 39d1f9e56a54..402b3bd939ec 100755
--- a/usr.sbin/etcupdate/etcupdate.sh
+++ b/usr.sbin/etcupdate/etcupdate.sh
@@ -226,10 +226,10 @@ build_tree()
                                fi
                        fi
                        if [ -n "$($make -V.ALLTARGETS:Minstalletc)" ]; then
-                               $make DESTDIR=$destdir installetc || exit 1
+                               $make DESTDIR=$destdir DISTDIR=. installetc ||
exit 1
                        else
-                               $make DESTDIR=$destdir distrib-dirs || exit 1
-                               $make DESTDIR=$destdir distribution || exit 1
+                               $make DESTDIR=$destdir DISTDIR=. distrib-dirs
|| exit 1
+                               $make DESTDIR=$destdir DISTDIR=. distribution
|| exit 1
                        fi
                ) || return 1
        fi

(regardless we should disentangle ports and src use of DISTDIR)

-- 
You are receiving this mail because:
You are the assignee for the bug.