Differential D47722
mtree: TESTSBASE directory always starts with a / Authored by jlduran on Nov 24 2024, 6:32 AM. Tags None Referenced Files
Subscribers
Details Remove the extra forward slash ("/"), otherwise the mtree specification Fixes: 07670b30fa43 ("Create /usr/tests *.debug file directory hierarchy")
Diff Detail
Event TimelineComment Actions This is fine with me, but you could instead strip a leading / from TESTBASE if present, e.g. /usr/lib/debug/${TESTBASE:S,^/,,}. This will be robust against a possible TESTBASE without a leading slash. Comment Actions I like this suggestion, I'll submit it on a separate review, as TESTSBASE is used in some other places as well. Comment Actions Also, I have yet to investigate if the mtree parsing under makefs is too strict (https://cgit.freebsd.org/src/tree/usr.sbin/makefs/mtree.c#n1004). But I'll check that once I have finished polishing building NanoBSD without root privileges (https://reviews.freebsd.org/D47653#1086475, https://www.youtube.com/watch?v=5qCaOMQ3ZnQ&t=2917s). Comment Actions The underlying issue was that, when sorting the metalog, the double slash came up first. For example: ./base/aaa type=dir ./base//aaa/bbb type=dir If sorted, would turn out: ./base//aaa/bbb type=dir ./base/aaa type=dir Effectively, missing the ./base/aaa directory in the specification. |