Date: Mon, 12 Jul 2021 18:00:06 +0000 (UTC) From: Ronald Klop <ronald-lists@klop.ws> To: Chris <portmaster@bsdforge.com> Cc: freebsd ports <freebsd-ports@freebsd.org> Subject: Re: inject IGNORE_OSVERSION in poudriere? Message-ID: <1875908001.59.1626112806445@mailrelay> In-Reply-To: <4884f88f59f420908f5820d91885f12a@bsdforge.com> References: <1227424893.72.1626088023231@mailrelay> <4884f88f59f420908f5820d91885f12a@bsdforge.com>
next in thread | previous in thread | raw e-mail | index | archive | help
------=_Part_58_1770149590.1626112805423
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Van: Chris <portmaster@bsdforge.com>
Datum: maandag, 12 juli 2021 15:33
Aan: Ronald Klop <ronald-lists@klop.ws>
CC: freebsd ports <freebsd-ports@freebsd.org>
Onderwerp: Re: inject IGNORE_OSVERSION in poudriere?
>
> On 2021-07-12 04:07, Ronald Klop wrote:
> > Hi,
> >
> > To save time I sometimes get pkgs from the official pkg builders and save > them in
> > the poudriere dir.
> > But now and then I get this:
> >
> > [00:00:47] ===> Installing existing package > /packages/All/llvm11-11.0.1.txz
> > [00:00:48] [freebsd14-custom-job-01] Installing llvm11-11.0.1...
> > [00:00:48] Newer FreeBSD version for package llvm11:
> > [00:00:48] To ignore this error set IGNORE_OSVERSION=yes
> > [00:00:48] - package: 1400025
> > [00:00:48] - running kernel: 1400024
> > [00:00:48] Ignore the mismatch and continue? [y/N]: [00:00:49] Failed to > install
> > the following 1 package(s): /packages/All/llvm11-11.0.1.txz
> > [00:00:49] *** Error code 1
> >
> > Normally I delete/create the poudriere jail, but the upstream world used by
> > poudriere is not new enough yet.
> >
> > How can I set IGNORE_OSVERSION=yes in the poudriere environment?
> I have a patch for exactly this ( for a different reason) that I haven't yet
> had time to submit to a differential.
> But make.conf(5) (within your poudriere job tree. Or adding the additional
> make option: -DIGNORE_OSVERSION should get it for you.
>
> HTH
>
> --Chris
> >
> > Regards,
> > Ronald.
>
>
>
>
>
Hi,
I still can't get it to work with make.conf in poudriere. I see in the build logs that the right make.conf is in use.
In the meantime I hacked my local ports checkout to do this:
$ diff -u /usr/ports/Mk/Scripts/do-depends.sh.orig /usr/ports/Mk/Scripts/do-depends.sh
--- /usr/ports/Mk/Scripts/do-depends.sh.orig 2021-07-12 19:54:38.433507000 +0200
+++ /usr/ports/Mk/Scripts/do-depends.sh 2021-07-12 19:22:28.098583000 +0200
@@ -36,7 +36,7 @@
if [ "${pkgbase}" = "pkg" ]; then
[ -d ${dp_WRKDIR} ] || mkdir -p ${dp_WRKDIR}
tar xf ${pkgfile} -C ${dp_WRKDIR} -s ",/.*/,,g" "*/pkg-static"
- ${dp_WRKDIR}/pkg-static add ${pkgfile}
+ IGNORE_OSVERSION=yes ${dp_WRKDIR}/pkg-static add ${pkgfile}
rm -f ${dp_WRKDIR}/pkg-static
else
${dp_PKG_ADD} -A ${pkgfile}
And that seems to work somehow.
Regards,
Ronald.
------=_Part_58_1770149590.1626112805423--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1875908001.59.1626112806445>