Date: Wed, 28 Sep 2022 18:19:21 +0900 From: Tomoaki AOKI <junchoon@dec.sakura.ne.jp> To: void <void@f-m.fm> Cc: freebsd-hackers@freebsd.org Subject: Re: poudriere cannot build 12.3R jail on a 13-stable system - cp: [vdso]: No such file or directory Message-ID: <20220928181921.6b43d82ffc7ba765b8d19303@dec.sakura.ne.jp> In-Reply-To: <d08190b2-c1df-4484-aefc-a264b733d6d3@www.fastmail.com> References: <26824204-ea59-4233-8bc7-d88ccbf75637@www.fastmail.com> <b0320f88-16c3-4a31-9d67-c177f65f85dd@www.fastmail.com> <d08190b2-c1df-4484-aefc-a264b733d6d3@www.fastmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --Multipart=_Wed__28_Sep_2022_18_19_21_+0900_zqdI_OeJNY_mw=Yc Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Wed, 28 Sep 2022 03:32:11 +0100 void <void@f-m.fm> wrote: > On Tue, 27 Sep 2022, at 15:49, void wrote: > > On Tue, 27 Sep 2022, at 02:29, void wrote: > > > >> The same host creates 13.1R and 13-stable systems fine. I have not yet > >> tried making a 12.2R or a 12-stable system yet. > > > > 12-stable poudriere jail builds correctly > > 12.2 fails at the same place. > > Tried to build 12.3R poudriere with locally patched (from the review mentioned in https://lists.freebsd.org/archives/freebsd-current/2022-April/001737.html ) not really expecting it to patch as here trying to build a 12.3R jail whereas the context > of the patch is addressing the same issue for building 13-stable on -current > > # cd /tmp > # git clone ssh://anongit@git.freebsd.org/src.git > # cd src > # git checkout releng/12.3 > # wget https://reviews.freebsd.org/file/data/3pwqyimbgzwstgvcmkos/PHID-FILE-xj5gncvnwh542umtjq7s/D34734.diff > # patch < D34734.diff > > The patch fails to apply when the sources are checked out to 12.3 > > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff --git a/Makefile.inc1 b/Makefile.inc1 > |--- a/Makefile.inc1 > |+++ b/Makefile.inc1 > -------------------------- > Patching file Makefile.inc1 using Plan A... > Hunk #1 failed at 1368. > 1 out of 1 hunks failed--saving rejects to Makefile.inc1.rej > Hmm... Ignoring the trailing garbage. > done I'm not a user of poudriere, but looking into the patch you mentioned and src of releng/12.3, it shouldn't apply as is. The conditional at the top of the patch only appears on releng/13.0 and later only. (Seems to be introduced at r364760 on SVN era. [1]) Modifying the patch manually to be "just applicable" is quite easy, but not sure the patch works as intended without the conditional. Attaching modified patch but I cannot assure it builds/works. An advice for the future: For diffs on phablicator, use "-p1" option for patch. This time, the target file is at current directory, so it is OK, but if any of the targets are in subdirectories, the patch SHOULDN'T apply without the option. And try with option "-C" first to check whether it can be applicable or not. BTW, annotate view on svnweb was quite useful on the situation like this (Want to check when the code was introduced). But I cannot find equivalent functionality on cgit. :-( [1] https://svnweb.freebsd.org/base/head/Makefile.inc1?r1=364759&r2=364760&; -- Tomoaki AOKI <junchoon@dec.sakura.ne.jp> --Multipart=_Wed__28_Sep_2022_18_19_21_+0900_zqdI_OeJNY_mw=Yc Content-Type: text/x-diff; name="D34734-12.x.diff" Content-Disposition: attachment; filename="D34734-12.x.diff" Content-Transfer-Encoding: 7bit diff --git a/Makefile.inc1 b/Makefile.inc1 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1366,6 +1366,10 @@ done); \ libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \ while read line; do \ + case $$line in \ + "["*"]") \ + continue;; \ + esac; \ set -- $$line; \ if [ "$$2 $$3" != "not found" ]; then \ echo $$2; \ --Multipart=_Wed__28_Sep_2022_18_19_21_+0900_zqdI_OeJNY_mw=Yc--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20220928181921.6b43d82ffc7ba765b8d19303>