Date: Thu, 28 Jan 2021 21:56:17 +0100 From: Henrik Rosenke <rosenke@dssgmbh.de> To: Miroslav Lachman <000.fbsd@quip.cz>, FreeBSD <freebsd-ports@freebsd.org> Subject: Re: poudriere merging multiple ports trees Message-ID: <1f0d7c6c-f97e-32a1-6639-512c804431df@dssgmbh.de> In-Reply-To: <e66b47f4-6fa2-70cf-830a-31b717e9ce56@quip.cz> References: <3ea16730-84a1-52ce-2251-bdd808fe5c52@pinyon.org> <4990d009-1962-62c2-3f4e-4f62fd03e26d@madpilot.net> <20210125141051.qheedhp76d2ha6zy@ivaldir.net> <3f2d08b2-2959-dd3e-89e5-895437e44040@quip.cz> <20210125152825.mnd4qhi4k23dy6dw@ivaldir.net> <0e79482c-fd7c-87a2-0052-5d7eeffd3099@dssgmbh.de> <a17ab317-b023-3b35-52a7-4952786742dc@dssgmbh.de> <b0fa1609-2a58-d68e-57c7-337f5101379b@quip.cz> <a6886f94-ed37-8241-3884-5dc56a149835@dssgmbh.de> <e66b47f4-6fa2-70cf-830a-31b717e9ce56@quip.cz>
next in thread | previous in thread | raw e-mail | index | archive | help
Am 28.01.21 um 21:14 schrieb Miroslav Lachman:
> On 28/01/2021 17:47, Henrik Rosenke wrote:
>> I tried this with a patched MOVED file, copied from the master
>> portstree, deleted the entry and tried to build but this File seems
>> to be ignored. I dont really understand where the MOVED file is
>> handled, it seems to be bsd.port.subdir.mk but i am not sure.
>
> MOVED is handled by bsd.port.subdir.mk but overlays do not account
> with it. Overlays are handled on more places
i thought this too but it seems poudriere is canceled before this, i
even tried to move the bsd.port.subdir.mk and commented out the function
load_moved in the common.sh of poudriere and can start a build. Correct
me if iam wrong but it seems that the common.sh from poudriere needs to
be patched to handle this rather than the Mk files itself. I added set
-x in the common.sh to get a better understanding what is happening and
it seems that shash_set sucks in the MOVED file and this is checked
later against the ports we want to build:
+ shash_set origin-moved sysutils/sge62 'EXPIRED 2013-06-05 Has expired:
Ancient and unsupported release'
later:
+ originspec_decode sysutils/sge62 origin '' flavor
+ local -
+ set +x -f
+ [ -n '' ]
+ origin_listed=sysutils/sge62
+ shash_get origin-moved sysutils/sge62 new_origin
+ local -
+ set +x
+ [ EXPIRED '=' EXPIRED ]
+ msg_error 'MOVED: sysutils/sge62 EXPIRED 2013-06-05 Has expired:
Ancient and unsupported release'
+ local -
+ set +x
[00:00:07] Error: MOVED: sysutils/sge62 EXPIRED 2013-06-05 Has expired:
Ancient and unsupported release
Kind regards,
Henrik Rosenke
>
> Scripts/do-depends.sh
> Scripts/depends-list.sh
>
> Next is bsd.port.mk:
>
> .if defined(USE_LOCAL_MK)
> .include "${PORTSDIR}/Mk/bsd.local.mk"
> .endif
> .for odir in ${OVERLAYS}
> .sinclude "${odir}/Mk/bsd.overlay.mk"
> .endfor
>
> But there is no bsd.overlay.mk and I don't know what should be in it
> (file in the overlay ports tree)
>
> The AWK code in bsd.port.subdir.mk can be changed to use MOVED from
> overlay if it exists insead of the default one.
>
>> I think the best way to handle this would be a NOT_MOVED file in the
>> overlay portstree with the ports to ignore from the MOVED file with
>> entries like "sysutils/sge62".
>
> This can be possible too. NOT_MOVED can be used as additional INDEXFILE
>
> Or maybe start with PORTSEARCH_MOVED=0 (not tried yet)
>
> Kind regards
> Miroslav Lachman
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1f0d7c6c-f97e-32a1-6639-512c804431df>